This commit was manufactured by cvs2svn to create tag 'v20040519a'. Sprout from master 2004-05-13 22:26:58 UTC Dorian Birsan <dbirsan> 'nl' Cherrypick from master 2004-05-20 03:58:27 UTC Dorian Birsan <dbirsan> 'branding plugin id != feature id': update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.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/asl-v20.txt 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/.cvsignore 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/antProperties.exsd 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/IAntClasspathEntry.java ant/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.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/AntClasspathEntry.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/AntPropertyValueProvider.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/DemuxInputStreamSetter.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/NullInputHandler.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/.externalToolBuilders/Ant Test Support Lib Builder.launch 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/.cvsignore 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/AntTestPropertyValueProvider.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/Bug42926.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/ExtensionPointTask.xml ant/org.eclipse.ant.tests.core/testbuildfiles/ExtensionPointType.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/failingTarget.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/.externalToolBuilders/Build Test Support JAR.launch ant/org.eclipse.ant.tests.ui/.project ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/AntEditorContentOutlineTests.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/CodeCompletionTest.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/TaskDescriptionProviderTest.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/FormattingPreferencesTest.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlDocumentFormatterTest.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlTagFormatterTest.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestEditor.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestLocationProvider.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestProblemRequestor.java ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestTextCompletionProcessor.java ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/AbstractAntUIBuildTest.java ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/BuildTests.java ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java 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/External Tools/org/eclipse/ant/tests/ui/externaltools/MigrationTests.java ant/org.eclipse.ant.tests.ui/about.html ant/org.eclipse.ant.tests.ui/build.properties ant/org.eclipse.ant.tests.ui/buildfiles/buildAntTestsSupportJAR.xml ant/org.eclipse.ant.tests.ui/icons/ant.gif ant/org.eclipse.ant.tests.ui/lib/.cvsignore ant/org.eclipse.ant.tests.ui/plugin.properties ant/org.eclipse.ant.tests.ui/plugin.xml ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITestPlugin.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITests.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ConsoleLineTracker.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugElementKindEventWaiter.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugEventWaiter.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectCreationDecorator.java ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask.java ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask2.java ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/types/AntTestPath.java ant/org.eclipse.ant.tests.ui/test.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/antUITestsSupport.jar ant/org.eclipse.ant.tests.ui/testbuildfiles/bad.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/build.Cp1251.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/build.UTF8.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/build.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.properties ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest2.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/customBoolean.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/dependencytest.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/echoing.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/echoingSepVM.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/empty.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointSepVM.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTaskSepVM.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTypeSepVM.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_source01.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target01.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target02.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target03.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/macrodef.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/mixed.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/outline_select_test_build.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/projectOnly.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/refid.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/russianbuild.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/taskdef.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/test1.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/test2.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/test3.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/test4.xml ant/org.eclipse.ant.tests.ui/testbuildfiles/test5.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/.externalToolBuilders/Build Remote Ant JAR.launch ant/org.eclipse.ant.ui/.options ant/org.eclipse.ant.ui/.project ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java 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.6.0.dtd ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.6.0.xml ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/AntDTDMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/AntDTDMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IAtom.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IAttribute.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IDfm.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IElement.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IModel.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/ISchema.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/ParseError.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/Parser.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/AntDTDSchemaMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/AntDTDSchemaMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Atom.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Attribute.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Dfm.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Element.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Nfm.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Schema.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/Factory.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/FactoryObject.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IKeyHolder.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IMapHolder.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IValueHolder.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/MapHolder.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMapFactory.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedSet.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AbstractAntSourceViewerConfiguration.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntAutoIndentStrategy.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/OpenDeclarationAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTML2TextReader.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTMLPrinter.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTMLTextPresenter.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/LineBreakingReader.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/SingleCharReader.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/SubstitutionTextReader.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormattingStrategy.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlElementFormattingStrategy.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlTagFormatter.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntDefiningTaskNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntElementNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntImportNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntProjectNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntPropertyNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTargetNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTaskNode.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/IAntModelConstants.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModel.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModelProject.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntOutlineMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntOutlineMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/DocumentModelChangeEvent.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterImportedElementsAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterInternalTargetsAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterPropertiesAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterTopLevelAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IDocumentModelListener.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblem.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblemRequestor.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/LocationProvider.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleLinkWithEditorAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleSortAntOutlineAction.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLCore.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLProblem.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntSourceViewerInformationControl.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateAccess.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateInformationControlCreator.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateProposal.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateVariableTextHover.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateViewerConfiguration.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntVariableResolver.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/BuildFileContextType.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/TaskContextType.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AnnotationAccess.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentFactory.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentSetupParticipant.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorPartitionScanner.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorProcInstrScanner.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTagScanner.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.properties ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorWhitespaceDetector.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntStorageDocumentProvider.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/FileScanner.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IAntEditorColorConstants.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IReconcilingParticipant.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IXMLAnnotation.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/MultilineDamagerRepairer.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/NotifyingReconciler.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/PartiallySynchronizedDocument.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/TagRule.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLAnnotationHover.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLAnnotationIterator.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLMarkerAnnotation.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLProblemAnnotation.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLReconcilingStrategy.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.java ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.properties ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/AntSupportMessages.java ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/AntSupportMessages.properties ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/AntProcessBuildLogger.java ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/NullBuildLogger.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AntConsoleColorProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/BuildFailedTracker.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacLineTracker.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/TaskLineTracker.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileImportWizard.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ExternalAntBuildfileImportPage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AddVariableStringAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuildTab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTabGroup.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntEnvironmentTab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntHomeClasspathEntry.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJRETab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJavaLaunchDelegate.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcutWithDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntMainTab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntProcess.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntPropertiesTab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntStreamMonitor.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntStreamsProxy.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTabGroup.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetContentProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/ContributedClasspathEntriesEntry.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/EditAntHomeEntryAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/IAntLaunchConfigurationConstants.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/MessageIds.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntBuildListener.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntProcessFactory.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntRuntimeProcess.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RunAntStatusHandler.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetTableLabelProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TaskLinkManager.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/VariableInputDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntImageDescriptor.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIImages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIModelMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIModelMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIPlugin.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUtil.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIConstants.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIHelpContextIds.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIPreferenceConstants.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/ImageDescriptorRegistry.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractClasspathEntry.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddPropertyDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathContentProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathLabelProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathPage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntCodeFormatterPreferencePage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntContentProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferenceConstants.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntObjectLabelProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesFileSelectionDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesPage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTasksPage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTypesPage.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathEntry.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathModel.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ColorEditor.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/DialogSettingsHelper.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/GlobalClasspathEntries.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/IAntBlockContainer.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/IClasspathEntry.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageDialogWithToggle.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageLine.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MinimizedFileSystemElement.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/OverlayPreferenceStore.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/PropertyFileFilter.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/StatusDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/StatusInfo.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntProjectContentProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntTargetContentProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntView.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewDropAdapter.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewLabelProvider.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AddBuildFilesAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntViewActionMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntViewActionMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/EditorImageDescriptor.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/FilterInternalTargetsAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RemoveAllAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RemoveProjectAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RunTargetAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntNode.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntViewElementsMessages.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntViewElementsMessages.properties ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/ProjectNode.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/RootNode.java ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/TargetNode.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityException.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityManager.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/DemuxInputStreamSetter.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InputHandlerSetter.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.properties ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntRunner.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/MessageIds.java ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/RemoteAntBuildLogger.java ant/org.eclipse.ant.ui/about.html ant/org.eclipse.ant.ui/asl-v20.txt ant/org.eclipse.ant.ui/build.properties ant/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml ant/org.eclipse.ant.ui/buildfiles/exportplugin.xml ant/org.eclipse.ant.ui/icons/full/dlcl16/add_co.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/alpha_mode.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/ant_targets.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_imported_elements.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_internal_targets.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_properties.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_top_level.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/properties.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/refresh.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/remove_co.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/removeall_co.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/run_tool.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/search.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/synced.gif ant/org.eclipse.ant.ui/icons/full/dlcl16/synched.gif ant/org.eclipse.ant.ui/icons/full/elcl16/add_co.gif ant/org.eclipse.ant.ui/icons/full/elcl16/alpha_mode.gif ant/org.eclipse.ant.ui/icons/full/elcl16/ant_targets.gif ant/org.eclipse.ant.ui/icons/full/elcl16/filter_imported_elements.gif ant/org.eclipse.ant.ui/icons/full/elcl16/filter_internal_targets.gif ant/org.eclipse.ant.ui/icons/full/elcl16/filter_properties.gif ant/org.eclipse.ant.ui/icons/full/elcl16/filter_top_level.gif ant/org.eclipse.ant.ui/icons/full/elcl16/properties.gif ant/org.eclipse.ant.ui/icons/full/elcl16/refresh.gif ant/org.eclipse.ant.ui/icons/full/elcl16/remove_co.gif ant/org.eclipse.ant.ui/icons/full/elcl16/removeall_co.gif ant/org.eclipse.ant.ui/icons/full/elcl16/run_tool.gif ant/org.eclipse.ant.ui/icons/full/elcl16/search.gif ant/org.eclipse.ant.ui/icons/full/elcl16/synced.gif ant/org.eclipse.ant.ui/icons/full/elcl16/synched.gif ant/org.eclipse.ant.ui/icons/full/eview16/ant_view.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/anttaskdef_obj.gif ant/org.eclipse.ant.ui/icons/full/obj16/build_tab.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/import_obj.gif ant/org.eclipse.ant.ui/icons/full/obj16/jar_l_obj.gif ant/org.eclipse.ant.ui/icons/full/obj16/macrodef_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/targetinternal_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/template_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/icons/full/ovr16/import_co.gif ant/org.eclipse.ant.ui/icons/full/ovr16/warning_co.gif ant/org.eclipse.ant.ui/icons/full/wizban/importbuildfile_wiz.gif ant/org.eclipse.ant.ui/plugin.properties ant/org.eclipse.ant.ui/plugin.xml ant/org.eclipse.ant.ui/templates/ant.properties ant/org.eclipse.ant.ui/templates/ant.xml ant/org.eclipse.ant.ui/templates/resolver.gif platform/org.eclipse.platform/.classpath platform/org.eclipse.platform/.cvsignore platform/org.eclipse.platform/.project platform/org.eclipse.platform/SplashFinal_500x330.psd 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/cheatsheets/CVS_1.xml platform/org.eclipse.platform/css/graphics/contentpage/background.jpg platform/org.eclipse.platform/css/graphics/contentpage/backgroundcurve.gif platform/org.eclipse.platform/css/graphics/contentpage/content_background.jpg platform/org.eclipse.platform/css/graphics/contentpage/overview_wtr.jpg platform/org.eclipse.platform/css/graphics/contentpage/samples_wtr.jpg platform/org.eclipse.platform/css/graphics/contentpage/section1.gif platform/org.eclipse.platform/css/graphics/contentpage/section2.gif platform/org.eclipse.platform/css/graphics/contentpage/section3.gif platform/org.eclipse.platform/css/graphics/contentpage/section4.gif platform/org.eclipse.platform/css/graphics/contentpage/tutorials_wtr.jpg platform/org.eclipse.platform/css/graphics/contentpage/whatsnew_wtr.jpg platform/org.eclipse.platform/css/graphics/contentpage/wordmark.gif platform/org.eclipse.platform/css/graphics/icons/ctool/overview48.gif platform/org.eclipse.platform/css/graphics/icons/ctool/overview48sel.gif platform/org.eclipse.platform/css/graphics/icons/ctool/overview72.gif platform/org.eclipse.platform/css/graphics/icons/ctool/samples48.gif platform/org.eclipse.platform/css/graphics/icons/ctool/samples48sel.gif platform/org.eclipse.platform/css/graphics/icons/ctool/samples72.gif platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48.gif platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48sel.gif platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials72.gif platform/org.eclipse.platform/css/graphics/icons/ctool/wb48.gif platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48.gif platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48sel.gif platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew72.gif platform/org.eclipse.platform/css/graphics/icons/dtool/back.gif platform/org.eclipse.platform/css/graphics/icons/dtool/forward.gif platform/org.eclipse.platform/css/graphics/icons/etool/back.gif platform/org.eclipse.platform/css/graphics/icons/etool/forward.gif platform/org.eclipse.platform/css/graphics/icons/etool/overview48.gif platform/org.eclipse.platform/css/graphics/icons/etool/overview48sel.gif platform/org.eclipse.platform/css/graphics/icons/etool/overview72.gif platform/org.eclipse.platform/css/graphics/icons/etool/samples48.gif platform/org.eclipse.platform/css/graphics/icons/etool/samples48sel.gif platform/org.eclipse.platform/css/graphics/icons/etool/samples72.gif platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48.gif platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48sel.gif platform/org.eclipse.platform/css/graphics/icons/etool/tutorials72.gif platform/org.eclipse.platform/css/graphics/icons/etool/wb48.gif platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48.gif platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48sel.gif platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew72.gif platform/org.eclipse.platform/css/graphics/icons/obj48/community_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/communityhov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/features_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/featureshov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/javaapp_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/javaapphov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplet_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplethov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/javadev_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/javadevhov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/migrate_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/migratehov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/new_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/newhov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/plugin_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/pluginhov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapp_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapphov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurp_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurphov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/samplered_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/sampleredhov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/script_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/scripthov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/swtapp_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/swtapphov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/teamsup_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/teamsuphov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/updates_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/updateshov_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasics_obj.gif platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasicshov_obj.gif platform/org.eclipse.platform/css/graphics/rootpage/background.jpg platform/org.eclipse.platform/css/graphics/rootpage/brandmark.gif platform/org.eclipse.platform/css/graphics/rootpage/dots.gif platform/org.eclipse.platform/css/graphics/swt/form_banner.gif platform/org.eclipse.platform/css/overview/overview.css platform/org.eclipse.platform/css/overview/swt.properties platform/org.eclipse.platform/css/root.css platform/org.eclipse.platform/css/root_swt.properties platform/org.eclipse.platform/css/samples/samples.css platform/org.eclipse.platform/css/samples/swt.properties platform/org.eclipse.platform/css/shared.css platform/org.eclipse.platform/css/shared_swt.properties platform/org.eclipse.platform/css/tutorials/swt.properties platform/org.eclipse.platform/css/tutorials/tutorials.css platform/org.eclipse.platform/css/whatsnew/swt.properties platform/org.eclipse.platform/css/whatsnew/whatsnew.css platform/org.eclipse.platform/eclipse.gif platform/org.eclipse.platform/eclipse32.gif platform/org.eclipse.platform/eclipse_lg.gif platform/org.eclipse.platform/introContent.xml 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-intro/org/eclipse/platform/internal/CheatSheetStandbyContent.java 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 platform/org.eclipse.sdk/.project platform/org.eclipse.sdk/about.html platform/org.eclipse.sdk/about.ini platform/org.eclipse.sdk/about.mappings platform/org.eclipse.sdk/about.properties platform/org.eclipse.sdk/build.properties platform/org.eclipse.sdk/eclipse32.gif platform/org.eclipse.sdk/plugin.properties platform/org.eclipse.sdk/plugin.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.c update/org.eclipse.update.core.linux/src/update.h 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.core/.classpath update/org.eclipse.update.core/.cvsignore update/org.eclipse.update.core/.options update/org.eclipse.update.core/.project update/org.eclipse.update.core/Scrapbook.jpage update/org.eclipse.update.core/about.html update/org.eclipse.update.core/build.properties update/org.eclipse.update.core/plugin.properties update/org.eclipse.update.core/plugin.xml update/org.eclipse.update.core/preferences.ini update/org.eclipse.update.core/schema/featureTypes.exsd update/org.eclipse.update.core/schema/installHandlers.exsd update/org.eclipse.update.core/schema/siteTypes.exsd update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html update/org.eclipse.update.core/src/org/eclipse/update/core/package.html update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DeltaInstallHandler.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureDownloadException.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePlugin.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileFragment.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FragmentEntry.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallRegistry.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/OtherResponse.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PatchedFeature.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePackedPluginContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdatePreferencesInitializer.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorCommand.java update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSite.java update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSiteFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/BundleManifest.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/BatchInstallOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ConfigOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/DuplicateConflictsValidator.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureHierarchyElement.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureStatus.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/InstallOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobRoot.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSite.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSites.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/Operation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationFactory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationValidator.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/PatchCleaner.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ReplaceFeatureVersionOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/RevertConfigurationOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ToggleSiteOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UninstallOperation.java update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UpdateUtils.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/BaseSearchCategory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/QueryUpdateSiteAdapter.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatePolicy.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdateSiteAdapter.java update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java update/org.eclipse.update.core/src/org/eclipse/update/search/package.html update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html 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.scheduler/.classpath update/org.eclipse.update.scheduler/.cvsignore update/org.eclipse.update.scheduler/.project update/org.eclipse.update.scheduler/about.html update/org.eclipse.update.scheduler/build.properties update/org.eclipse.update.scheduler/plugin.properties update/org.eclipse.update.scheduler/plugin.xml update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/AutomaticUpdatesJob.java update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/SchedulerStartup.java update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateScheduler.java update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateSchedulerResources.properties update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/preferences/AutomaticUpdatesPreferencePage.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/mirrors/update-site1/.project update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/build.log update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/sitebuild.xml update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature3_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin3_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin4_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site1/site.xml update/org.eclipse.update.tests.core/data/mirrors/update-site2/.project update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/build.log update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/sitebuild.xml update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site2/site.xml update/org.eclipse.update.tests.core/data/mirrors/update-site3/.project update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/build.log update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/sitebuild.xml update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature1b_2.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature2b_2.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1a_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2a_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site3/site.xml update/org.eclipse.update.tests.core/data/mirrors/update-site4/.project update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/build.log update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/sitebuild.xml update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1b_2.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1c_3.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1a_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site4/site.xml update/org.eclipse.update.tests.core/data/mirrors/update-site5/.project update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/build.log update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/sitebuild.xml update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1b_2.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1c_3.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2b_2.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2c_3.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1a_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2_1.0.0.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2a_1.0.1.jar update/org.eclipse.update.tests.core/data/mirrors/update-site5/site.xml 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/bundleAndPluginManifests_1.0.3/META-INF/MANIFEST.MF update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleAndPluginManifests_1.0.3/plugin.xml update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleManifest_1.0.1/META-INF/MANIFEST.MF 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/siteTestLocalSite/plugins/notBundleManifest_1.0.2/META-INF/MANIFEST.MF 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/eclipse/.eclipseextension 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/validation/site6/children/children/eclipse/.eclipseextension 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/branding/AllBrandingTests.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/BundleProviderTest.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/ProductTest.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/mirror/AllMirrorTests.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/MirrorManagerTestCase.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteDoubleEmbeddedFeatureMirror.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteEmbeddedFeatureMirror.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteFeatureVersionMirror.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/standalone/AllStandaloneTests.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/StandaloneManagerTestCase.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestBundlesInstall.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureDisable.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureEnable.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureInstall.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUninstall.java update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUpdate.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.tests.core/webserver/bundleSite/features/com.example.bundle.feature_1.0.0.jar update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.budle.fragment.ui_1.0.0.jar update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.fragment_1.0.0.jar update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin.ui_2.0.0.jar update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin_1.0.0.jar update/org.eclipse.update.tests.core/webserver/bundleSite/site.xml update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.classpath update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.project update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.template update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/META-INF/MANIFEST.MF update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/build.properties update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/fragment.xml update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/.project update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/build.properties update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/feature.xml update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.classpath update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.project update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.template update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/META-INF/MANIFEST.MF update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/build.properties update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/fragment.xml update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.classpath update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.project update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.template update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/META-INF/MANIFEST.MF update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/bin/com/example/bundle/plugin/ui/UiPlugin.class update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/build.properties update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/plugin.xml update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/src/com/example/bundle/plugin/ui/UiPlugin.java update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.classpath update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.project update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.template update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/META-INF/MANIFEST.MF update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/bin/com/example/bundle/plugin/PluginPlugin.class update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/build.properties update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/plugin.xml update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/src/com/example/bundle/plugin/PluginPlugin.java 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/image1.gif update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml update/org.eclipse.update.ui.win32/.classpath update/org.eclipse.update.ui.win32/.cvsignore update/org.eclipse.update.ui.win32/.project update/org.eclipse.update.ui.win32/about.html update/org.eclipse.update.ui.win32/build.properties update/org.eclipse.update.ui.win32/icons/full/clcl16/backward_nav.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/forward_nav.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/go_nav.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/hierarchicalLayout.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/home_nav.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/refresh_nav.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/show_unconf.gif update/org.eclipse.update.ui.win32/icons/full/clcl16/stop_nav.gif update/org.eclipse.update.ui.win32/icons/full/cview16/browser.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/backward_nav.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/forward_nav.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/go_nav.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/hierarchicalLayout.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/home_nav.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/refresh_nav.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/show_unconf.gif update/org.eclipse.update.ui.win32/icons/full/dlcl16/stop_nav.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/backward_nav.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/collapseall.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/forward_nav.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/go_nav.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/hierarchicalLayout.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/home_nav.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/refresh_nav.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/show_unconf.gif update/org.eclipse.update.ui.win32/icons/full/elcl16/stop_nav.gif update/org.eclipse.update.ui.win32/icons/full/eview16/browser.gif update/org.eclipse.update.ui.win32/icons/full/forms/def_provider.jpg update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.gif update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.jpg update/org.eclipse.update.ui.win32/icons/full/forms/form_underline.jpg update/org.eclipse.update.ui.win32/icons/full/forms/form_underline2.jpg update/org.eclipse.update.ui.win32/icons/full/forms/topic.gif update/org.eclipse.update.ui.win32/icons/sample.gif update/org.eclipse.update.ui.win32/plugin.properties update/org.eclipse.update.ui.win32/plugin.xml update/org.eclipse.update.ui.win32/schema/welcomePages.exsd update/org.eclipse.update.ui.win32/schema/welcomeSections.exsd update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/ShowWelcomePageAction.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortal.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalImages.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalResources.properties update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/TipsAndTricksContentProvider.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/WelcomeContentProvider.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/HelpSection.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentObserver.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentProvider.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IPortalSectionForm.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/PortalSection.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/SectionDescriptor.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditor.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInput.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInputFactory.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalForm.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPage.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPart.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomeTitleArea.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/BrowserControlSite.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/GlobalActionHandler.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IEmbeddedWebBrowser.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IWebBrowserListener.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowser.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditor.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorContributor.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInput.java update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInputFactory.java update/org.eclipse.update.ui/.classpath update/org.eclipse.update.ui/.cvsignore update/org.eclipse.update.ui/.project update/org.eclipse.update.ui/Graphics_update.html update/org.eclipse.update.ui/about.html update/org.eclipse.update.ui/build.properties update/org.eclipse.update.ui/icons/dlcl16/collapseall.gif update/org.eclipse.update.ui/icons/dlcl16/hierarchicalLayout.gif update/org.eclipse.update.ui/icons/dlcl16/show_unconf.gif update/org.eclipse.update.ui/icons/dtool16/config_wiz.gif update/org.eclipse.update.ui/icons/dtool16/install_wiz.gif update/org.eclipse.update.ui/icons/dtool16/uninstall_wiz.gif update/org.eclipse.update.ui/icons/dtool16/update_wiz.gif update/org.eclipse.update.ui/icons/elcl16/collapseall.gif update/org.eclipse.update.ui/icons/elcl16/hierarchicalLayout.gif update/org.eclipse.update.ui/icons/elcl16/show_unconf.gif update/org.eclipse.update.ui/icons/etool16/config_wiz.gif update/org.eclipse.update.ui/icons/etool16/install_wiz.gif update/org.eclipse.update.ui/icons/etool16/uninstall_wiz.gif update/org.eclipse.update.ui/icons/etool16/update_wiz.gif update/org.eclipse.update.ui/icons/eview16/configs.gif update/org.eclipse.update.ui/icons/eview16/preview.gif update/org.eclipse.update.ui/icons/forms/def_provider.jpg update/org.eclipse.update.ui/icons/forms/form_banner.gif update/org.eclipse.update.ui/icons/forms/form_banner.jpg update/org.eclipse.update.ui/icons/forms/form_underline.jpg update/org.eclipse.update.ui/icons/forms/topic.gif update/org.eclipse.update.ui/icons/obj16/app_obj.gif update/org.eclipse.update.ui/icons/obj16/bfolder_obj.gif update/org.eclipse.update.ui/icons/obj16/category_obj.gif update/org.eclipse.update.ui/icons/obj16/config_obj.gif update/org.eclipse.update.ui/icons/obj16/efix2_obj.gif update/org.eclipse.update.ui/icons/obj16/efix_obj.gif update/org.eclipse.update.ui/icons/obj16/error_st_obj.gif update/org.eclipse.update.ui/icons/obj16/esite_obj.gif update/org.eclipse.update.ui/icons/obj16/feature_obj.gif update/org.eclipse.update.ui/icons/obj16/history_obj.gif update/org.eclipse.update.ui/icons/obj16/lsite_obj.gif update/org.eclipse.update.ui/icons/obj16/notinstalled_feature_obj.gif update/org.eclipse.update.ui/icons/obj16/ok_st_obj.gif update/org.eclipse.update.ui/icons/obj16/psite_obj.gif update/org.eclipse.update.ui/icons/obj16/site_obj.gif update/org.eclipse.update.ui/icons/obj16/unconf_feature_obj.gif update/org.eclipse.update.ui/icons/obj16/updates_obj.gif update/org.eclipse.update.ui/icons/obj16/usearch_obj.gif update/org.eclipse.update.ui/icons/obj16/web_bkmrk_obj.gif update/org.eclipse.update.ui/icons/ovr16/add_stat.gif update/org.eclipse.update.ui/icons/ovr16/current_co.gif update/org.eclipse.update.ui/icons/ovr16/del_stat.gif update/org.eclipse.update.ui/icons/ovr16/error_co.gif update/org.eclipse.update.ui/icons/ovr16/installable_co.gif update/org.eclipse.update.ui/icons/ovr16/linked_co.gif update/org.eclipse.update.ui/icons/ovr16/mod_co.gif update/org.eclipse.update.ui/icons/ovr16/unconfigured_co.gif update/org.eclipse.update.ui/icons/ovr16/updated_co.gif update/org.eclipse.update.ui/icons/ovr16/warning_co.gif update/org.eclipse.update.ui/icons/wizban/config_wiz.gif update/org.eclipse.update.ui/icons/wizban/def_wizban.jpg update/org.eclipse.update.ui/icons/wizban/install_wiz.gif update/org.eclipse.update.ui/icons/wizban/uninstall_wiz.gif update/org.eclipse.update.ui/icons/wizban/update_wiz.gif update/org.eclipse.update.ui/plugin.properties update/org.eclipse.update.ui/plugin.xml update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/AddBookmarksAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerWindow.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/EditBookmarksAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/InstallWizardAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/RestartDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateLabelProvider.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUI.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIImages.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/WebBookmarksDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkFolder.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkUtil.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredFeatureAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredSiteAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/DiscoveryFolder.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureReferenceAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredFeatureAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteContext.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IFeatureAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ISiteAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/MissingFeature.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/NamedModelObject.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SimpleFeatureAdapter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteBookmark.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteCategory.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UIModelObject.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UpdateModel.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/AbstractOverlayIcon.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/DefaultContentProvider.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/ImageOverlayIcon.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/OverlayIcon.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/PixelConverter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SWTUtil.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SharedLabelProvider.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/MainPreferencePage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/UpdateSettingsPreferencePage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/ConfiguredSitePropertyPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureCopyrightPropertyPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureGeneralPropertyPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureLicensePropertyPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureStatusPropertyPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/Authentication.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationService.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UserValidationDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationPreview.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FeatureStateAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/IPreviewTask.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallOptionalFeatureAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallationHistoryAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/NewExtensionLocationAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ReplaceVersionAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/RevertConfigurationAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ShowActivitiesAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/SiteStateAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UninstallFeatureAction.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ActivitiesTableViewer.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/BannerPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/DuplicateConflictsDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/EditSiteDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureSorter.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/IDynamicPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ISearchProvider.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LicensePage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LocalSiteSelector.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdateSiteDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewWebSiteDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizard.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizardPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ResizableWizardDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizard.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizardPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReviewPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SearchRunner.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ShowActivitiesDialog.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SitePage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/UIProblemHandler.java update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/InstallServlet.java update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/ServletsUtil.java update/org.eclipse.update.ui/webapp/WEB-INF/.cvsignore update/org.eclipse.update.ui/webapp/WEB-INF/lib/.cvsignore update/org.eclipse.update.ui/webapp/WEB-INF/web.xml update/org.eclipse.update.ui/webapp/images/backward_nav.gif update/org.eclipse.update.ui/webapp/images/form_banner.jpg update/org.eclipse.update.ui/webapp/images/form_underline.jpg 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

commit: 07db56908bb0e2552397d0430f957ce71796e46d [log] [tgz]
author: cvs2svn <platform-releng-dev@eclipse.org> Thu May 20 03:58:28 2004 +0000
committer: cvs2svn <platform-releng-dev@eclipse.org> Thu May 20 03:58:28 2004 +0000
tree: efa399148bda0fe6d399dd0529ff8dbf07eeac64
parent: 32d9af1c41733ad9d02251aff69183622ff80192 [diff]
diff --git a/ant/org.eclipse.ant.core/.classpath b/ant/org.eclipse.ant.core/.classpath
deleted file mode 100644
index 009d54c..0000000
--- a/ant/org.eclipse.ant.core/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry output="src_ant_bin" kind="src" path="src_ant/"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 bd3d9f9..0000000
--- a/ant/org.eclipse.ant.core/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-lib
-temp.folder
-antsupport.jar
-src_ant_bin

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 fe0b0a1..0000000
--- a/ant/org.eclipse.ant.core/.externalToolBuilders/Build Ant Support JAR.launch
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<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;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot; editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&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;&#10;&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;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.core&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<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 28f7d89..0000000
--- a/ant/org.eclipse.ant.core/.options
+++ /dev/null

@@ -1,4 +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

diff --git a/ant/org.eclipse.ant.core/.project b/ant/org.eclipse.ant.core/.project
deleted file mode 100644
index 1261dfd..0000000
--- a/ant/org.eclipse.ant.core/.project
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.core</name>
-	<comment></comment>
-	<projects>
-	</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.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>Build Ant Support JAR.launch</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 8035e5f..0000000
--- a/ant/org.eclipse.ant.core/about.html
+++ /dev/null

@@ -1,50 +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>22nd March, 2004</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.6.1</b></p>
-<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Ant project.</p>
-
-<p>The following classes (&quot;Ant-Derived Work&quot;) are based on Ant code:</p>
-
-<ul>
-	<li>org.eclipse.ant.internal.core.ant.InternalAntRunner contained in antsupportlib.jar and antsupportlibsrc.zip</li>
-	<li>org.eclipse.ant.internal.core.ant.InternalProject contained in antsupportlib.jar and antsupportlibsrc.zip</li>
-</ul>
-
-<p>Your use of the Ant-Derived Work is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
-
-<p>The names &quot;Ant&quot; and  &quot;Apache Software Foundation&quot; must not be used to endorse or promote products derived from this 
-software without prior written permission.  For written permission, please contact <a href="mailto:apache@apache.org">apache@apache.org</a>.</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.core/asl-v20.txt b/ant/org.eclipse.ant.core/asl-v20.txt
deleted file mode 100644
index d645695..0000000
--- a/ant/org.eclipse.ant.core/asl-v20.txt
+++ /dev/null

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) 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. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

diff --git a/ant/org.eclipse.ant.core/build.properties b/ant/org.eclipse.ant.core/build.properties
deleted file mode 100644
index 45710e5..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/lib/ant.jar,../org.apache.ant/lib/ant-launcher.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 7ae38a4..0000000
--- a/ant/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
+++ /dev/null

@@ -1,53 +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" depends="clean, lib/antsupportlib.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="version.suffix" value="_3.0.0"/>
-		<property name="ant_version.suffix" value="_1.6.1"/>
-	</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.4" source="1.4" destdir="${temp.folder}/lib/antsupportlib.jar.bin"
-			failonerror="true"
-			verbose="false"
-			debug="on"
-			includeAntRuntime="no"
-			bootclasspath="${bootclasspath}" 
-			classpath="${basedir}/../org.eclipse.core.runtime/bin;
-					${eclipse.home}/plugins/org.eclipse.core.runtime${version.suffix}/runtime.jar;
-					${basedir}/../org.eclipse.osgi/bin;
-					${eclipse.home}/plugins/org.eclipse.osgi${version.suffix}/osgi.jar;
-					${basedir}/../org.apache.ant/lib/ant.jar;
-					${eclipse.home}/plugins/org.apache.ant${ant_version.suffix}/lib/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>
-
-</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 2af0388..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_3.0.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 8d7553c..0000000
--- a/ant/org.eclipse.ant.core/buildnotes_platform-ant.html
+++ /dev/null

@@ -1,852 +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>Ant Release Notes </title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 18, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61676">61676</a>: AntLaunchShortcut should seed copied config name better<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 11, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51416">51416</a>: Migrate "Run Ant..." action to Run context menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61018">61018</a>: Copy and Paste in Ant Editor inserts extra unwanted tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60303">60303</a>: Variables buttons missing mnemonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55128">55128</a>: Properties value hover shown for text that is not a property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59737">59737</a>: Not all properties set during parsing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61394">61394</a>: Attribute and element elements of macrodef do not present attribute proposals<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61602">61602</a>: ant.ui AntUtil not compiling in HEAD<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61605">61605</a>: more robust version of AntUIPlugin.stop<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61284">61284</a>: Failing code completion tests for Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55618">55618</a>: [Editor] Hover value for old property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60693">60693</a>: No code completions for starting a buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60348">60348</a>: Template proposals show up when code assist for properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60145">60145</a>: ant editor has wrong values for properties for <import><br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60362">60362</a>: Run Ant forces workspace build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61617">61617</a>: valid chars in content type ids<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61652">61652</a>: Move Ant outline actions to Debug context menu launching<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61689">61689</a>: Ant doesn't release taskdef classes after a run<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 4, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60163">60163</a>: Accessibility: New Builder Dialog missing object info for textInput controls<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60546">60546</a>: Default target null does not exist in this project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60521">60521</a>: Global classpath Ant home should indicate default<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60807">60807</a>: Targets tab checkboxes not using dialog font<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60067">60067</a>: Ant Editor adds marker which cannot be deleted<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=59985">59985</a>: Move from ProgressMonitorDialog to IProgressService.busyCursorWhile()<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60312">60312</a>: Adapt to changes from bug 60258<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60473">60473</a>: projecthelp does not work for separate VM builds<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60678">60678</a>: PDE ant tasks fail to load when self hosting<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60691">60691</a>: AntModel should reuse classloader until classpath changes<br>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=60761">60761</a>: Ant build file content-type<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61652">61652</a>: Double quoting doesn't work for variable expansion with external tools<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 27, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59755">59755</a>: Cannot set ant home to ant used in 2.1.x<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59862">59862</a>: Code completion could cache the current prefix<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59024">59024</a>: template code completion doesn't use prefix to limit options<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59866">59866</a>: Copy/Paste of entire lines breaks indentation in Ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57855">57855</a>: Sorting targets option is completely hidden<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53339">53339</a>: Make the InternalAntRunner more lazy<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55662">55662</a>: formatter references deprecated code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59513">59513</a>: ant input task causes stack overflow<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59917">59917</a>: NPE in AntEditorCompletionProcessor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60011">60011</a>: NPE from AntEditor during shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55436">55436</a>: Template additional proposal info is not working<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=59863">59863</a>: Code completion when text selection is not empty<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 20, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47285">47285</a>: Open External File does not work on build.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58426">58426</a>: NPE in PartiallySynchronizedDocument.replace(..)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25590">25590</a>: Should be possible to use variables specifying Ant classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43266">43266</a>: Using variables in Ant Properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57839">57839</a>: Mimic classpath tab support for variables in the classpath pref page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58263">58263</a>: organization of colors for Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55429">55429</a>: Ant editor typing can be slow due to reconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57195">57195</a>: Auto-indent in Ant editor is broken<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 13, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55047">55047</a>: [Editor] Ant tasks and types not cleared when parsing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37943">37943</a>: ${project_loc} for ANT ext tool builder location can't find targets.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56199">56199</a>: AntEditor move to file buffer document provider<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58206">58206</a>: Help with memory footprint: dispose Ant model for Ant doc<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52688">52688</a>: Provide "build_project" variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57317">57317</a>: Typing in Ant buildfile location is brutally slow<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57332">57332</a>: Too much validation going on in launch config Location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57984">57984</a>: NPE from startup with open Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55824">55824</a>: macrodef code assist offers wrong attributes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56296">56296</a>: code assist for custom tasks: type references<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 6, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56959">56959</a>: Move the AntEditorMarkerUpdater to make use of MarkerUtilities<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57140">57140</a>: Ant launching and the prelaunch checks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55823">55823</a>: problems view not updated until save<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54458">54458</a>: formatter swallows text when attribute values include --><br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51215">51215</a>: fix partioner to handle angle brackets in attribute values.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56657">56657</a>: External tool builders need to adapt to new build story<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55355">55355</a>: Move to new template extension point for ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40255">40255</a>: Ant formatter<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54461">54461</a>: add an AutoIndentStrategy to ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55429">55429</a>: Ant editor typing can be slow due to reconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55433">55433</a>: Enhance property file support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55782">55782</a>: Edit/Remove buttons incorrectly enabled for the AntEnvironmentTab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55982">55982</a>: Rename "alternate JRE" to "separate JRE"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49830">49830</a>: Code assist for refid<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54935">54935</a>: Ant editor title image does not indicate error when first opened<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55961">55961</a>: Move/Add the link with editor action to the view menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57000">57000</a>: Do not handle Property file names with spaces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56297">56297</a>: code assist for custom tasks: enumerations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56299">56299</a>: code assist for custom tasks:  boolean attributes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56488">56488</a>: template support should be context aware<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 30, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55818">55818</a>: AntEditorContentOutlinePage retains too much state<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55813">55813</a>: ProjectHelper static state needs to be cleaned up<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56055">56055</a>: Remove top level ant.jar in org.apache.ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56293">56293</a>: editor incorrectly reports "taskdef class not found<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=56258">56258</a>: escape entities in ant warning hovers<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 23, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54756">54756</a>: add *.macrodef & *.ent to editor's file associations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50303">50303</a>: Ant Editor outline "Link with Editor"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55118">55118</a>: NPE from AntModel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55313">55313</a>: Add a mnemonic for one of the launch config tabs for builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38935">38935</a>: Completion for custom ant tasks in ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54933">54933</a>: Ant error overlay drawn in different quadrant than Java<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37180">37180</a>: Ant editor errors and warnings should appear in the problem list<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49829">49829</a>: Code assist should include previously defined macrodefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50452">50452</a>: Another way to resolve a location for a tools.jar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53688">53688</a>: Update Ant preference page to reflect classpath tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53715">53715</a>: Add environment tab to Ant launch config types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55003">55003</a>: Nodes with warnings have error icon<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55140">55140</a>: Build hangs if running on separate VM that is older than 1.4<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52076">52076</a>: Preference page for the Ant Formatter<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52449">52449</a>: Show error for target that depends on a non-existant target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55119">55119</a>: Assertion failed dumped to console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55122">55122</a>: Ant editor code assist locks up Eclipse if reconciling error<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55543">55543</a>: Opening an Ant editor is taking 10 seconds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54937">54937</a>: [Editor] Changing property does not change value<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53458">53458</a>: "Import" elements open with select element in open editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50986">50986</a>: Classpath tab for External tool Ant builds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55306">55306</a>: Incorrect schema for org.eclipse.ant.core.extraClasspathEntries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51307">51307</a>: calls to taskdef printing "Dropping \d from path as it doesn't exist"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52446">52446</a>: Label for tasks/types has leading slash<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 16, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54115">54115</a>: Hungry code assist (is eating characters)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54359">54359</a>: Button enablement on the classpath tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54361">54361</a>: Missing Ant home no longer indicated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52724">52724</a>: Errors from the ant task do not provide links<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51825">51825</a>: add to outline view "filter top level tasks and types" action<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54731">54731</a>: remove dependency on apache ant in ant core and ui buildfiles<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54784">54784</a>: NPE from XMLTextHover<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38267">38267</a>: tools.jar needs to be updated when setting to run in a separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51698">51698</a>: Output still displayed when "Capture output" off in sep VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54369">54369</a>: Remove pref for "Warn ... for changing the Ant JRE"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53152">53152</a>: Eclipse "locks up" aka super slow when editing a large build.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54664">54664</a>: Cannot run a build.xml from a non-Java project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48934">48934</a>: Move to use the Platform UI color support<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 9, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53316">53316</a>: Hidden functionality of the copy button for builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53511">53511</a>: External tool builders run in background when they shouldn't<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49445">49445</a>: outline and ant runner views should  include imported targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34685">34685</a>: Error indicated but no error squiggle or message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53681">53681</a>: NPE if external entity does not exist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49014">49014</a>: Classpath should be expanded on entry into tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48051">48051</a>: Add "Restore defaults" button to the Ant Classpath Page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48053">48053</a>: Remove Update classpath functionality from the JRE tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52883">52883</a>: SeparateVM Ant builds cannot be specified to run in the foreground<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53778">53778</a>: Ant classpath missing global entries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53891">53891</a>: Spelling error in Ant Code Formatter preference page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53696">53696</a>: Failing Ant UI test: testMixedElement<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53547">53547</a>: Ant Outline view - toggle control to Show/Hide included elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53690">53690</a>: Code completion proposals case sensitive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52211">52211</a>: Persisting classpath when the same as default<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40688">40688</a>: Code assist for closing a task should not need "&lt/"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54113">54113</a>: [Editor] Highlight range incorrect for selected element<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53687">53687</a>: StringIndexOutOfBoundsException on code completion<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52040">52040</a>: Ant editor reports error on my custom task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48041">48041</a>: Updating classpath support for separate VMs<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Mar 2, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52973">52973</a>: Better message for specifying an Ant home that does not exist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52972">52972</a>: Ant classpath tab does not indicate an error if the Ant home has been deleted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53115">53115</a>: Contribute remote Ant support as an extraClasspathEntry<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53244">53244</a>: External tool builders generate outgoing "ATTR_LAUNCH_IN_BACKGROUND" change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51726">51726</a>: Show In is enabled for selections in Ant editor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51731">51731</a>: Navigate/Show In for external elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51347">51347</a>: External entity support (Open With etc)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53125">53125</a>: Navigate support for Import<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=53142">53142</a>: ClassCastException determining properties for top level code assist<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 24, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52209">52209</a>: JARs from global classpath not found for build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52332">52332</a>: caret off by one after code assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51579">51579</a>: Pref Page Ant/Editor/Annotations; 2 checkboxes do not use dialog font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51784">51784</a>: Setting Java executable for Alternate JRE is forgotten<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37944">37944</a>: .project file paths to external tools hardcoded to specific project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52400">52400</a>: ClassCastException in BuilderPropertyPage<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52713">52713</a>: Provide descriptions for Ant and Program config types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52329">52329</a>: Move to Ant 1.6.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40618">40618</a>: No JRE tab for Ant project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47373">47373</a>: Setting properties for separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51733">51733</a>: Code assist: no completions available<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51007">51007</a>: Review the "remove Xerces" code in AntRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47901">47901</a>: Extend contributed "object"s extension points to specify whether to be included in separate VM build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52793">52793</a>: Builder Launch in Background setting is forgotten<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47312">47312</a>: Setting tasks and types for separate VM build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51101">51101</a>: [Dialogs] New Builder Dialog should not come up w/ an error message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51393">51393</a>: Ant in external JVM doesn't honor extraClassPath extension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38821">38821</a>: Ant editor: indenting size<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 17, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51694">51694</a>: base directory not honored when run in separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51696">51696</a>: alternate label for Ant build file "Location"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51789">51789</a>: Run Ant... in ant view does not run<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52200">52200</a>: NPE possible if hovering over text in AntEditor with no project node<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=52182">52182</a>: BadLocationException during reconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51937">51937</a>: Widget is disposed proglem possible from BuilderPropertyPage<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 12, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51882">51882</a>: Project builders property dialog fails with graphic disposed<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 10, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51332">51332</a>: Outline positions to wrong offset in editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50389">50389</a>: Problem altering order of ant targets when mutliple targets selected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49554">49554</a>: JDK 1.5 and Ant Editor troubles<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51298">51298</a>: No "Environment" tab on program project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51319">51319</a>: "Run" in Outline View does not work for default target<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 3, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50795">50795</a>: Possible lockup from executing implicit target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50410">50410</a>: Cannot use older Ant installs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50494">50494</a>: AntView context menu cleanup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50505">50505</a>: Malformed URL exception from antcore preferences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49275">49275</a>: Ant Editor Outline view - no longer works as of M5<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49792">49792</a>: Update the Ant code assist support files for Ant 1.6.0<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 27, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45915">45915</a>: Checkbox table view for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44125">44125</a>: Performance issues with Ant editor: slow to open<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50351">50351</a>: Should not be able to remove/edit wrapped builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40501">40501</a>: Missing Ant syntax errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44995">44995</a>: Option to hide properties in Ant outline view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50529">50529</a>: incorrect error annotation length for error target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44343">44343</a>: Create an object model for Ant UI<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50575">50575</a>: Editor selection is incorrect for some multiline elements<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50046">50046</a>: Add property text hovering to the Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49386">49386</a>: code assist should include previosly defined properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50653">50653</a>: No code assist proposals when starting in error state<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 20, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50019">50019</a>: No overview ruler for the AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49579">49579</a>: Adapt to the marker annotation changes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50016">50016</a>: AntEditorPreferencePage does not present all of the annotation prefs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34548">34548</a>: Add 'Run task' to outline view of build.xml files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50144">50144</a>: Classpath for separate Ant build is duplicated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=50170">50170</a>: TaskDescriptionProvider could be shared by all AntEditors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33361">33361</a>: [External Tools] copy button does nothing<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 13, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49747">49747</a>: misspelled title in Any Property File Selection Dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49709">49709</a>: ClassCastException when adding non-file as a property file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32727">32727</a>: Console color for Ant not updated until forced to redraw<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45923">45923</a>: Move to Ant 1.6<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49810">49810</a>: Code assist for attributes of a target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41591">41591</a>: Ant 1.6 new options<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49886">49886</a>: Hide internal targets icon needs to be updated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49697">49697</a>: ant editor outline page's label provider is case sensitive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49380">49380</a>: editor outline should have icon for macrodef<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44491">44491</a>: Move to using ProjectHelper2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47581">47581</a>: Duplicates on the Ant runtime classpath<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 6, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48803">48803</a>: Run ant doesnt save build.xml before display of run dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=49016">49016</a>: [Ant view] Missing acclerator keys<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 15, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48127">48127</a>: Ant will not launch with an incomplete class path<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48445">48445</a>: Ant core external tool builder not successful<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47422">47422</a>: Internal error on launching ant target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48747">48747</a>: Specify Ant logger argument then build fails<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 9, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47941">47941</a>: Ant core buildfiles doesn't work without binary plugins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48098">48098</a>: NPE creating new Ant launch configuration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48012">48012</a>: BuildFailedTracker does not handle failure message with no line numbers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44935">44935</a>: Xerces warnings for Ant classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47137">47137</a>: Context menu actions of the AntEditor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48113">48113</a>: Select an element in the AntView after single deletion<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37332">37332</a>: Targets tab needs to reset if classpath changed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39251">39251</a>: Need some way for variables to provide multiple arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47139">47139</a>: changing color pref does not update editor until re-opened<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47140">47140</a>: Ant editor missing current line highlight<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47289">47289</a>: Ant UI giving wrong error message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48184">48184</a>: org.apache.ant must not list any dependencies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=48165">48165</a>: Error when location is corrected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43814">43814</a>: Ant Runtime error, but do not affect eclipse work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46897">46897</a>: Ant view not sorted after a project is renamed.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47933">47933</a>: Multiple listeners added to fields in ExternalToolsMainTab<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 2, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47745">47745</a>: Remove xerces from ant ui tests for seperate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45974">45974</a>: Move the Ant projects to use the PDE required plugins container support<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44565">44565</a>: StringIndexOutOfBounds from BuildFailedTracker<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47308">47308</a>: Add Ant task error in preferences in 3.0M5<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47368">47368</a>: Ant custom tasks and types need to use variables<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47748">47748</a>: Should not prompt when running tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45985">45985</a>: BUILD FAILED: java.lang.NoSuchMethodError: attempting to use jar task on Ant 1.6b2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42983">42983</a>: Variables get run mutliple times for Run ant...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47370">47370</a>: Improve AntPage.getContents(boolean)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47477">47477</a>: Improve Builders property page description<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47821">47821</a>: Do not force the expansion of the Ant classpath entries<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30638">30638</a>: Ant Runtime page is cut off in High Contrast<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 25, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47155">47155</a>: Context menu for plugin.xml file should not have Run Ant...<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 20, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46916">46916</a>: Ant source is shipped in the wrong directory<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47133">47133</a>: Non-Java project Ant build defaults to same VM<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 19, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=47043">47043</a>: Update the classpath for a separate JRE leads to a NPE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46815">46815</a>: VM widgets enabled when set to run in same VM<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 18, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36406">36406</a>: Ant target icons conflict with GTK tree expander<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46740">46740</a>: Loss of the separate output directories for org.eclipse.ant.ui<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46734">46734</a>: No error logged if Build logger incompatible instance<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46703">46703</a>: Moving multiple Ant classpath entries does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43798">43798</a>: Incessant dialogs when trying to set the JRE for Ant config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46819">46819</a>: enable/disable builder bug - cannot cancel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29677">29677</a>: Need A Way To Run Ant Instead of The Default Java Builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45899">45899</a>: Make build in separate VM the default setting for Ant launch configs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45995">45995</a>: Setting Ant home adds jars in reverse order<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 11, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=46049">46049</a>: Rename "external tool builders" property page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45644">45644</a>: NumberFormatException if multiline build errors in remote VM build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44093">44093</a>: Tests for external tool builder migration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45781">45781</a>: tools.jar on classpath<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 28, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44494">44494</a>: Remove direct dependancies on the Xerces plugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44988">44988</a>: Incorrect javac output with -verbose<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45285">45285</a>: Multi-select in AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44368">44368</a>: Space between buttons on Ant tasks and types page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45473">45473</a>: AntRunner.setMessageOutputLevel should only set when changed from dflt<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45288">45288</a>: Help: Running Ant buildfiles programmatically incorrect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45881">45881</a>: NPE in AntCorePreference<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45844">45844</a>: Ant problems in I20031029 when no tools.jar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=45450">45450</a>: Rework the presentation of the Ant classpath<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 21, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44369">44369</a>: Duplicate mneumonic on the Ant Editor Code Assist page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44271">44271</a>: Update OutlinePreparingHandler for deprecations in IDocument<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41289">41289</a>: TaskLinkManager needs to be cleaned up earlier<br>
-
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 7, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43845">43845</a>: Ant Editor code assist should display error in the status bar<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43541">43541</a>: Run Ant... launch config comes up in dirty state<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44042">44042</a>: Move the Ant test console line tracker to implement IConsoleLineTrackerExtension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35687">35687</a>: AntEditor should demonstrate proper use of MultiLineRule in conjunction with damager/repairer<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=44090">44090</a>: Error building org.eclipse.core.resources<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38243">38243</a>: Editing an external tool builder modifies the .project file<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 30, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39250">39250</a>: DnD build file into ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37287">37287</a>: Ant view not persisted within session<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38677">38677</a>: Ant target table sorting and filtering<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43522">43522</a>: Ant preference page does not update for preference change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43255">43255</a>: Junit tasks showing "null"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43384">43384</a>: Info to make running separate JRE easier<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43542">43542</a>: Ant home Browse button on the AntClasspath tab has incorrect layout<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40269">40269</a>: Document requirements for developing Ant tasks in self hosting workspace<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43773">43773</a>: Project Resource doesn't Refresh for External Tool in separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42595">42595</a>: NPE while scrolling background ant output in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43626">43626</a>: BuildFailedTracker not adding link<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43628">43628</a>: Review all uses of getFileForLocation(IPath)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40500">40500</a>: Incorrect code assist in AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43618">43618</a>: Child jvm for ant build not exiting when build fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43530">43530</a>: Newly added classpath elements should be selected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43081">43081</a>: Ant Errors not linking to source when using linked folders<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 23, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38995">38995</a>: Cannot run target from antview - "An error occurred please see log for more details<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43322">43322</a>: [External Tools] Cannot create new 'program' config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41819">41819</a>: Document the antRunner application entry point<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38389">38389</a>: AntClasspathTab top label gets truncated<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43382">43382</a>: AntWorkingDirectoryBlock not disabled fully for same VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41877">41877</a>:	Change from "show" to "do not show"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43287">43287</a>: [Dialog] Ant Build Targets tab font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43320">43320</a>: Ant "tables" are not "delete" enabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43363">43363</a>: Cannot use user's xerces to parse targets<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 16, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42334">42334</a>: Pref Page Ant/Runtime Button labeling inconsistencies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42808">42808</a>: After creation of new Ant object select that object<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33673">33673</a>: Option to filter subtargets from Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42926">42926</a>: ant.home not set at parse time<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42491">42491</a>: Can edit contributed Ant objects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42495">42495</a>:	Change in DirectoryDialog behavior dealing with ampersands in message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42741">42741</a>:	Config classpath does not update for change in global Ant home<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42983">42983</a>:	Variables get run multiple times for Run ant...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=43043">43043</a>:	-help does not work for Ant build in separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39295">39295</a>:	Sort targets alphabetically in Ant outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42966">42966</a>:	New option shortcuts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34001">34001</a>:	Warn user when specifies Xerces on Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38815">38815</a>:	update Xerces in the Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42984">42984</a>: No way to set working directory, VM args for Ant processes<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 9, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42327">42327</a>: [Dialog] "Order targets" dialog margin spaces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42063">42063</a>: Pref Page Ant/Runtime Add.. dialog margin spacing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41998">41998</a>: RemoteAntBuildListener server connection not closed on failure<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42351">42351</a>: Ant UI and help contexts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42420">42420</a>: No progress shown when external program running in foreground<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41068">41068</a>: Ant in separate VM does not color output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41156">41156</a>: Links for tasks missing if use -debug<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42222">42222</a>: Separate VM console output not showing till end<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41997">41997</a>: Clean up RemoteAntBuildLogger<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37653">37653</a>: ant.home is not set<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41671">41671</a>: Ant error popups message box and prints into the console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42136">42136</a>: External tools; Ant BuildConfiguration; JRE tab problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42333">42333</a>: Ant build failed error messages no longer shown in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42484">42484</a>: NPE if ctrl dbl click in Ant properties block<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42737">42737</a>: Subtarget -> internal target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39294">39294</a>: Allow filtering of helper targets in Ant outline<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Sept 2, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41581">41581</a>: The Ant UI packages are incorrectly named<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42137">42137</a>: External tools; Ant Build Configuration; Properties tab; button sizes<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 27, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42029">42029</a>: eclipse.running flag not being set properly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=42073">42073</a>: Can't manually build plug-ins<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40972">40972</a>: Ant class loader should define findClass, not loadClass<br>
-<h1>
-
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 26, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41779">41779</a>: Run ant has no effect from within the synchronize view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39567">39567</a>: Use a Job for the BackgroundResourceRefresher<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41835">41835</a>: Ant in separate VM setting eclipse.running<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41841">41841</a>: Use InternalAntRunner as Ant entry point for separate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41521">41521</a>: AntConsoleColorProvider should be marked as readOnly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41816">41816</a>: Ant Editor annotation list should be dynamically sized.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40069">40069</a>: Move Ant editor to use standard annotation types<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 20, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41498">41498</a>: Update doc for Ant properties extension point<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41301">41301</a>: BuilderPropertyPage should have both enable and disable buttons<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41300">41300</a>: No multi-select in the External Tool builder property page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41277">41277</a>: Move to Ant 1.5.4<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41616">41616</a>: Ant view play button should be async<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41717">41717</a>: NPE in AntEditor on latest text framework<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 12, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40922">40922</a>: Ability to disable an external tool builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41273">41273</a>: Build Options page does not use dialog font for widgets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41157">41157</a>: links missing in seperate VM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41120">41120</a>: Buildfile link not available when using -debug<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40490">40490</a>: Scoped external tool builder not triggered if change in different project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41119">41119</a>: Multi-line task output differs from cmd line Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40037">40037</a>: Duplicate properties silently fail<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41419">41419</a>: Can overwrite contributed properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41454">41454</a>: NPE out of AntProcessBuildLogger<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Aug 6, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34415">34415</a>: Missing file link in build failed message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40502">40502</a>: Provide an extension to set ant property values<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40871">40871</a>: No code assist proposals for properties in echo task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40935">40935</a>: BUILD FAILED message with ant: handling "-Debug"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40951">40951</a>: NullPointerException at autocompletion on sql tag<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41041">41041</a>: Remote Ant should not have extra classpath entries on the classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24129">24129</a>: Ability to (optionally) run ANT in a separate JVM<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=41158">41158</a>: NPE from ant classpath provider<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 29, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40672">40672</a>: NPE during full build in ExternalToolBuilder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37248">37248</a>: Make org.eclipse.ant.tests.ui part of the build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37902">37902</a>: Code-Assist for <fail> tasks makes incorrect suggestions<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40733">40733</a>: Contributed Ant objects should indicate contributor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40778">40778</a>: Questionable Ant warning: "library tools.jar not on runtime classpath"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40165">40165</a>: Notify user when Ant does not have tools.jar on the Ant runtime classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40879">40879</a>: Tests needed for Ant Core<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 22, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40254">40254</a>: Ant code assist should not require "<"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40212">40212</a>: incorrect location of 'properties' in context menu of ant view<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 16, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40044">40044</a>: Incorrect error message if remove auto activation delay<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38844">38844</a>: Two code assist entries for WsdlToDotnet task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40138">40138</a>: Incorrect dialog titles for adding / editing tasks / types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40277">40277</a>: Update the package names for the Ant UI tests<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 15, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39722">39722</a>: Ant core schemas should mark the library as a resource<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39713">39713</a>: Ant build not triggered on second save<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38614">38614</a>: External tool builder not triggered when checking project out from repository<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39215">39215</a>: Ant is run in Java Applet security mode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39067">39067</a>: Allow to run same build.xml multiple times<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39814">39814</a>: core.resources has invalid external tool builder??<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=39978">39978</a>: Edit button should be disabled for multiselect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34597">34597</a>: Search results are not shown in overview ruler or as squigglies<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=40048">40048</a>: Ant editor has no syntax highlighting<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build July 8, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38525">38525</a>: Deadlock refreshing resources for an external tool when in background<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38900">38900</a>: Ant target names not quoted when "Run Ant in a separate Java virtual machine" is checked<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build June 17, 2003
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38820">38820</a>: Ant editor: Content Assist wrong behaviour with upper case<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38728">38728</a>: Remove AntClassloader workarounds for self hosting<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38707">38707</a>: Working sets should not be considered for full builds<br>
-
-<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/.cvsignore b/ant/org.eclipse.ant.core/doc/.cvsignore
deleted file mode 100644
index d06d4c1..0000000
--- a/ant/org.eclipse.ant.core/doc/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-book.css
-org_eclipse_ant_core_antProperties.html
-org_eclipse_ant_core_antTasks.html
-org_eclipse_ant_core_antTypes.html
-org_eclipse_ant_core_extraClasspathEntries.html
-schema.css

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 8eb1b67..0000000
--- a/ant/org.eclipse.ant.core/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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
-propertiesName = Ant Properties Definitions
-
-antBuildFileContentType.name= Ant BuildFile

diff --git a/ant/org.eclipse.ant.core/plugin.xml b/ant/org.eclipse.ant.core/plugin.xml
deleted file mode 100644
index 6ee1552..0000000
--- a/ant/org.eclipse.ant.core/plugin.xml
+++ /dev/null

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ant.core"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.core.AntCorePlugin">
-
-   <runtime>
-      <library name="antsupport.jar">
-         <export name="*"/>
-         <packages prefixes="org.eclipse.ant"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-   </requires>
-   
-   <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"/>
-   <extension-point id="antProperties" name="%propertiesName" schema="schema/antProperties.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>
-    <extension
-      	 point="org.eclipse.ant.core.antProperties">
-      <antProperty
-            name="eclipse.home"
-            class="org.eclipse.ant.internal.core.AntPropertyValueProvider">
-      </antProperty>
-       <antProperty
-            name="eclipse.running"
-            class="org.eclipse.ant.internal.core.AntPropertyValueProvider">
-      </antProperty>
-    </extension>
-    
-	<extension 
-		point="org.eclipse.core.runtime.contentTypes"> 
-		<content-type  
-			id="antBuildFile" 
-			name="%antBuildFileContentType.name" 
-			base-type="org.eclipse.core.runtime.xml" 
-			priority="high"> 
-			<describer 
-				class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber"> 
-				<parameter name="element" value="project" /> 
-			</describer> 
-		</content-type> 
-   </extension>
-</plugin>

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/antProperties.exsd b/ant/org.eclipse.ant.core/schema/antProperties.exsd
deleted file mode 100644
index 593ff48..0000000
--- a/ant/org.eclipse.ant.core/schema/antProperties.exsd
+++ /dev/null

@@ -1,148 +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="antProperties" name="Ant Properties"/>

-      </appInfo>

-      <documentation>

-         Allows plug-ins to define Ant properties for use in Ant build files.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="antProperty" 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="antProperty">

-      <annotation>

-         <appInfo>

-            <meta.element labelAttribute="name"/>

-         </appInfo>

-      </annotation>

-      <complexType>

-         <attribute name="name" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The name of the property.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="value" type="string">

-            <annotation>

-               <documentation>

-                  The value of the property.
-                  If a value is provided here, the &quot;class&quot; attribute is ignored.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string">

-            <annotation>

-               <documentation>

-                  If there is no &apos;value&apos; attribute provided, this class is called to return the dynamic value for the Ant property.  If null is returned, the value is not set.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.ant.core.IAntPropertyProvider"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="headless" type="boolean">

-            <annotation>

-               <documentation>

-                  indicates whether this property is suitable for use in a &quot;headless&quot; Ant environment. If running headless and the attribute is &quot;false&quot;, 
-                  the property will not be set and any specified &lt;samp&gt;org.eclipse.ant.core.IAntPropertyProvider&lt;/samp&gt; will not be instantiated.
-                  The implied value is true, when not specified.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="eclipseRuntime" type="boolean">

-            <annotation>

-               <documentation>

-                  indicates whether this property should only be considered when run in the same VM as Eclipse. The implied value is true, when not specified.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         3.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of an Ant properties extension point: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.ant.core.antProperties&quot;&gt;
-      &lt;antProperty name=&quot;eclipse.home&quot;
-           class=&quot;org.eclipse.ant.internal.core.AntPropertyValueProvider&quot;/&gt;
-      &lt;antProperty name=&quot;eclipse.running&quot;
-           value=&quot;true&quot;/&gt;
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         The class named in the &lt;samp&gt;class&lt;/samp&gt; property must implement the &lt;samp&gt;org.eclipse.ant.core.IAntPropertyProvider&lt;/samp&gt; interface.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         The platform uses this mechanism to set the Ant property eclipse.home to the Eclipse installation directory and to set the eclipse.running property.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         &lt;a href=&quot;hglegal.htm&quot;&gt;&lt;img SRC=&quot;ngibmcpy.gif&quot; ALT=&quot;Copyright IBM Corp. 2003.  All Rights Reserved.&quot; BORDER=0 height=12 width=195&gt;&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>


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 19d9d0c..0000000
--- a/ant/org.eclipse.ant.core/schema/antTasks.exsd
+++ /dev/null

@@ -1,142 +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>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="headless" type="boolean">
-            <annotation>
-               <documentation>
-                  indicates whether this task is suitable for use in a &quot;headless&quot; Ant environment. If running headless and the attribute is &quot;false&quot;, 
-                  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>
-         <attribute name="eclipseRuntime" type="boolean">
-            <annotation>
-               <documentation>
-                  indicates whether this task requires an Eclipse runtime (i.e. must be run in the same VM as Eclipse). 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=&quot;org.eclipse.ant.core.antTasks&quot;&gt;
-      &lt;antTask name=&quot;coolTask&quot; class=&quot;com.example.CoolTask&quot; library=&quot;lib/antSupport.jar&quot;/&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=&quot;hglegal.htm&quot;&gt;&lt;img SRC=&quot;ngibmcpy.gif&quot; ALT=&quot;Copyright IBM Corp. 2000, 2003.  All Rights Reserved.&quot; 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 0ca97c8..0000000
--- a/ant/org.eclipse.ant.core/schema/antTypes.exsd
+++ /dev/null

@@ -1,133 +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>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="headless" type="boolean">
-            <annotation>
-               <documentation>
-                  indicates whether this type is suitable for use in a &quot;headless&quot; Ant environment. If running headless and the attribute is &quot;false&quot;, 
-                  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>
-         <attribute name="eclipseRuntime" type="boolean">
-            <annotation>
-               <documentation>
-                  indicates whether this type requires an Eclipse runtime (i.e. must be run in the same VM as Eclipse). 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=&quot;org.eclipse.ant.core.antTypes&quot;&gt;
-      &lt;antType name=&quot;coolType&quot; class=&quot;com.example.CoolType&quot; library=&quot;lib/antSupport.jar&quot;/&gt;
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         &lt;a href=&quot;hglegal.htm&quot;&gt;&lt;img SRC=&quot;ngibmcpy.gif&quot; ALT=&quot;Copyright IBM Corp. 2000, 2003.  All Rights Reserved.&quot; 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 60798ff..0000000
--- a/ant/org.eclipse.ant.core/schema/extraClasspathEntries.exsd
+++ /dev/null

@@ -1,111 +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>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="headless" type="boolean">
-            <annotation>
-               <documentation>
-                  indicates whether this extra classpath entry is suitable for use in a &quot;headless&quot; Ant environment. If running headless and the attribute is &quot;false&quot;, 
-                  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>
-         <attribute name="eclipseRuntime" type="boolean">
-            <annotation>
-               <documentation>
-                  indicates whether this extra classpath entry should only be considered for builds run in the same VM as Eclipse. 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=&quot;org.eclipse.ant.core.extraClasspathEntries&quot;&gt;
-  &lt;extraClasspathEntry library=&quot;myExtraLibrary.jar&quot;/&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=&quot;hglegal.htm&quot;&gt;&lt;img SRC=&quot;ngibmcpy.gif&quot; ALT=&quot;Copyright IBM Corp. 2000, 2003.  All Rights Reserved.&quot; 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 1285ffb..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java
+++ /dev/null

@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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>"antProperties"</code>)
-	 * for the Ant properties extension point.
-	 * 
-	 * @since 3.0
-	 */
-	public static final String PT_PROPERTIES = "antProperties"; //$NON-NLS-1$
-	
-	/**
-	 * Simple identifier constant (value <code>"org.eclipse.ant.core.antBuildFile"</code>)
-	 * for the content type of an Ant BuildFile
-	 * 
-	 * @since 3.0
-	 */
-	public static final String ANT_BUILDFILE_CONTENT_TYPE = PI_ANTCORE + ".antBuildFile"; //$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$
-	
-	/**
-	 * Simple identifier constant (value <code>"eclipseRuntime"</code>) of a tag
-	 * that appears in Ant extensions.
-	 * @since 3.0
-	 */
-	public static final String ECLIPSE_RUNTIME = "eclipseRuntime"; //$NON-NLS-1$
-	
-	/**
-	 * Simple identifier constant (value <code>"value"</code>) of a tag
-	 * that appears in Ant extensions.
-	 * @since 3.0
-	 */
-	public static final String VALUE = "value"; //$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 descriptor the plug-in descriptor for the
-	 *   Ant Core plug-in
-	 */
-	public AntCorePlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		plugin = this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#shutdown()
-	 */
-	public void shutdown() {
-		if (preferences == null) {
-			return;
-		}
-		preferences.updatePluginPreferences();
-		savePluginPreferences();
-	}
-
-	/**
-	 * Given an extension point name, extract its extensions and return them
-	 * as a List.
-	 * @param pointName The name of the extension point
-	 * @return The list of the extensions
-	 */
-	private List extractExtensions(String pointName) {
-		IExtensionPoint extensionPoint = getDescriptor().getExtensionPoint(pointName);
-		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), extractExtensions(PT_PROPERTIES), false);
-		}
-		return preferences;
-	}
-	
-	/**
-	 * Set this plug-in's preferences for running headless based on the 
-	 * headless parameter.
-	 * This method is public for testing purposes only. It should not
-	 * be called outside of the Ant integration framework.
-	 * @param headless Whether or not to mark that the plug-in is running headless or not
-	 */
-	public void setRunningHeadless(boolean headless) {
-		preferences = new AntCorePreferences(extractExtensions(PT_TASKS), extractExtensions(PT_EXTRA_CLASSPATH), extractExtensions(PT_TYPES), extractExtensions(PT_PROPERTIES), headless);
-	}
-
-	/**
-	 * 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
-	 */
-	public ClassLoader getNewClassLoader() {
-		return getNewClassLoader(false);
-	}
-	
-	/**
-	 * Returns a new class loader to use when executing Ant builds or 
-	 * other applications such as parsing or code proposal determination 
-	 * @param allowLoading whether to allow plugin classloaders associated 
-	 * with the new classloader to load Apache Ant classes.
-	 * @return the new class loader
-	 */
-	public ClassLoader getNewClassLoader(boolean allowLoading) {
-		AntCorePreferences corePreferences = getPreferences();
-		URL[] urls = corePreferences.getURLs();
-		ClassLoader[] pluginLoaders = corePreferences.getPluginClassLoaders();
-		AntClassLoader loader= new AntClassLoader(urls, pluginLoaders);
-		loader.allowPluginClassLoadersToLoadAntClasses(allowLoading);
-		return loader;
-	}
-	
-	/**
-	 * 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 cb6f4a6..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
+++ /dev/null

@@ -1,1487 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Thierry Lach (thierry.lach@bbdodetroit.com) - bug 40502
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import org.eclipse.ant.internal.core.AntClasspathEntry;
-import org.eclipse.ant.internal.core.AntObject;
-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.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.ILibrary;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginPrerequisite;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IDynamicVariable;
-import org.eclipse.core.variables.VariablesPlugin;
-
-
-/**
- * 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 List defaultProperties;
-	private IAntClasspathEntry[] defaultAntHomeEntries;
-	
-	private Task[] customTasks;
-	private Task[] oldCustomTasks;
-	private Type[] customTypes;
-	private Type[] oldCustomTypes;
-	private IAntClasspathEntry[] antHomeEntries;
-	private IAntClasspathEntry[] additionalEntries;
-	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) {
-		this(defaultTasks, defaultExtraClasspath, defaultTypes, Collections.EMPTY_LIST, headless);
-	}
-	
-	protected AntCorePreferences(List defaultTasks, List defaultExtraClasspath, List defaultTypes, List defaultProperties, boolean headless) {
-		runningHeadless= headless;
-		initializePluginClassLoaders();
-		extraClasspathURLs = new ArrayList(20);
-		this.defaultTasks = computeDefaultTasks(defaultTasks);
-		this.defaultTypes = computeDefaultTypes(defaultTypes);
-		computeDefaultExtraClasspathEntries(defaultExtraClasspath);
-		computeDefaultProperties(defaultProperties);
-		restoreCustomObjects();
-		
-	}
-	
-	/**
-	 * When a preference changes, update the in-memory cache of the preference.
-	 * @param event The property change event that has occurred.
-	 * @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_HOME_ENTRIES)) {
-			restoreAntHomeEntries(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_ADDITIONAL_ENTRIES)) {
-			restoreAdditionalEntries(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();
-		restoreAntHome(prefs);
-		restoreTasks(prefs);
-		restoreTypes(prefs);
-		restoreAntHomeEntries(prefs);
-		restoreAdditionalEntries(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 restoreAntHomeEntries(Preferences prefs) {
-		String entries = prefs.getString("ant_urls"); //old constant //$NON-NLS-1$
-		if (entries.equals("")) {//$NON-NLS-1$
-			entries= prefs.getString(IAntCoreConstants.PREFERENCE_ANT_HOME_ENTRIES);
-		} else {
-			prefs.setToDefault("ant_urls"); //$NON-NLS-1$
-			antHomeEntries= migrateURLEntries(getArrayFromString(entries));
-			return;
-		}
-		if (entries.equals("")) {//$NON-NLS-1$
-			antHomeEntries= getDefaultAntHomeEntries();
-		} else {
-			antHomeEntries= extractEntries(getArrayFromString(entries));
-		}
-	}
-	
-	private void restoreAdditionalEntries(Preferences prefs) {
-		String entries = prefs.getString("urls"); //old constant //$NON-NLS-1$
-		if (entries.equals("")) {//$NON-NLS-1$
-			entries = prefs.getString(IAntCoreConstants.PREFERENCE_ADDITIONAL_ENTRIES);
-		} else {
-			prefs.setToDefault("urls"); //$NON-NLS-1$
-			additionalEntries= migrateURLEntries(getArrayFromString(entries));
-			return;
-		}
-		if (entries.equals("")) {//$NON-NLS-1$
-			IAntClasspathEntry toolsJarEntry= getToolsJarEntry();
-			if (toolsJarEntry == null) {
-				additionalEntries= new IAntClasspathEntry[0];
-			} else {
-				additionalEntries= new IAntClasspathEntry[] { toolsJarEntry };
-			}
-		} else {
-			additionalEntries= extractEntries(getArrayFromString(entries));
-		}
-	}
-	
-	/*
-	 * Migrates the persisted url entries restored from a workspace older than 3.0
-	 */
-	private IAntClasspathEntry[] migrateURLEntries(String[] urlEntries) {
-		List result = new ArrayList(urlEntries.length);
-		for (int i = 0; i < urlEntries.length; i++) {
-			URL url;
-			try {
-				url = new URL (urlEntries[i]);
-			} catch (MalformedURLException e) {
-				continue;
-			}
-			result.add(new AntClasspathEntry(url));
-		}
-		return (IAntClasspathEntry[])result.toArray(new IAntClasspathEntry[result.size()]);
-	}
-
-	private void restoreAntHome(Preferences prefs) {
-		antHome= prefs.getString(IAntCoreConstants.PREFERENCE_ANT_HOME);
-		if (antHome == null || antHome.length() == 0) {
-			antHome= getDefaultAntHome();
-		}
-	}
-	
-	/**
-	 * Returns the absolute path of the default ant.home to use for the build.
-	 * The default is the org.apache.ant plugin folder provided with Eclipse.
-	 * 
-	 * @return String absolute path of the default ant.home
-	 * @since 3.0
-	 */
-	public String getDefaultAntHome() {
-		IAntClasspathEntry[] entries= getDefaultAntHomeEntries();
-		if (entries.length > 0) {
-			URL antjar= entries[0].getEntryURL();
-			IPath antHomePath= new Path(antjar.getFile());
-			//parent directory of the lib directory
-			antHomePath= antHomePath.removeLastSegments(2);
-			return antHomePath.toFile().getAbsolutePath();
-		} 
-		return null;
-	}
-	
-	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++) {
-			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]);
-			String library= values[1];
-			if (library.startsWith("file:")) { //$NON-NLS-1$
-				//old format where URLs were persisted
-				library= library.substring(5);
-			}
-			task.setLibraryEntry(new AntClasspathEntry(library));
-			result.add(task);
-		}
-		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++) {
-			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]);
-			String library= values[1];
-			if (library.startsWith("file:")) { //$NON-NLS-1$
-				//old format where URLs were persisted
-				library= library.substring(5);
-			}
-			type.setLibraryEntry(new AntClasspathEntry(library));
-			result.add(type);
-		}
-		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;
-	}
-
-	private IAntClasspathEntry[] extractEntries(String[] entries) {
-		IAntClasspathEntry[] result = new IAntClasspathEntry[entries.length];
-		for (int i = 0; i < entries.length; i++) {
-			result[i]= new AntClasspathEntry(entries[i]);
-		}
-		return result;
-	}
-
-	/**
-	 * Returns the array of URLs that is the default set of URLs defining
-	 * the Ant classpath.
-	 * 
-	 * 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
-	 * @deprecated
-	 */
-	public URL[] getDefaultAntURLs() {
-		IAntClasspathEntry[] entries= getDefaultAntHomeEntries();
-		List result= new ArrayList(3);
-		for (int i = 0; i < entries.length; i++) {
-			IAntClasspathEntry entry = entries[i];
-			result.add(entry.getEntryURL());
-		}
-		URL toolsURL= getToolsJarURL();
-		if (toolsURL != null) {
-			result.add(toolsURL);
-		}
-		return (URL[]) result.toArray(new URL[result.size()]);
-	}
-	
-	/**
-	 * Returns the array of classpath entries that is the default set of entries defining
-	 * the Ant classpath.
-	 *
-	 * @return the default set of classpath entries defining the Ant classpath
-	 */
-	public IAntClasspathEntry[] getDefaultAntHomeEntries() {
-		if (defaultAntHomeEntries== null) {
-			List result = new ArrayList(29);
-			Plugin antPlugin= Platform.getPlugin("org.apache.ant"); //$NON-NLS-1$
-			if (antPlugin != null) {
-				IPluginDescriptor descriptor = antPlugin.getDescriptor(); 
-				addLibraries(descriptor, result);
-			}
-			
-			defaultAntHomeEntries= (IAntClasspathEntry[]) result.toArray(new IAntClasspathEntry[result.size()]);
-		}
-		return defaultAntHomeEntries;
-	}
-	
-	/**
-	 * Returns the array of URLs that is the set of URLs defining the Ant
-	 * classpath.
-	 * 
-	 * @return the set of URLs defining the Ant classpath
-	 * @deprecated use getAntHomeClasspathEntries and getToolsJarEntry
-	 */
-	public URL[] getAntURLs() {
-		int extra= 0;
-		IAntClasspathEntry entry= getToolsJarEntry();
-		if (entry != null) {
-			extra++;
-		}
-		URL[] urls= new URL[antHomeEntries.length + extra];
-		int i;
-		for (i = 0; i < antHomeEntries.length; i++) {
-			URL url = antHomeEntries[i].getEntryURL();
-			if (url != null) {
-				urls[i]= url;
-			}
-		}
-		if (extra > 0) {
-			urls[i]= entry.getEntryURL();
-		}
-		return urls;
-		
-	}
-
-	protected List computeDefaultTasks(List tasks) {
-		List result = new ArrayList(tasks.size());
-		for (Iterator iterator = tasks.iterator(); iterator.hasNext();) {
-			IConfigurationElement element = (IConfigurationElement) iterator.next();
-			if (!relevantRunningHeadless(element)) {
-				continue;
-			}
-			Task task = new Task();
-			task.setTaskName(element.getAttribute(AntCorePlugin.NAME));
-			task.setClassName(element.getAttribute(AntCorePlugin.CLASS));
-			
-			configureAntObject(result, element, task, task.getTaskName(), InternalCoreAntMessages.getString("AntCorePreferences.No_library_for_task")); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	private void addURLToExtraClasspathEntries(URL url, IConfigurationElement element) {
-		String eclipseRuntime= element.getAttribute(AntCorePlugin.ECLIPSE_RUNTIME);
-		boolean eclipseRuntimeRequired= true;
-		if (eclipseRuntime != null) {
-			eclipseRuntimeRequired= Boolean.getBoolean(eclipseRuntime);
-		}
-		Iterator itr= extraClasspathURLs.iterator();
-		while (itr.hasNext()) {
-			IAntClasspathEntry entry = (IAntClasspathEntry) itr.next();
-			if (entry.getEntryURL().equals(url)) {
-				return;
-			}
-		}
-		
-		AntClasspathEntry entry= new AntClasspathEntry(url);
-		entry.setEclipseRuntimeRequired(eclipseRuntimeRequired);
-		extraClasspathURLs.add(entry);
-	}
-
-	protected List computeDefaultTypes(List types) {
-		List result = new ArrayList(types.size());
-		for (Iterator iterator = types.iterator(); iterator.hasNext();) {
-			IConfigurationElement element = (IConfigurationElement) iterator.next();
-			if (!relevantRunningHeadless(element)) {
-				continue;
-			}
-			Type type = new Type();
-			type.setTypeName(element.getAttribute(AntCorePlugin.NAME));
-			type.setClassName(element.getAttribute(AntCorePlugin.CLASS));
-			
-			configureAntObject(result, element, type, type.getTypeName(), InternalCoreAntMessages.getString("AntCorePreferences.No_library_for_type")); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	private void configureAntObject(List result, IConfigurationElement element, AntObject antObject, String objectName, String errorMessage) {
-		String runtime = element.getAttribute(AntCorePlugin.ECLIPSE_RUNTIME);
-		if (runtime != null) {
-			antObject.setEclipseRuntimeRequired(Boolean.valueOf(runtime).booleanValue());
-		}
-		
-		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[]{objectName}), null); //$NON-NLS-1$
-			AntCorePlugin.getPlugin().getLog().log(status);
-			return;
-		}
-		
-		IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
-		try {
-			antObject.setPluginLabel(descriptor.getLabel());
-			URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
-			if (new File(url.getPath()).exists()) {
-				addURLToExtraClasspathEntries(url, element);
-				result.add(antObject);
-				addPluginClassLoader(descriptor.getPluginClassLoader());
-				antObject.setLibraryEntry(new AntClasspathEntry(url));
-				return;
-			} 
-
-			//type specifies a library that does not exist
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(errorMessage, new String[]{url.toExternalForm(), descriptor.getLabel()}), null); //$NON-NLS-1$
-			AntCorePlugin.getPlugin().getLog().log(status);
-			return;
-		} 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;
-		} catch (Exception e) {
-			//likely extra classpath entry library that does not exist
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(InternalCoreAntMessages.getString("AntCorePreferences.8"), new String[]{descriptor.getLabel()}), null); //$NON-NLS-1$
-			AntCorePlugin.getPlugin().getLog().log(status);
-			return;
-		}
-	}
-
-	/*
-	 * 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 (!relevantRunningHeadless(element)) {
-				continue;
-			}
-			String library = 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()) {
-					addURLToExtraClasspathEntries(url, element);  
-					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 (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);
-				continue;
-			} catch (Exception e) {
-				//likely 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.6"), new String[]{descriptor.getLabel()}), null); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-		}
-	}
-	
-	private boolean relevantRunningHeadless(IConfigurationElement element) {
-		if (runningHeadless) {
-			String headless = element.getAttribute(AntCorePlugin.HEADLESS);
-			if (headless != null) {
-				boolean headlessProperty= Boolean.valueOf(headless).booleanValue();
-				if (!headlessProperty) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-	
-	/*
-	 * Scan the Ant property extensions for properties to set.
-	 * 
-	 * @since 3.0
-	 */
-	private void computeDefaultProperties(List properties) {
-		defaultProperties = new ArrayList(properties.size());
-		for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
-			IConfigurationElement element = (IConfigurationElement) iterator.next();
-			if (!relevantRunningHeadless(element)) {
-				continue;
-			}
-			String name = element.getAttribute(AntCorePlugin.NAME);
-			if (name == null) {
-				continue;
-			}
-			String value = element.getAttribute(AntCorePlugin.VALUE);
-			Property property;
-			if (value != null) {
-				property = new Property(name, value);
-				IPluginDescriptor descriptor= element.getDeclaringExtension().getDeclaringPluginDescriptor();
-				property.setPluginLabel(descriptor.getLabel());
-			} else {
-				property = new Property();
-				property.setName(name);
-				IPluginDescriptor descriptor= element.getDeclaringExtension().getDeclaringPluginDescriptor();
-				property.setPluginLabel(descriptor.getLabel());
-				String className = element.getAttribute(AntCorePlugin.CLASS);
-				property.setValueProvider(className, descriptor.getPluginClassLoader());
-			}
-			defaultProperties.add(property);
-			String runtime = element.getAttribute(AntCorePlugin.ECLIPSE_RUNTIME);
-			if (runtime != null) {
-				property.setEclipseRuntimeRequired(Boolean.valueOf(runtime).booleanValue());
-			}
-		}
-	}
-
-	/**
-	 * Returns the IAntClasspathEntry for the tools.jar associated with the path supplied
-	 * May return <code>null</code> if no tools.jar is found (e.g. the path
-	 * points to a JRE install).
-	 * 
-	 * @param javaHomePath path for Java home
-	 * @return IAntClasspathEntry tools.jar IAntClasspathEntry or <code>null</code>
-	 * @since 3.0
-	 */
-	public IAntClasspathEntry getToolsJarEntry(IPath javaHomePath) {
-		if (javaHomePath.lastSegment().equalsIgnoreCase("jre")) { //$NON-NLS-1$
-			javaHomePath = javaHomePath.removeLastSegments(1);
-		}
-		javaHomePath = javaHomePath.append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
-		File tools = javaHomePath.toFile();
-		if (!tools.exists()) {
-			//attempt to find in the older 1.1.* 
-			javaHomePath= javaHomePath.removeLastSegments(1);
-			javaHomePath= javaHomePath.append("classes.zip"); //$NON-NLS-1$
-			tools = javaHomePath.toFile();
-			if (!tools.exists()) {
-				return null;
-			}
-		}
-			return new AntClasspathEntry(tools.getAbsolutePath()); 
-	}
-
-	/**
-	 * Returns the URL for the tools.jar associated with the System property "java.home"
-	 * location. If "java.home" has no associated tools.jar (such as a JRE install), the environment variable "JAVA_HOME" is
-	 * resolved to check for a tools.jar.
-     * May return <code>null</code> if no tools.jar is found.
-	 * 
-	 * @return URL tools.jar URL or <code>null</code>
-	 * @deprecated use getToolsJarEntry()
-	 */
-	public URL getToolsJarURL() {
-		IPath path = new Path(System.getProperty("java.home")); //$NON-NLS-1$
-		IAntClasspathEntry entry= getToolsJarEntry(path);
-		if (entry == null) {
-			IDynamicVariable variable = VariablesPlugin.getDefault().getStringVariableManager().getDynamicVariable("env_var"); //$NON-NLS-1$
-			String javaHome= null;
-			try {
-				if (variable != null) {
-					javaHome = variable.getValue("JAVA_HOME"); //$NON-NLS-1$
-				}
-				if (javaHome != null) {
-					path= new Path(javaHome);
-					entry= getToolsJarEntry(path);
-				}
-			} catch (CoreException e) {
-			}
-		}
-		if (entry != null) {
-			return entry.getEntryURL();
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the <code>IAntClasspathEntry</code> for the tools.jar associated with the System property "java.home"
-	 * location.
-	 * If "java.home" has no associated tools.jar (such as a JRE install), the environment variable "JAVA_HOME" is
-	 * resolved to check for a tools.jar. 
-	 * May return <code>null</code> if no tools.jar is found.
-	 * 
-	 * @return IAntClasspathEntry tools.jar IAntClasspathEntry or <code>null</code>
-	 */
-	public IAntClasspathEntry getToolsJarEntry() {
-		IPath path = new Path(System.getProperty("java.home")); //$NON-NLS-1$
-		IAntClasspathEntry entry= getToolsJarEntry(path);
-		if (entry == null) {
-			IDynamicVariable variable = VariablesPlugin.getDefault().getStringVariableManager().getDynamicVariable("env_var"); //$NON-NLS-1$
-			String javaHome= null;
-			try {
-				if (variable != null) {
-					javaHome = variable.getValue("JAVA_HOME"); //$NON-NLS-1$
-				}
-				if (javaHome != null) {
-					path= new Path(javaHome);
-					entry= getToolsJarEntry(path);
-				}
-			} catch (CoreException e) {
-			}
-		}
-		return entry;
-	}
-
-	private 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(new AntClasspathEntry(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);
-			}
-		}
-	}
-
-	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() {
-		URL[] urls= new URL[extraClasspathURLs.size()];
-		
-		for (int i = 0; i < extraClasspathURLs.size(); i++) {
-				IAntClasspathEntry entry = (IAntClasspathEntry) extraClasspathURLs.get(i);
-				urls[i]= entry.getEntryURL();	
-		}
-		return urls;
-	}
-	
-	/**
-	 * Returns the list of urls added to the classpath by the extra classpath
-	 * entries extension point for an Ant build that is occuring without the Eclipse runtime.
-	 * 
-	 * @return the list of extra classpath URLs
-	 * @since 3.0
-	 */
-	public URL[] getRemoteExtraClasspathURLs() {
-		List urls= new ArrayList(extraClasspathURLs.size());
-		
-		for (int i = 0; i < extraClasspathURLs.size(); i++) {
-				IAntClasspathEntry entry = (IAntClasspathEntry) extraClasspathURLs.get(i);
-				if (!entry.isEclipseRuntimeRequired()) {
-					urls.add(entry.getEntryURL());
-				}
-		}
-		return (URL[])urls.toArray(new URL[urls.size()]);
-	}
-	
-	/**
-	 * Returns the entire set of URLs that define the Ant runtime classpath.
-	 * Includes the Ant URLs, the additional URLs and extra classpath URLs.
-	 * 
-	 * @return the entire runtime classpath of URLs
-	 */
-	public URL[] getURLs() {
-		List result = new ArrayList(60);
-		if (antHomeEntries != null) {
-			for (int i = 0; i < antHomeEntries.length; i++) {
-				IAntClasspathEntry entry = antHomeEntries[i];
-				result.add(entry.getEntryURL());	
-			}
-		}
-		if (additionalEntries != null && additionalEntries.length > 0) {
-			for (int i = 0; i < additionalEntries.length; i++) {
-				IAntClasspathEntry entry = additionalEntries[i];
-				result.add(entry.getEntryURL());	
-			}
-		}
-		
-		for (int i = 0; i < extraClasspathURLs.size(); i++) {
-			IAntClasspathEntry entry = (IAntClasspathEntry) extraClasspathURLs.get(i);
-			result.add(entry.getEntryURL());	
-		}
-		
-		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
-		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 default and custom tasks that are relavent when there is no
-	 * Eclipse runtime context (an Ant build in a separate VM).
-	 * 
-	 * @return the list of default and custom tasks.
-	 */
-	public List getRemoteTasks() {
-		List result = new ArrayList(10);
-		if (defaultTasks != null && !defaultTasks.isEmpty()) {
-			Iterator iter= defaultTasks.iterator();
-			while (iter.hasNext()) {
-				Task task = (Task) iter.next();
-				if (!task.isEclipseRuntimeRequired()) {
-					result.add(task);
-				}
-			}
-		}
-		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 default and custom properties.
-	 * 
-	 * @return the list of default and custom properties.
-	 * @since 3.0
-	 */
-	public List getProperties() {
-		List result = new ArrayList(10);
-		if (defaultProperties != null && !defaultProperties.isEmpty()) {
-			result.addAll(defaultProperties);
-		}
-		if (customProperties != null && customProperties.length != 0) {
-			result.addAll(Arrays.asList(customProperties));
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the default and custom properties that are relavent when there is no
-	 * Eclipse runtime context (Ant build in a separate VM).
-	 * 
-	 * @return the list of default and custom properties.
-	 * @since 3.0
-	 */
-	public List getRemoteAntProperties() {
-		List result = new ArrayList(10);
-		if (defaultProperties != null && !defaultProperties.isEmpty()) {
-			Iterator iter= defaultProperties.iterator();
-			while (iter.hasNext()) {
-				Property property = (Property) iter.next();
-				if (!property.isEclipseRuntimeRequired()) {
-					result.add(property);
-				}
-			}
-		}
-		if (customProperties != null && customProperties.length != 0) {
-			result.addAll(Arrays.asList(customProperties));
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the custom property files specified for Ant builds performing any required 
-	 * string substition if indicated.
-	 * 
-	 * @param preformStringSubstition whether or not to perform the string subsitution on the property file strings
-	 * @return the property files defined for Ant builds.
-	 * @since 3.0
-	 */
-	public String[] getCustomPropertyFiles(boolean performStringSubstition) {
-		if (!performStringSubstition || customPropertyFiles == null || customPropertyFiles.length == 0) {
-			return customPropertyFiles;
-		}
-		List files= new ArrayList(customPropertyFiles.length);
-		for (int i = 0; i < customPropertyFiles.length; i++) {
-			String filename= customPropertyFiles[i];
-			 try {
-				filename = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(filename);
-				files.add(filename);
-			} catch (CoreException e) {
-				AntCorePlugin.log(e);
-			}
-		}
-		return (String[])files.toArray(new String[files.size()]);
-	}
-	
-	/**
-	 * Returns the custom property files specified for Ant builds.
-	 * 
-	 * @return the property files defined for Ant builds.
-	 */
-	public String[] getCustomPropertyFiles() {
-		return getCustomPropertyFiles(true);
-	}
-	
-	/**
-	 * Returns the custom URLs specified for the Ant classpath
-	 * 
-	 * @return the urls defining the Ant classpath
-	 * @deprecated
-	 */
-	public URL[] getCustomURLs() {
-		URL[] urls= new URL[additionalEntries.length];
-		int i;
-		for (i = 0; i < additionalEntries.length; i++) {
-			URL url = additionalEntries[i].getEntryURL();
-			if (url != null) {
-				urls[i]=url;
-			}
-		}
-	
-		return urls;
-	}
-
-	/**
-	 * Sets the user defined custom tasks.
-	 * To commit the changes, updatePluginPreferences must be
-	 * called.
-	 * @param tasks
-	 */
-	public void setCustomTasks(Task[] tasks) {
-		oldCustomTasks= customTasks;
-		customTasks = tasks;
-	}
-
-	/**
-	 * Sets the user defined custom types.
-	 * To commit the changes, updatePluginPreferences must be
-	 * called.
-	 * @param types The custom types
-	 */
-	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 urls the urls defining the Ant classpath
-	 * @deprecated use setAdditionalEntries(IAntClasspathEntry)[]
-	 */
-	public void setCustomURLs(URL[] urls) {
-		additionalEntries= new IAntClasspathEntry[urls.length];
-		for (int i = 0; i < urls.length; i++) {
-			URL url = urls[i];
-			IAntClasspathEntry entry= new AntClasspathEntry(url);
-			additionalEntries[i]= entry;
-		}
-	}
-	
-	/**
-	 * Sets the Ant URLs specified for the Ant classpath. To commit the changes,
-	 * updatePluginPreferences must be called.
-	 * 
-	 * @param urls the urls defining the Ant classpath
-	 * @deprecated use setAntHomeEntires(IAntClasspathEntry[])
-	 */
-	public void setAntURLs(URL[] urls) {
-		antHomeEntries= new IAntClasspathEntry[urls.length];
-		for (int i = 0; i < urls.length; i++) {
-			URL url = urls[i];
-			IAntClasspathEntry entry= new AntClasspathEntry(url);
-			antHomeEntries[i]= entry;
-		}
-	}
-	
-	/**
-	 * Sets the custom property files specified for Ant builds. To commit the
-	 * changes, updatePluginPreferences must be called.
-	 * 
-	 * @param paths 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 properties 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 and custom types that are relavent when there is no
-	 * Eclipse runtime context (an Ant build in a separate VM).
-	 * 
-	 * @return the list of default and custom types.
-	 */
-	public List getRemoteTypes() {
-		List result = new ArrayList(10);
-		if (defaultTypes != null && !defaultTypes.isEmpty()) {
-			Iterator iter= defaultTypes.iterator();
-			while (iter.hasNext()) {
-				Type type = (Type) iter.next();
-				if (!type.isEclipseRuntimeRequired()) {
-					result.add(type);
-				}
-			}
-		}
-		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;
-	}
-	
-	/**
-	 * Returns the default properties defined via the properties extension point
-	 * 
-	 * @return all of the default properties
-	 * @since 3.0
-	 */
-	public List getDefaultProperties() {
-		List result = new ArrayList(10);
-		if (defaultProperties != null && !defaultProperties.isEmpty()) {
-			result.addAll(defaultProperties);
-		}
-		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);
-		updateAntHomeEntries(prefs);
-		updateAdditionalEntries(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].getLibraryEntry().getLabel()); //$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].getLibraryEntry().getLabel()); //$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(false)); //$NON-NLS-1$
-		}
-		prefs.setValue(IAntCoreConstants.PREFERENCE_PROPERTIES, properties.toString());
-	}
-
-	protected void updateAdditionalEntries(Preferences prefs) {
-		prefs.setValue("urls", ""); //old constant removed  //$NON-NLS-1$//$NON-NLS-2$
-		String serialized= null;
-		IAntClasspathEntry toolsJarEntry= getToolsJarEntry();
-		if (additionalEntries.length == 1 && toolsJarEntry != null && additionalEntries[0].getLabel().equals(toolsJarEntry.getLabel())) {
-			serialized= ""; //$NON-NLS-1$
-		} else {
-			StringBuffer entries = new StringBuffer();
-			for (int i = 0; i < additionalEntries.length; i++) {
-				entries.append(additionalEntries[i].getLabel());
-				entries.append(',');
-			}
-			serialized= entries.toString();
-		}
-		
-		prefs.setValue(IAntCoreConstants.PREFERENCE_ADDITIONAL_ENTRIES, serialized);
-		
-		String prefAntHome= ""; //$NON-NLS-1$
-		if (antHome != null && !antHome.equals(getDefaultAntHome())) {
-			prefAntHome= antHome;
-		} 
-		prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_HOME, prefAntHome);
-	}
-	
-	protected void updateAntHomeEntries(Preferences prefs) {
-		prefs.setValue("ant_urls", ""); //old constant removed  //$NON-NLS-1$//$NON-NLS-2$
-		
-		//see if the custom entries are just the default entries
-		IAntClasspathEntry[] defaultEntries= getDefaultAntHomeEntries();
-		boolean dflt= false;
-		if (defaultEntries.length == antHomeEntries.length) {
-			dflt= true;
-			for (int i = 0; i < antHomeEntries.length; i++) {
-				if (!antHomeEntries[i].equals(defaultEntries[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_HOME_ENTRIES, ""); //$NON-NLS-1$
-			return;
-		}
-		StringBuffer entries = new StringBuffer();
-		for (int i = 0; i < antHomeEntries.length; i++) {
-			entries.append(antHomeEntries[i].getLabel());
-			entries.append(',');
-		}
-		
-		prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_HOME_ENTRIES, entries.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 antHome 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 or the location 
-	 * of the Eclipse Ant plugin if Ant home has not been specifically set by the user.
-	 * Can return <code>null</code>
-	 * 
-	 * @return the fully qualified path to Ant home
-	 */
-	public String getAntHome() {
-		return antHome;
-	}
-	
-	/**
-	 * Returns the set of classpath entries that compose the libraries added to the
-	 * Ant runtime classpath from the Ant home location.
-	 * 
-	 * @return the set of ant home classpath entries
-	 * @since 3.0
-	 */
-	public IAntClasspathEntry[] getAntHomeClasspathEntries() {
-		return antHomeEntries;
-	}
-	
-	/**
-	 * Returns the set of classpath entries that the user has added to the
-	 * Ant runtime classpath.
-	 * 
-	 * @return the set of user classpath entries
-	 * @since 3.0
-	 */
-	public IAntClasspathEntry[] getAdditionalClasspathEntries() {
-		return additionalEntries;
-	}
-	
-	/**
-	 * Sets the set of classpath entries that compose the libraries added to the
-	 * Ant runtime classpath from the Ant home location.
-	 * 
-	 * @param entries the set of ant home classpath entries
-	 * @since 3.0
-	 */
-	public void setAntHomeClasspathEntries(IAntClasspathEntry[] entries) {
-		antHomeEntries= entries;
-	}
-	
-	/**
-	 * Sets the set of classpath entries that the user has added to the 
-	 * Ant runtime classpath.
-	 * 
-	 * @param entries the set of user classpath entries
-	 * @since 3.0
-	 */
-	public void setAdditionalClasspathEntries(IAntClasspathEntry[] entries) {
-		additionalEntries= entries;
-	}
-
-	/**
-	 * Returns the list of URLs to added to the classpath for an Ant build that is 
-	 * occuring without the Eclipse runtime.
-	 * 
-	 * @return the list of classpath entries
-	 * @since 3.0
-	 */
-	public URL[] getRemoteAntURLs() {
-		List result = new ArrayList(40);
-		if (antHomeEntries != null) {
-			for (int i = 0; i < antHomeEntries.length; i++) {
-				IAntClasspathEntry entry = antHomeEntries[i];
-				result.add(entry.getEntryURL());
-			}
-		}
-		if (additionalEntries != null && additionalEntries.length > 0) {
-			for (int i = 0; i < additionalEntries.length; i++) {
-				IAntClasspathEntry entry = additionalEntries[i];
-				result.add(entry.getEntryURL());	
-			}
-		}
-		if (extraClasspathURLs != null) {
-			for (int i = 0; i < extraClasspathURLs.size(); i++) {
-				IAntClasspathEntry entry = (IAntClasspathEntry) extraClasspathURLs.get(i);
-				if (!entry.isEclipseRuntimeRequired()) {
-					result.add(entry.getEntryURL());
-				}
-			}
-		}
-		
-		return (URL[]) result.toArray(new URL[result.size()]);
-	}
-	
-	/**
-	 * Returns all contributed classpath entries via the 
-	 * <code>extraClasspathEntries</code> extension point.
-	 * 
-	 * @return all contributed classpath entries via the 
-	 * <code>extraClasspathEntries</code> extension point
-	 * @since 3.0
-	 */
-	public IAntClasspathEntry[]getContributedClasspathEntries() {
-		return (IAntClasspathEntry[]) extraClasspathURLs.toArray(new IAntClasspathEntry[extraClasspathURLs.size()]);
-	}
-}
\ No newline at end of file

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 40804ba..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
+++ /dev/null

@@ -1,557 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-
-/**
- * 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 buildfile target information.
-	 * 
-	 * @return an array containing the target information
-	 * 
-	 * @see TargetInfo
-	 * @since 2.1
-	 * @throws CoreException Thrown if problem is encountered determining the targets
-	 */
-	public synchronized TargetInfo[] getAvailableTargets() throws CoreException {
-		Class classInternalAntRunner= null;
-		Object runner= null;
-		ClassLoader originalClassLoader= Thread.currentThread().getContextClassLoader();
-		try {
-			classInternalAntRunner = getInternalAntRunner();
-			runner = classInternalAntRunner.newInstance();
-			
-			basicConfigure(classInternalAntRunner, runner);
-					
-			// 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);
-		}
-	}
-
-	private void basicConfigure(Class classInternalAntRunner, Object runner) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-		Method setBuildFileLocation = classInternalAntRunner.getMethod("setBuildFileLocation", new Class[] { String.class }); //$NON-NLS-1$
-		setBuildFileLocation.invoke(runner, new Object[] { buildFileLocation });
-		
-		if (antHome != null) {	
-			Method setAntHome = classInternalAntRunner.getMethod("setAntHome", new Class[] { String.class }); //$NON-NLS-1$
-			setAntHome.invoke(runner, new Object[] { antHome });
-		}
-		
-		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 });
-		}
-	}
-
-	/**
-	 * 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
-	 * @throws CoreException Thrown if a build is already occuring or if an exception occurs during the build
-	 */
-	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 {
-			classInternalAntRunner = getInternalAntRunner();
-			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 });
-			}
-			
-			basicConfigure(classInternalAntRunner, runner);
-			
-			// add progress monitor
-			if (monitor != null) {
-				Method setProgressMonitor = classInternalAntRunner.getMethod("setProgressMonitor", new Class[] { IProgressMonitor.class }); //$NON-NLS-1$
-				setProgressMonitor.invoke(runner, new Object[] { monitor });
-			}
-			
-			// set message output level
-			if (messageOutputLevel != 2) { //changed from the default Project.MSG_INFO
-				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 });
-			} 
-
-			// 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 Class getInternalAntRunner() throws ClassNotFoundException {
-		ClassLoader loader = getClassLoader();
-		Thread.currentThread().setContextClassLoader(loader);
-		return loader.loadClass("org.eclipse.ant.internal.core.ant.InternalAntRunner"); //$NON-NLS-1$
-	}
-
-	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.
-	 * @throws CoreException Thrown if a build is already occuring or if an exception occurs during the build
-	 */
-	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(true);
-			
-			// 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();
-		} 
-		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 propertyFiles 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 customClasspath 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 antHome 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/IAntClasspathEntry.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntClasspathEntry.java
deleted file mode 100644
index d622901..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntClasspathEntry.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.core;
-
-import java.net.URL;
-
-/**
- * Represents an Ant classpath entry.
- *
- * @since 3.0
- */
-public interface IAntClasspathEntry {
-
-	/**
-	 * Returns the label for this classpath entry.
-	 * @return the label for this entry.
-	 */
-	public String getLabel();
-	
-	/**
-	 * Returns the URL for this classpath entry or <code>null</code>
-	 * if it cannot be resolved.
-	 * 
-	 * @return the url for this classpath entry.
-	 */
-	public URL getEntryURL();
-	
-	/**
-	 * Returns whether this classpath entry requires the Eclipse runtime to be 
-	 * relevant. Defaults value is <code>true</code>
-	 * 
-	 * @return whether this classpath entry requires the Eclipse runtime
-	 */
-	public boolean isEclipseRuntimeRequired();
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java
deleted file mode 100644
index ca590af..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/IAntPropertyValueProvider.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 BBDO Detroit and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Thierry Lach (thierry.lach@bbdodetroit.com) - initial API and implementation for bug 40502
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-/**
- * An interface that must be implemented by plugins that wish to contribute
- * predefined variables to an Ant project when run from within Eclipse.
- * 
- * @since 3.0
- */
-public interface IAntPropertyValueProvider {
-
-	/**
-	 * Returns a value that the Ant entry point will use to set the
-	 * value of the Ant property.
-	 *
-	 * @param antPropertyName the Ant property to set
-	 * @return the value for the property, 
-	 *    or <code>null</code> if the property should not be set
-	 */
-	public String getAntPropertyValue(String antPropertyName);   
-}
\ No newline at end of file

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 74755a0..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Property.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core.runtime.CoreException;
-import org.eclipse.core.variables.VariablesPlugin;
-
-/**
- * Represents a Ant property.
- * @since 2.1
- */
-public class Property {
-
-	private String name;
-	private String value;
-	private String className;
-	private IAntPropertyValueProvider valueProvider;
-	private String pluginLabel;
-	private ClassLoader loader;
-	private boolean eclipseRuntime= true;
-
-	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.
-	 * Equivalent to calling #getValue(true);
-	 * @return String
-	 */
-	public String getValue() {
-		return getValue(true);
-	}
-	
-	/**
-	 * Returns the value.
-	 * 
-	 * @param whether the value has any variables resolved.
-	 * @return String
-	 * @since 3.0
-	 */
-	public String getValue(boolean substituteVariables) {
-		if (className != null) {
-			Class cls = null;
-			try {
-				cls = loader.loadClass(className);
-			} catch (ClassNotFoundException e) {
-				AntCorePlugin.log(e);
-				return null;
-			}
-			try {
-				valueProvider = (IAntPropertyValueProvider)cls.newInstance();
-			} catch (InstantiationException e) {
-				AntCorePlugin.log(e);
-				return null;
-			} catch (IllegalAccessException ex) {
-				AntCorePlugin.log(ex);
-				return null;
-			}
-			loader= null;
-			className= null;
-		}
-		
-		if (valueProvider != null) {
-			return valueProvider.getAntPropertyValue(name);
-		} 
-		if (substituteVariables) {
-			try {
-				String expanded = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(value);
-				return expanded;
-			} catch (CoreException e) {
-				AntCorePlugin.log(e);
-			}
-		} else {
-			return value;
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the value.
-	 * @param value The value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-	
-	/**
-	 * Returns whether this Ant property has been created because of an extension
-	 * point definition.
-	 * 
-	 * @return boolean
-	 * @since 3.0
-	 */
-	public boolean isDefault() {
-		return pluginLabel != null;
-	}
-
-	/**
-	 * Sets the label of the plugin that contributed this Ant property via an extension
-	 * point.
-	 * 
-	 * @param pluginLabel The label of the plugin
-	 * @since 3.0
-	 */
-	public void setPluginLabel(String pluginLabel) {
-		this.pluginLabel = pluginLabel;
-	}
-	
-	/**
-	 * Returns the label of the plugin that contributed this Ant property via an extension
-	 * point.
-	 * 
-	 * @return pluginLabel The label of the plugin
-	 * @since 3.0
-	 */
-	public String getPluginLabel() {
-		return this.pluginLabel;
-	}
-	
-	/**
-	 * Sets the name of the class that is an <code>IAntPropertyValueProvider</code> to be used to dynamically provide a 
-	 * value for this property.
-	 * Sets the class loader to load the <code>IAntPropertyValueProvider</code> to be used to dynamically provide a 
-	 * value for this property.
-	 * 
-	 * @param className The name of the value provider class to use to resolve the value of this property
-	 * @param loader The class loader to use to load the value provider class to use to resolve the value of this property
-	 * @since 3.0
-	 */
-	public void setValueProvider(String className, ClassLoader loader) {
-		this.className= className;
-		this.loader= loader;
-	}
-
-	/* (non-Javadoc)
-	 * @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(false));
-		buff.append("\""); //$NON-NLS-1$
-		return buff.toString();
-	}
-	
-	/**
-	 * Returns whether this property requires the Eclipse runtime to be 
-	 * relevant. Defaults value is <code>true</code>
-	 * 
-	 * @return whether this property requires the Eclipse runtime
-     * @since 3.0
-	 */
-	public boolean isEclipseRuntimeRequired() {
-		return eclipseRuntime;
-	}
-	
-	public void setEclipseRuntimeRequired(boolean eclipseRuntime) {
-		this.eclipseRuntime= eclipseRuntime;
-	}
-}

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 9532ee8..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;
-	}
-
-	/* (non-Javadoc)
-	 * @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());
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getName().hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getName();
-	}
-}
\ No newline at end of file

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 075a372..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClassLoader.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Tom Tromey (tromey@redhat.com) - patch for bug 40972
- *******************************************************************************/
-package org.eclipse.ant.internal.core;
-
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-public class AntClassLoader extends URLClassLoader {
-	
-	private boolean allowPluginLoading= false;
-
-	protected ClassLoader[] pluginLoaders;
-	private static final String ANT_PACKAGES_PREFIX= "org.apache.tools"; //$NON-NLS-1$
-	
-	public AntClassLoader(URL[] urls, ClassLoader[] pluginLoaders) {
-		super(urls, ClassLoader.getSystemClassLoader());
-		this.pluginLoaders = pluginLoaders;
-	}
-
-	protected Class findClass(String name) throws ClassNotFoundException {
-		Class result = null;
-		//check whether to load the Apache Ant classes from the plugin class loaders 
-		//or to only load from the URLs specified from the Ant runtime classpath preferences setting
-		if (allowPluginLoading || !(name.startsWith(ANT_PACKAGES_PREFIX))) {
-			result= loadClassPlugins(name);
-		} 
-		
-		if (result == null) {
-			result = loadClassURLs(name);
-		}
-		if (result == null) {
-			throw new ClassNotFoundException(name);
-		}
-		return result;
-	}
-
-	protected Class loadClassURLs(String name) {
-		try {
-			return super.findClass(name);
-		} catch (ClassNotFoundException e) {
-			// Ignore exception now. If necessary we'll throw
-			// a ClassNotFoundException in findClass(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;
-	}
-	
-	/**
-	 * Sets whether this classloader will allow Apache Ant classes to be found or
-	 * loaded from its set of plugin classloaders.
-	 * 
-	 * @param allowLoading whether or not to allow the plugin classloaders
-	 * to load the Apache Ant classes
-	 */
-	public void allowPluginClassLoadersToLoadAntClasses(boolean allowLoading) {
-		this.allowPluginLoading = allowLoading;
-	}
-}

diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java
deleted file mode 100644
index ceeb723..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.variables.VariablesPlugin;
-
-public class AntClasspathEntry implements IAntClasspathEntry {
-
-	private String entryString;
-	private boolean eclipseRequired= true;
-	private URL url= null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#getLabel()
-	 */
-	public String getLabel() {
-		
-		return entryString;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#getEntryURL()
-	 */
-	public URL getEntryURL() {
-		if (url != null) {
-			return url;
-		}
-		try {
-			String expanded = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(entryString);
-			return new URL("file:" + expanded); //$NON-NLS-1$
-		} catch (CoreException e) {
-			AntCorePlugin.log(e);
-		} catch (MalformedURLException e) {
-			AntCorePlugin.log(e);
-		}
-		return null;
-	}
-
-	public AntClasspathEntry(String entryString) {
-		this.entryString= entryString;
-	}
-	
-	public AntClasspathEntry(URL url) {
-		this.url= url;
-		this.entryString= new File(url.getPath()).getAbsolutePath();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof IAntClasspathEntry) {
-			IAntClasspathEntry other= (IAntClasspathEntry)obj;
-			return entryString.equals(other.getLabel());
-		}
-		return false;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return entryString.hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getLabel();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#isEclipseRuntimeRequired()
-	 */
-	public boolean isEclipseRuntimeRequired() {
-		return eclipseRequired;
-	}
-	
-	public void setEclipseRuntimeRequired(boolean eclipseRequired) {
-		this.eclipseRequired = eclipseRequired;
-	}
-}
\ No newline at end of file

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 d83a9dd..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.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.internal.core;
-
-
-import java.net.URL;
-
-import org.eclipse.ant.core.IAntClasspathEntry;
-
-public abstract class AntObject {
-
-	protected String fClassName;
-	protected URL fLibrary;
-	protected IAntClasspathEntry fLibraryEntry;
-	protected String fName;
-	private String fPluginLabel;
-	private boolean eclipseRuntime= true;
-	
-	/**
-	 * 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
-	 * @deprecated use #getLibraryEntry()
-	 */
-	public URL getLibrary() {
-		if (fLibrary != null) {
-			return fLibrary;
-		} 
-		return fLibraryEntry.getEntryURL();	
-	}
-	/**
-	 * Sets the library.
-	 * @param library The library to set
-	 * @deprecated use #setLibraryEntry(IAntClasspathEntry)
-	 */
-	public void setLibrary(URL library) {
-		fLibrary = library;
-	}
-	
-	/**
-	 * Gets the library classpath entry.
-	 * @return Returns a classpath entry for the library of this Ant object
-	 */
-	public IAntClasspathEntry getLibraryEntry() {
-		if (fLibraryEntry != null) {
-			return fLibraryEntry;
-		} 
-		fLibraryEntry= new AntClasspathEntry(fLibrary);
-		return fLibraryEntry;
-	}
-	/**
-	 * Sets the library classpath entry.
-	 * @param libraryEntry The library entry to set
-	 */
-	public void setLibraryEntry(IAntClasspathEntry libraryEntry) {
-		fLibraryEntry = libraryEntry;
-	}
-	
-	/* (non-Javadoc)
-	 * @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 fPluginLabel != null;
-	}
-
-	/**
-	 * 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.
-	 * @deprecated Since 3.0 Set the plugin label to indicate a default object
-	 */
-	public void setIsDefault(boolean isDefault) {
-		if (!isDefault) {
-			fPluginLabel= null;
-		}
-	}
-	
-	/**
-	 * Sets the label of the plugin that contributed this Ant object via an extension
-	 * point.
-	 * 
-	 * @param pluginLabel The label of the plugin
-	 * @since 3.0
-	 */
-	public void setPluginLabel(String pluginLabel) {
-		fPluginLabel = pluginLabel;
-	}
-
-	/**
-	 * Returns the label of the plugin that contributed this Ant object via an extension
-	 * point.
-	 * 
-	 * @return pluginLabel The label of the plugin
-	 * @since 3.0
-	 */
-	public String getPluginLabel() {
-		return fPluginLabel;
-	}
-	
-	/**
-	 * Returns whether this Ant object requires the Eclipse runtime to be 
-	 * relevant. Defaults value is <code>true</code>
-	 * 
-	 * @return whether this Ant obhject requires the Eclipse runtime
-     * @since 3.0
-	 */
-	public boolean isEclipseRuntimeRequired() {
-		return eclipseRuntime;
-	}
-	
-	public void setEclipseRuntimeRequired(boolean eclipseRuntime) {
-		this.eclipseRuntime= eclipseRuntime;
-	}
-}

diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntPropertyValueProvider.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntPropertyValueProvider.java
deleted file mode 100644
index 31e3709..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntPropertyValueProvider.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 BBDO Detroit and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Thierry Lach (thierry.lach@bbdodetroit.com) - initial API and implementation for bug 40502
- *     IBM Corporation - added eclipse.running property
- *******************************************************************************/
-package org.eclipse.ant.internal.core;
-
-import java.net.URL;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.IAntPropertyValueProvider;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Dynamic provider for Ant properties.
- * 
- * Provides the dynamic values for the following Ant properties:
- * 
- * <ul>
- * <li><code>eclipse.home</code> - set to the Eclipse installation directory</li>
- * </ul>
- * * <ul>
- * <li><code>eclipse.running</code> - set (to "true") when Eclipse is running</li>
- * </ul>
- * 
- * @since 3.0
- */
-public class AntPropertyValueProvider implements IAntPropertyValueProvider {
-	/**
-	 * Returns the dynamic property values for Ant properties.
-	 * 
-	 * @param propertyName The name of the property to resovle the value for
-	 * @return The resolved value for the property
-	 * @see org.eclipse.ant.core.IAntPropertyValueProvider#getAntPropertyValue(String)
-	 */
-	public String getAntPropertyValue(String propertyName) {
-		String value = null;
-		if ("eclipse.running".equals(propertyName)){ //$NON-NLS-1$
-			return "true"; //$NON-NLS-1$
-		} else if ("eclipse.home".equals(propertyName)) { //$NON-NLS-1$
-			try {
-				value = Platform.resolve(new URL("platform:/base/")).getPath(); //$NON-NLS-1$
-				if (value.endsWith("/")) { //$NON-NLS-1$
-				    value = value.substring(0, value.length() - 1);
-				}
-			} catch (Exception e) {
-				AntCorePlugin.log(e);
-			}
-		}
-		return value;
-	}
-}

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 b486381..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.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;
-
-
-/**
- * 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 PREFIX_TASK = "task."; //$NON-NLS-1$
-	public static final String PREFIX_TYPE = "type."; //$NON-NLS-1$
-	
-	/**
-	 * Preferences
-	 * @since 3.0
-	 */
-	public static final String PREFERENCE_ANT_HOME_ENTRIES = "ant_home_entries"; //$NON-NLS-1$
-	public static final String PREFERENCE_ADDITIONAL_ENTRIES = "additional_entries"; //$NON-NLS-1$
-	
-	/**
-	 * Preferences
-	 * @since 2.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 0f40a1f..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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.8=It appears the library specified via the antTasks or antTypes extension point of {0} does not exist
-AntCorePreferences.No_library_for_extraClasspathEntry=The library {0} specified via the extraClasspathEntries extension point of {1} does not exist
-AntCorePreferences.6=It appears the library specified via the extraClasspathEntries extension point of {0} 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 already in progress. Concurrent Ant builds are possible if you specify to build in a separate JRE.

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 df2b78a..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/AntSecurityManager.java
+++ /dev/null

@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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 or mimics the default security manager behavior
- */
-public class AntSecurityManager extends SecurityManager {
-
-	protected SecurityManager securityManager= null;
-	
-	protected AntSecurityManager(SecurityManager securityManager) {
-		this.securityManager= securityManager;
-	}
-	/* (non-Javadoc)
-	 * @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();
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkAccept(java.lang.String, int)
-	 */
-	public void checkAccept(String host, int port) {
-		if (securityManager != null) {
-			securityManager.checkAccept(host, port);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkAccess(java.lang.Thread)
-	 */
-	public void checkAccess(Thread t) {
-		if (securityManager != null) {
-			securityManager.checkAccess(t);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkAccess(java.lang.ThreadGroup)
-	 */
-	public void checkAccess(ThreadGroup g) {
-		if (securityManager != null) {
-			securityManager.checkAccess(g);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkAwtEventQueueAccess()
-	 */
-	public void checkAwtEventQueueAccess() {
-		if (securityManager != null) {
-			securityManager.checkAwtEventQueueAccess();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkConnect(java.lang.String, int)
-	 */
-	public void checkConnect(String host, int port) {
-		if (securityManager != null) {
-			securityManager.checkConnect(host, port);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkCreateClassLoader()
-	 */
-	public void checkCreateClassLoader() {
-		if (securityManager != null) {
-			securityManager.checkCreateClassLoader();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkDelete(java.lang.String)
-	 */
-	public void checkDelete(String file) {
-		if (securityManager != null) {
-			securityManager.checkDelete(file);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkExec(java.lang.String)
-	 */
-	public void checkExec(String cmd) {
-		if (securityManager != null) {
-			securityManager.checkExec(cmd);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkLink(java.lang.String)
-	 */
-	public void checkLink(String lib) {
-		if (securityManager != null) {
-			securityManager.checkLink(lib);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkListen(int)
-	 */
-	public void checkListen(int port) {
-		if (securityManager != null) {
-			securityManager.checkListen(port);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkMulticast(java.net.InetAddress)
-	 */
-	public void checkMulticast(InetAddress maddr) {
-		if (securityManager != null) {
-			securityManager.checkMulticast(maddr);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkPackageAccess(java.lang.String)
-	 */
-	public void checkPackageAccess(String pkg) {
-		if (securityManager != null) {
-			securityManager.checkPackageAccess(pkg);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkPackageDefinition(java.lang.String)
-	 */
-	public void checkPackageDefinition(String pkg) {
-		if (securityManager != null) {
-			securityManager.checkPackageDefinition(pkg);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkPermission(java.security.Permission)
-	 */
-	public void checkPermission(Permission perm) {
-		if (securityManager != null) {
-			securityManager.checkPermission(perm);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkPrintJobAccess()
-	 */
-	public void checkPrintJobAccess() {
-		if (securityManager != null) {
-			securityManager.checkPrintJobAccess();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkPropertiesAccess()
-	 */
-	public void checkPropertiesAccess() {
-		if (securityManager != null) {
-			securityManager.checkPropertiesAccess();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
-	 */
-	public void checkPropertyAccess(String key) {
-		if (securityManager != null) {
-			securityManager.checkPropertyAccess(key);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkRead(java.io.FileDescriptor)
-	 */
-	public void checkRead(FileDescriptor fd) {
-		if (securityManager != null) {
-			securityManager.checkRead(fd);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkRead(java.lang.String)
-	 */
-	public void checkRead(String file) {
-		if (securityManager != null) {
-			securityManager.checkRead(file);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkSecurityAccess(java.lang.String)
-	 */
-	public void checkSecurityAccess(String target) {
-		if (securityManager != null) {
-			securityManager.checkSecurityAccess(target);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkSetFactory()
-	 */
-	public void checkSetFactory() {
-		if (securityManager != null) {
-			securityManager.checkSetFactory();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkSystemClipboardAccess()
-	 */
-	public void checkSystemClipboardAccess() {
-		if (securityManager != null) {
-			securityManager.checkSystemClipboardAccess();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkTopLevelWindow(java.lang.Object)
-	 */
-	public boolean checkTopLevelWindow(Object window) {
-		if (securityManager != null) {
-			return securityManager.checkTopLevelWindow(window);
-		}
-		return super.checkTopLevelWindow(window);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
-	 */
-	public void checkWrite(FileDescriptor fd) {
-		if (securityManager != null) {
-			securityManager.checkWrite(fd);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#checkWrite(java.lang.String)
-	 */
-	public void checkWrite(String file) {
-		if (securityManager != null) {
-			securityManager.checkWrite(file);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getInCheck()
-	 * @deprecated
-	 */
-	public boolean getInCheck() {
-		if (securityManager != null) {
-			return securityManager.getInCheck();
-		}
-		return super.getInCheck();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#getSecurityContext()
-	 */
-	public Object getSecurityContext() {
-		if (securityManager != null) {
-			return securityManager.getSecurityContext();
-		}
-		return super.getSecurityContext();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.SecurityManager#getThreadGroup()
-	 */
-	public ThreadGroup getThreadGroup() {
-		if (securityManager != null) {
-			securityManager.getThreadGroup();
-		}
-		return super.getThreadGroup();
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/DemuxInputStreamSetter.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/DemuxInputStreamSetter.java
deleted file mode 100644
index 7a43356..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/DemuxInputStreamSetter.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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 org.apache.tools.ant.DemuxInputStream;
-import org.apache.tools.ant.Project;
-
-/**
- * This class exists so that the Ant integration has backwards compatibility
- * with Ant releases previous to 1.6. DemuxInputStream is a new class to Ant 1.6.
- */
-class DemuxInputStreamSetter {
-
-	protected void remapSystemIn(Project project) {
-		System.setIn(new DemuxInputStream(project));
-	}
-}

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 7ee661f..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
+++ /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
-###############################################################################
-
-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.12=print information that might be helpful to
-InternalAntRunner.13=\t\t\t\t\t\tdiagnose or report problems.
-InternalAntRunner.19=load all properties from file with -D
-InternalAntRunner.20=\t\t\t\t\t\tproperties taking precedence
-InternalAntRunner.22=the class which will handle input requests
-InternalAntRunner.1=\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
-InternalAntRunner.157=-lib not supported\nConfigure the Ant runtime classpath using either the\nglobal Ant runtime classpath or the Ant runtime classpath\n for this particular build
-InternalAntRunner.158=\t\t\tdo not allow interactive input
-InternalAntRunner.159=\t\texecute all targets that do not depend
-InternalAntRunner.160=\t\t\t\t\t\ton failed target(s)
-
-ProgressBuildListener.Build_cancelled._5=Build cancelled.
-
-InternalProject.0=Could not create type {0} due to {1}

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 1f69db6..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 b7d0610..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalProject.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * Portions Copyright  2000-2004 The Apache Software Foundation
- * All rights reserved.  This program and the accompanying materials are made 
- * available under the terms of the Apache Software License v2.0 which 
- * accompanies this distribution and is available at 
- * http://www.apache.org/licenses/LICENSE-2.0.
- * 
- * Contributors:
- *     IBM Corporation - derived implementation
- *******************************************************************************/
-
-package org.eclipse.ant.internal.core.ant;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-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) {
-			Throwable t = ite.getTargetException();
-			String message= MessageFormat.format(InternalAntMessages.getString("InternalProject.0"), new String[]{typeName, t.toString()}); //$NON-NLS-1$
-			throw new BuildException(message, t);
-		} catch (Throwable t) {
-			String message= MessageFormat.format(InternalAntMessages.getString("InternalProject.0"), new String[]{typeName, t.toString()}); //$NON-NLS-1$
-			throw new BuildException(message, t);
-		}
-	}
-
-	/**
-	 * 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 enumeration = props.propertyNames();
-			while (enumeration.hasMoreElements()) {
-				String typeName = (String) enumeration.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/NullInputHandler.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/NullInputHandler.java
deleted file mode 100644
index 9c45b6a..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/NullInputHandler.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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 org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.input.InputHandler;
-import org.apache.tools.ant.input.InputRequest;
-
-/**
- * A input handler that does nothing with input requests
- * Used to ensure we do not block while retrieving targets from an Ant buildfile
- * that has an input task in the top level implicit target
- */
-public class NullInputHandler implements InputHandler {
-
-	public NullInputHandler() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.input.InputHandler#handleInput(org.apache.tools.ant.input.InputRequest)
-	 */
-	public void handleInput(InputRequest request) throws BuildException {
-	}
-}

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 03a14ac..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$
-	}
-
-	/* (non-Javadoc)
-	 * @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;
-	}
-
-	/* (non-Javadoc)
-	 * @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);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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;
-	}
-
-	/* (non-Javadoc)
-	 * @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);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @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;
-	}
-
-	/* (non-Javadoc)
-	 * @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 0b19baf..0000000
--- a/ant/org.eclipse.ant.tests.core/.classpath
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="test plugin"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry output="test_support_bin" kind="src" path="test support"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 0b48495..0000000
--- a/ant/org.eclipse.ant.tests.core/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-lib
-test_support_bin

diff --git a/ant/org.eclipse.ant.tests.core/.externalToolBuilders/Ant Test Support Lib Builder.launch b/ant/org.eclipse.ant.tests.core/.externalToolBuilders/Ant Test Support Lib Builder.launch
deleted file mode 100644
index 324b0d4..0000000
--- a/ant/org.eclipse.ant.tests.core/.externalToolBuilders/Ant Test Support Lib Builder.launch
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<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;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot; editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.tests.core/test support/org&quot; type=&quot;2&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.tests.core&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/ant/org.eclipse.ant.tests.core/.project b/ant/org.eclipse.ant.tests.core/.project
deleted file mode 100644
index 6943510..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>
-	</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>Ant Test Support Lib Builder.launch</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.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 a6804c3..0000000
--- a/ant/org.eclipse.ant.tests.core/build.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
-###############################################################################
-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/
-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar

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 d366b94..0000000
--- a/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
+++ /dev/null

@@ -1,44 +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" depends="clean, lib/antTestsSupport.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="version.suffix" value="_3.0.0"/>
-		<property name="ant_version.suffix" value="_1.6.1"/>
-		<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="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.1" destdir="${temp.folder}/lib/antTestsSupport.jar.bin" failonerror="false" verbose="false" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" 
-			classpath="${basedir}/../org.eclipse.core.runtime/bin;
-			${eclipse.home}/plugins/org.eclipse.core.runtime${version.suffix}/runtime.jar;
-			${basedir}/../org.apache.ant/lib/ant.jar;
-			${eclipse.home}/plugins/org.apache.ant${ant_version.suffix}/lib/ant.jar;
-			${basedir}/bin;
-			${eclipse.home}/plugins/org.eclipse.ant.core${version.suffix}/antsupport.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>
-</project>

diff --git a/ant/org.eclipse.ant.tests.core/lib/.cvsignore b/ant/org.eclipse.ant.tests.core/lib/.cvsignore
deleted file mode 100644
index 3740b60..0000000
--- a/ant/org.eclipse.ant.tests.core/lib/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-antTestsSupport.jar

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 deab747..0000000
--- a/ant/org.eclipse.ant.tests.core/plugin.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ant.tests.core"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.tests.core.testplugin.AntTestPlugin">
-
-   <runtime>
-      <library name="anttestscore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.apache.ant"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <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.core.runtime"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.ant.core.extraClasspathEntries">
-      <extraClasspathEntry
-            library="lib/antTestsSupport.jar">
-      </extraClasspathEntry>
-   </extension>
-   
-   <extension point="org.eclipse.ant.core.antTasks">
-	    <antTask 
-	    	name="coolTask" 
-	    	class="org.eclipse.ant.tests.core.support.tasks.AntTestTask"
-	    	library="lib/antTestsSupport.jar"
-	    	headless="false">
-	    </antTask>
-   </extension>
-
-	<extension point="org.eclipse.ant.core.antTypes">
-	    <antType 
-	    	name="coolType" 
-	    	class="org.eclipse.ant.tests.core.support.types.AntTestPath"
-	    	library="lib/antTestsSupport.jar"
-	    	headless="false">
-	    </antType>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ant.core.antProperties">
-      <antProperty
-            name="property.testing"
-            value="true">
-      </antProperty>
-       <antProperty
-            name="property.testing2"
-            value="hey"
-            class= "org.eclipse.does.not.exist">
-      </antProperty>
-      <antProperty
-            name="property.testing3"
-            class= "org.eclipse.ant.tests.core.testplugin.AntTestPropertyValueProvider">
-      </antProperty>
-       <antProperty
-            name="property.headless"
-            value="headless"
-            headless= "false">
-      </antProperty>
-   </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 ccc5816..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 AntTestChecker
-	 */
-	public static AntTestChecker getDefault() {
-		if (deflt == null) {
-			deflt= new AntTestChecker();
-		}
-		return deflt;
-	}
-	
-	/**
-	 * Resets the singleton AntTestChecker
-	 */
-	public static void reset() {
-		if (deflt != null) {
-			deflt.resetState();
-		}
-	}
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished() {
-		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() {
-		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() {
-		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 a62aa72..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.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.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;
-import org.osgi.framework.Bundle;
-
-
-public class AntTestPlugin extends AbstractUIPlugin {
-	
-	private static AntTestPlugin deflt;
-	
-	public AntTestPlugin() {
-		super();
-		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 {
-			Bundle bundle = getDefault().getBundle();
-			URL installURL= new URL(bundle.getEntry("/"), 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/AntTestPropertyValueProvider.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPropertyValueProvider.java
deleted file mode 100644
index 7d9ac88..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPropertyValueProvider.java
+++ /dev/null

@@ -1,24 +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.testplugin;
-
-import org.eclipse.ant.core.IAntPropertyValueProvider;
-
-public class AntTestPropertyValueProvider implements IAntPropertyValueProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntPropertyValueProvider#getAntPropertyValue(java.lang.String)
-	 */
-	public String getAntPropertyValue(String antPropertyName) {
-		return "AntTestPropertyValueProvider";
-	}
-
-}

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 fecbbef..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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) 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;
-		}	
-	}			
-}
\ No newline at end of file

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 9c1336f..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.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.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.
- * If the build is occurring in Ant 1.6.0 and the -noinput option has been specified
- * this input handler will fail.
- */
-public class AntTestInputHandler extends DefaultInputHandler {
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.input.InputHandler#handleInput(org.apache.tools.ant.input.InputRequest)
-	 */
-	public void handleInput(InputRequest request) throws BuildException {
-		if (System.getProperty("eclipse.ant.noInput") != null) { //$NON-NLS-1$
-			throw new BuildException("Unable to respond to input request likely as a result of specifying the -noinput command");
-		}
-		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 4edc766..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();
-	}
-
-	/**
-	 * @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();
-	}
-
-	/**
-	 * @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();
-	}
-
-	/**
-	 * @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 0eb1e4f..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="core-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/Bug42926.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug42926.xml
deleted file mode 100644
index 3bb86a2..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug42926.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<project default="all">
-	<path id="someclasspath">
-		<fileset dir="${ant.home}/lib" includes="sometask.jar"/>
-	</path>
-
-	<taskdef name="sometask" classname="com.foo.SomeTask"
-classpathref="someclasspath"/>
-
-	<target name="all">
-		<echo>Hello ${ant.home}</echo>
-	</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 53525c8..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml
+++ /dev/null

@@ -1,13 +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>
-	
-	<target name="Custom Task from Entry" description= "Test adding a custom task">
-		<AntTestTask2/>
-	</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/ExtensionPointTask.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/ExtensionPointTask.xml
deleted file mode 100644
index 10a3140..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/ExtensionPointTask.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<project name="Extension Point Task" default="Extension Point Task" basedir=".">
-	<target name="Extension Point Task" description= "Ensure that an extension point defined task is present">
-		<coolTask/>
-	</target>
-</project>

diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/ExtensionPointType.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/ExtensionPointType.xml
deleted file mode 100644
index abaaaec..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/ExtensionPointType.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<project name="Extension Point Type" default="Extension Point Type" basedir=".">
-
-	<coolType id="compile.classpath">
-      <fileset dir="lib">
-        <include name="**/*.jar"/>
-      </fileset>
-    </coolType>
-    
-	<target name="Extension Point Type" description= "Ensure that an extension point defined type is present">
-		<echo message="Ensure that an extension point defined type is present"/>
-	</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 5cdd64d..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<project name="Echoing" 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/failingTarget.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/failingTarget.xml
deleted file mode 100644
index 04418e0..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/failingTarget.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<project default="all">
-	<target name="all" depends="fails, echos"/>
-	<target name="fails">
-		<jar jarfile="jar16.jar" basedir="doesNotExist"/>
-	</target>
-	<target name="echos">
-		<echo>Still echo on failure</echo>
-	</target>
-</project>
\ No newline at end of file

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 3aa3fce..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.tests.core.testplugin.AntFileRunner;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-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 build 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(IResource.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();
-		IAntClasspathEntry toolsEntry= prefs.getToolsJarEntry();
-		IAntClasspathEntry[] additionalEntries;
-		if (toolsEntry == null) {
-			additionalEntries= new IAntClasspathEntry[]{};
-		} else {
-			additionalEntries= new IAntClasspathEntry[] {toolsEntry};
-		}
-		prefs.setAdditionalClasspathEntries(additionalEntries);
-		prefs.setAntHomeClasspathEntries(prefs.getDefaultAntHomeEntries());
-		prefs.setCustomTasks(new Task[]{});
-		prefs.setCustomTypes(new Type[]{});
-		prefs.setCustomPropertyFiles(new String[]{});
-		prefs.setCustomProperties(new Property[]{});
-		prefs.setAntHome(prefs.getDefaultAntHome());
-	}
-	
-	protected String getAntHome() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		IAntClasspathEntry[] entries= prefs.getAntHomeClasspathEntries();
-		IAntClasspathEntry antjar= entries[0];
-		IPath antHomePath= new Path(antjar.getEntryURL().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 8d5d64e..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");
-		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 0b38e33..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
+++ /dev/null

@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.IAntClasspathEntry;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.internal.core.AntClasspathEntry;
-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);
-	}
-	
-	/**
-	 * Ensures that the deprecated means of setting the classpath still works correctly
-	 * Do not fix deprecations unless the deprecated methods are being removed.
-	 * @throws MalformedURLException
-	 * @throws CoreException
-	 */
-	public void testClasspathOrderingDeprecated() 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();
-		restorePreferenceDefaults();
-	}
-	
-	public void testClasspathOrdering() throws CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		
-		String path= getProject().getFolder("lib").getFile("classpathOrdering1.jar").getLocation().toFile().getAbsolutePath();
-		IAntClasspathEntry entry= new AntClasspathEntry(path);
-		
-		path= getProject().getFolder("lib").getFile("classpathOrdering2.jar").getLocation().toFile().getAbsolutePath();
-		IAntClasspathEntry entry2= new AntClasspathEntry(path);
-		
-		IAntClasspathEntry entries[] = prefs.getAdditionalClasspathEntries();
-		IAntClasspathEntry newEntries[] = new IAntClasspathEntry[entries.length + 2];
-		System.arraycopy(entries, 0, newEntries, 0, entries.length);
-		newEntries[entries.length] = entry;
-		newEntries[entries.length + 1] = entry2;
-		prefs.setAdditionalClasspathEntries(newEntries);
-		
-		prefs.updatePluginPreferences();
-		
-		run("ClasspathOrdering.xml");
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("classpathOrdering1"));
-		assertSuccessful();
-		
-		restorePreferenceDefaults();
-		
-		entries = prefs.getAdditionalClasspathEntries();
-		newEntries = new IAntClasspathEntry[entries.length + 2];
-		System.arraycopy(entries, 0, newEntries, 0, entries.length);
-		newEntries[entries.length] = entry2;
-		newEntries[entries.length + 1] = entry;
-		prefs.setAdditionalClasspathEntries(newEntries);
-		
-		prefs.updatePluginPreferences();
-		
-		run("ClasspathOrdering.xml");
-		msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("classpathOrdering2"));
-		assertSuccessful();
-		restorePreferenceDefaults();
-	}
-	
-	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 {
-		IAntClasspathEntry toolsEntry= AntCorePlugin.getPlugin().getPreferences().getToolsJarEntry();
-		if (toolsEntry == 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 that the default ANT_HOME is set and that it can be changed
-	 */
-	public void testSettingAntHome() throws CoreException {
-		try {
-			AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-			run("echoing.xml");
-			assertTrue("ANT_HOME not set correctly", prefs.getDefaultAntHome().equals(System.getProperty("ant.home")));
-			prefs.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 886155c..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
+++ /dev/null

@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.6.1 compiled on February 12 2004";
-	protected static final String PLUGIN_VERSION= "org.apache.ant_1.6.1";
-	 
-	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 "-h" option (help)
-	 */
-	public void testMinusH() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-h"});
-		assertTrue("One message should have been logged, was " + AntTestChecker.getDefault().getMessagesLoggedCount(), 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
-	 */
-	public void testProjecthelp() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-projecthelp"});
-		assertTrue("5 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 5);
-		assertTrue("Project help is incorrect", getLastMessageLogged().startsWith("Subtargets:"));
-	}
-	
-	/**
-	 * Tests the "-p" option (project help)
-	 */
-	public void testMinusP() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-p"});
-		assertTrue("5 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 5);
-		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() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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 properties using "-D" and "-d" to specify debug
-	 */
-	public void testMinusDMinusd() throws CoreException {
-		run("echoing.xml", new String[]{"-d", "-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 testMinusDAndGlobalProperties() throws CoreException {
-		run("echoing.xml", new String[]{"-DAntTests=testing", "-Declipse.is.cool=true"}, false);
-		assertSuccessful();
-		assertTrue("eclipse.running should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.running")));
-		assertNotNull("eclipse.home should have been set", AntTestChecker.getDefault().getUserProperty("eclipse.home"));
-	}
-	
-	/**
-	 * 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"));
-	}
-	
-	/**
-	 * Tests specifying properties when the user has incorrectly specified "-Debug"
-	 * Bug 40935
-	 */
-	public void testPropertiesWithMinusDebug() throws CoreException {
-		run("echoing.xml", new String[]{"-Debug", "-DAntTests= testing", "-Declipse.is.cool=    true"}, false);
-		assertTrue("\"-Debug\" should be flagged as an unknown argument", "Unknown argument: -Debug".equals(AntTestChecker.getDefault().getMessages().get(0)));
-		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 when the user has incorrectly specified "-Debug"
-	 * Bug 40935
-	 */
-	public void testMinusDebug() throws CoreException {
-		run("echoing.xml", new String[]{"-Debug"});
-		assertTrue("\"-Debug\" should be flagged as an unknown argument", "Unknown argument: -Debug".equals(AntTestChecker.getDefault().getMessages().get(0)));
-		assertSuccessful();
-	}
-	
-	public void testPropertyFileWithNoArg() {
-		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() {
-		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() {
-		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() {
-		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() {
-		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 "-inputhandler" option with a test input handler and the -noinput option
-	 */
-	public void testInputHandlerWithMinusNoInput() {
-		try {
-			run("input.xml", new String[]{"-inputhandler", "org.eclipse.ant.tests.core.support.inputHandlers.AntTestInputHandler", "-noinput"});
-		} catch (CoreException ce) {
-			assertTrue("Message incorrect: " + ce.getMessage(), ce.getMessage().endsWith("Unable to respond to input request likely as a result of specifying the -noinput command"));
-			return;
-		}
-		
-		assertTrue("Build should have failed", false);
-	}
-	
-	/**
-	 * Tests the -noinput option with the default input handler
-	 */
-	public void testMinusNoInput() {
-		try {
-			run("input.xml", new String[]{"-noinput"});
-		} catch (CoreException ce) {
-			assertTrue("Message incorrect: " + ce.getMessage(), ce.getMessage().endsWith("Failed to read input from Console."));
-			return;
-		}
-	
-		assertTrue("Build should have failed", false);
-	}
-	
-	/**
-	 * Tests the "-diagnostics" option with no ANT_HOME set
-	 * bug 25693
-	 */
-	public void testDiagnosticsWithNoAntHome() throws CoreException {
-		try {
-			AntCorePlugin.getPlugin().getPreferences().setAntHome(null);
-			run("input.xml", new String[]{"-diagnostics"});
-		
-			String msg= (String)AntTestChecker.getDefault().getMessages().get(0);
-			assertTrue("Message incorrect: " + msg, msg.equals("------- Ant diagnostics report -------"));
-		} finally {
-			restorePreferenceDefaults();
-		}
-	}
-		
-	/**
-	 * Tests the "-diagnostics" option with ANT_HOME set
-	 * bug 25693
-	 */
-	public void testDiagnostics() throws CoreException {
-	
-		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(PLUGIN_VERSION));
-	}
-	
-	/**
-	 * Tests the "-quiet" still reports build successful
-	 * bug 34488
-	 */
-	public void testMinusQuiet() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-quiet"});
-		assertSuccessful();	
-	}
-
-	/**
-	 * Tests the "-keep-going" option
-	 */
-	public void testMinusKeepGoing() {
-		try {
-			run("failingTarget.xml", new String[]{"-keep-going"}, false);
-		} catch (CoreException be) {
-			assertTrue("4 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 4);
-			assertTrue("Incorrect message:"  + AntTestChecker.getDefault().getLoggedMessage(1), "Still echo on failure".equals(AntTestChecker.getDefault().getLoggedMessage(1)));
-			return;
-		}
-		
-		assertTrue("The build should have failed", false);
-	}
-	
-	/**
-	 * Tests the "-k" option
-	 */
-	public void testMinusK() {
-		try {
-			run("failingTarget.xml", new String[]{"-keep-going"}, false);
-		} catch (CoreException be) {
-			assertTrue("4 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 4);
-			assertTrue("Incorrect message:"  + AntTestChecker.getDefault().getLoggedMessage(1), "Still echo on failure".equals(AntTestChecker.getDefault().getLoggedMessage(1)));
-			return;
-		}
-		
-		assertTrue("The build should have failed", false);
-	}
-	
-}
\ No newline at end of file

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 b477eb4..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.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.tests;
-
-
-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 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.java.version should have been set", AntTestChecker.getDefault().getUserProperty("ant.java.version"));
-		assertNotNull("ant.version should have been set", AntTestChecker.getDefault().getUserProperty("ant.version"));
-		assertNotNull("eclipse.home should have been set", AntTestChecker.getDefault().getUserProperty("eclipse.home"));
-	}
-
-	public void testValue() throws CoreException {
-		String buildFileName="TestForEcho.xml"; 
-		run(buildFileName);
-		assertTrue("property.testing should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("property.testing")));
-	}
-
-	public void testValueWithClass() throws CoreException {
-		
-		String buildFileName="TestForEcho.xml"; 
-		run(buildFileName);
-		assertTrue("property.testing2 should have been set as hey", "hey".equals(AntTestChecker.getDefault().getUserProperty("property.testing2")));
-	}
-
-	public void testClass() throws CoreException {
-		String buildFileName="TestForEcho.xml"; 
-		run(buildFileName);
-		assertTrue("property.testing3 should have been set as AntTestPropertyProvider", "AntTestPropertyValueProvider".equals(AntTestChecker.getDefault().getUserProperty("property.testing3")));
-	}
-	
-	public void testHeadless() throws CoreException {
-		try {
-			AntCorePlugin.getPlugin().setRunningHeadless(true);
-			String buildFileName="TestForEcho.xml"; 
-			run(buildFileName);
-			assertNull("property.headless should not have been set as AntTestPropertyProvider", AntTestChecker.getDefault().getUserProperty("property.headless"));
-		} finally {
-			AntCorePlugin.getPlugin().setRunningHeadless(false);
-		}
-	}
-	
-	public void testNotHeadless() throws CoreException {
-		String buildFileName="TestForEcho.xml"; 
-		run(buildFileName);
-		assertTrue("property.headless should have been set as AntTestPropertyProvider", "headless".equals(AntTestChecker.getDefault().getUserProperty("property.headless")));
-	}
-}
-

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 20df72b..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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 targets are found in a buildfile with a fileset based on ant_home
-	 * (that ant_home is set at parse time)
-	 * Bug 42926.
-	 */
-	public void testGetTargetsWithAntHome() {
-		System.getProperties().remove("ant.home");
-		try {
-			getTargets("Bug42926.xml");
-		} catch (CoreException ce) {
-			//classpathref was successful but the task is not defined
-			ce.getMessage().equals("file:c:/runtime-test-workspace/AntTests/buildfiles/Bug42926.xml:7: taskdef class com.foo.SomeTask cannot be found");
-		}
-	}
-	
-	/**
-	 * 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 0749cfc..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.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.ant.tests.core.tests;
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.internal.core.AntClasspathEntry;
-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);
-	}
-	
-	/**
-	 * Testing the old deprecated API
-	 * @throws CoreException
-	 */
-	public void testAddTaskSettingLibrary() throws CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		URL[] urls= prefs.getExtraClasspathURLs();
-		Task newTask= new Task();
-		newTask.setLibrary(urls[0]);
-		newTask.setTaskName("AntTestTask");
-		newTask.setClassName("org.eclipse.ant.tests.core.support.tasks.AntTestTask");
-		prefs.setCustomTasks(new Task[]{newTask});
-		
-		prefs.updatePluginPreferences();
-		
-		run("CustomTask.xml", new String[0], false);
-		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 testAddTaskSettingLibraryEntry() throws CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		URL[] urls= prefs.getExtraClasspathURLs();
-		Task newTask= new Task();
-		newTask.setLibraryEntry(new AntClasspathEntry(urls[0]));
-		newTask.setTaskName("AntTestTask2");
-		newTask.setClassName("org.eclipse.ant.tests.core.support.tasks.AntTestTask");
-		prefs.setCustomTasks(new Task[]{newTask});
-		
-		prefs.updatePluginPreferences();
-		
-		run("CustomTask.xml", new String[] {"Custom Task from Entry"}, false);
-		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() {
-		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;
-		} finally {
-			restorePreferenceDefaults();	
-		}
-		assertTrue("Build should have failed as task no longer defined", false);
-	}
-	
-	public void testAddTaskFromFolder() throws CoreException {
-		try {
-			AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-			Task newTask= new Task();
-			String path= getProject().getFolder("lib").getFile("taskFolder").getLocation().toFile().getAbsolutePath();
-			IAntClasspathEntry entry= new AntClasspathEntry(path + File.separatorChar);
-			IAntClasspathEntry entries[] = prefs.getAdditionalClasspathEntries();
-			IAntClasspathEntry newEntries[] = new IAntClasspathEntry[entries.length + 1];
-			System.arraycopy(entries, 0, newEntries, 0, entries.length);
-			newEntries[entries.length] = entry;
-			prefs.setAdditionalClasspathEntries(newEntries);
-		
-			newTask.setLibraryEntry(entry);
-			newTask.setTaskName("AntTestTask");
-			newTask.setClassName("org.eclipse.ant.tests.core.support.tasks.AntTestTask2");
-			prefs.setCustomTasks(new Task[]{newTask});
-		
-			prefs.updatePluginPreferences();
-		
-			run("CustomTask.xml", new String[0], false);
-			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();
-		}
-	}
-	
-	public void testTaskDefinedInExtensionPoint() throws CoreException {
-		run("ExtensionPointTask.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 testTaskDefinedInExtensionPointHeadless() {
-		AntCorePlugin.getPlugin().setRunningHeadless(true);
-		try {
-			run("ExtensionPointTask.xml");
-		} catch (CoreException ce) {
-			assertTrue("Exception from undefined task is incorrect", ce.getMessage().endsWith("as this is not an Ant bug."));
-			return;
-		} finally {
-			AntCorePlugin.getPlugin().setRunningHeadless(false);
-		}
-		assertTrue("Build should have failed as task was not defined to run in headless", false);
-	}
-}

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 3c2102c..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.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.ant.tests.core.tests;
-
-
-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.internal.core.AntClasspathEntry;
-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 CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		URL[] urls= prefs.getExtraClasspathURLs();
-		Type newType= new Type();
-		newType.setLibraryEntry(new AntClasspathEntry(urls[0]));
-		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() {
-		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(), ce.getMessage().endsWith("as this is not an Ant bug."));
-			return;
-		} finally {
-			restorePreferenceDefaults();	
-		}
-		assertTrue("Build should have failed as type no longer defined", false);
-		
-	}
-	
-	public void testTypeDefinedInExtensionPoint() throws CoreException {
-		run("ExtensionPointType.xml");
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("Ensure that an extension point defined type is present"));
-		assertSuccessful();
-	}
-	
-	public void testTypeDefinedInExtensionPointHeadless() {
-		AntCorePlugin.getPlugin().setRunningHeadless(true);
-		try {
-			run("ExtensionPointType.xml");
-		} catch (CoreException ce) {
-			assertTrue("Exception from undefined type is incorrect: " + ce.getMessage(), ce.getMessage().endsWith("as this is not an Ant bug."));
-			return;
-		} finally {
-			AntCorePlugin.getPlugin().setRunningHeadless(false);
-		}
-		assertTrue("Build should have failed as type was not defined to run in headless", false);
-	}
-	
-}

diff --git a/ant/org.eclipse.ant.tests.ui/.classpath b/ant/org.eclipse.ant.tests.ui/.classpath
deleted file mode 100644
index 5e3b04c..0000000
--- a/ant/org.eclipse.ant.tests.ui/.classpath
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="Ant Editor Tests"/>
-	<classpathentry kind="src" path="test plugin"/>
-	<classpathentry kind="src" path="Ant Tests"/>
-	<classpathentry kind="src" path="External Tools"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry output="test_support_bin" kind="src" path="test support"/>
-	<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 4e3b0f0..0000000
--- a/ant/org.eclipse.ant.tests.ui/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-test_support_bin

diff --git a/ant/org.eclipse.ant.tests.ui/.externalToolBuilders/Build Test Support JAR.launch b/ant/org.eclipse.ant.tests.ui/.externalToolBuilders/Build Test Support JAR.launch
deleted file mode 100644
index 40b635e..0000000
--- a/ant/org.eclipse.ant.tests.ui/.externalToolBuilders/Build Test Support JAR.launch
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<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;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot; editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.tests.ui/buildfiles/buildAntTestsSupportJAR.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.tests.ui/test support&quot; type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot; editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.tests.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.tests.ui/buildfiles/buildAntTestsSupportJAR.xml}"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>

diff --git a/ant/org.eclipse.ant.tests.ui/.project b/ant/org.eclipse.ant.tests.ui/.project
deleted file mode 100644
index 7ac8530..0000000
--- a/ant/org.eclipse.ant.tests.ui/.project
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.tests.ui</name>
-	<comment></comment>
-	<projects>
-	</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>Build Test Support JAR.launch</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.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/dumper.java
deleted file mode 100644
index ecdc486..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/dtd/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.ant.tests.ui.dtd;
-
-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.internal.ui.dtd.IDfm;
-import org.eclipse.ant.internal.ui.dtd.IElement;
-import org.eclipse.ant.internal.ui.dtd.IModel;
-import org.eclipse.ant.internal.ui.dtd.ISchema;
-import org.eclipse.ant.internal.ui.dtd.ParseError;
-import org.eclipse.ant.internal.ui.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/ant/tests/ui/editor/AntEditorContentOutlineTests.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/AntEditorContentOutlineTests.java
deleted file mode 100644
index 9da14d3..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/AntEditorContentOutlineTests.java
+++ /dev/null

@@ -1,207 +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.ant.tests.ui.editor;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-import org.eclipse.jface.text.BadLocationException;
-
-/**
- * Tests the correct creation of the outline for an xml file.
- * 
- */
-public class AntEditorContentOutlineTests extends AbstractAntUITest {
-    
-    public AntEditorContentOutlineTests(String name) {
-        super(name);
-    }
-   
-    /**
-     * Tests the creation of the AntElementNode, that includes parsing a file
-     * and determining the correct location of the tags.
-     */
-    public void testCreationOfOutlineTree() throws BadLocationException {
-		AntModel model= getAntModel("buildtest1.xml");
-        
-		AntElementNode[] roots = model.getRootElements();
-		assertNotNull(roots);
-		AntElementNode rootProject= roots[0];
-       
-        assertNotNull(rootProject);
-        
-        // Get the content as string
-        String wholeDocumentString = getCurrentDocument().get();
-        
-        // <project>
-        assertEquals(2, getStartingRow(rootProject));
-        assertEquals(2, getStartingColumn(rootProject));
-        int offset = wholeDocumentString.indexOf("project");
-	    assertEquals(offset, rootProject.getOffset());
-        
-        List children = rootProject.getChildNodes();
-		
-		// <property name="propD">
-		AntElementNode element = (AntElementNode)children.get(0);
-		assertEquals(3, getStartingRow(element));
-		assertEquals(3, getStartingColumn(element)); // with tab in file
-		assertEquals(3, getEndingRow(element));
-		assertEquals(39, getEndingColumn(element));  // with tab in file
-
-        offset = wholeDocumentString.indexOf("property");
-        assertEquals(offset, element.getOffset());
-        int length = "<property name=\"propD\" value=\"valD\" />".length();
-        assertEquals(length- 1, element.getLength()); //we do not include the first '<'
-		
-		// <property file="buildtest1.properties">
-		element = (AntElementNode)children.get(1);
-		assertEquals(4, getStartingRow(element));
-		assertEquals(6, getStartingColumn(element)); // no tab
-		assertEquals(4, getEndingRow(element));
-		assertEquals(45, getEndingColumn(element));
-
-		// <property name="propV">
-		element = (AntElementNode)children.get(2);
-		assertEquals(5, getStartingRow(element));
-		assertEquals(6, getStartingColumn(element));
-		assertEquals(5, getEndingRow(element));
-		assertEquals(42, getEndingColumn(element));
-		
-		// <target name="main">
-		element = (AntElementNode)children.get(3);
-		assertEquals(6, getStartingRow(element));
-		assertEquals(6, getStartingColumn(element));
-		assertEquals(9, getEndingRow(element));
-		assertEquals(13, getEndingColumn(element));
-		
-		// <property name="property_in_target">
-		element = (AntElementNode)element.getChildNodes().get(0);
-		assertEquals(7, getStartingRow(element));
-		assertEquals(10, getStartingColumn(element));
-		assertEquals(7, getEndingRow(element));
-		assertEquals(57, getEndingColumn(element));
-        offset = wholeDocumentString.indexOf("property name=\"property_in_target\"");
-        assertEquals(offset, element.getOffset());
-		
-        assertEquals(21, getEndingRow(rootProject));
-        assertEquals(10, getEndingColumn(rootProject));
-    }
-    
-    private int getColumn(int offset, int line) throws BadLocationException {
-    	return offset - getCurrentDocument().getLineOffset(line - 1) + 1;
-    }
-    
-    private int getStartingRow(AntElementNode element) throws BadLocationException {
-    	return getCurrentDocument().getLineOfOffset(element.getOffset()) + 1;
-    }
-    
-    private int getEndingRow(AntElementNode element) throws BadLocationException {
-    	return getCurrentDocument().getLineOfOffset(element.getOffset() + element.getLength() - 1) + 1;
-    }
-    
-    private int getStartingColumn(AntElementNode element) throws BadLocationException {
-    	return getColumn(element.getOffset(), getStartingRow(element));
-    }
-    
-    private int getEndingColumn(AntElementNode element) throws BadLocationException {
-    	return getColumn(element.getOffset() + element.getLength() - 1, getEndingRow(element));
-    }
-
-    /**
-     * Tests the creation of the AntElementNode, that includes parsing a non-valid 
-     * file.
-     */
-    public void testParsingOfNonValidFile() throws BadLocationException {
-		AntModel model= getAntModel("buildtest2.xml");
-        
-		AntElementNode[] roots = model.getRootElements();
-		assertNotNull(roots);
-		AntElementNode root= roots[0];
-   		assertNotNull(root);
-
-        List children = root.getChildNodes();
-
-		// <target name="main">
-		AntElementNode element = (AntElementNode)children.get(2);
-		assertEquals(5, getStartingRow(element));
-		assertEquals(3, getStartingColumn(element)); // with tab in file
-		assertEquals(5, getEndingRow(element));
-		//main has no ending column as the element is not closed
-        int offset = getCurrentDocument().get().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");
-		AntElementNode[] roots = model.getRootElements();
-		assertNotNull(roots);
-		AntElementNode root= roots[0];
-		assertNotNull(root);
-	}
-	
-	/**
-	 * Tests whether the outline can handle an empty build file.
-	 */
-	public void testWithEmptyBuildFile() {
-		AntModel model= getAntModel("empty.xml");
-		AntElementNode[] roots = model.getRootElements();
-		assertNotNull(roots);
-		assertTrue(roots.length == 0);
-	}		
-
-	/**
-	 * Some testing of getting the right location of tags.
-	 */
-	public void testAdvancedTaskLocation() throws BadLocationException {
-		AntModel model= getAntModel("outline_select_test_build.xml");
-        
-		AntElementNode[] roots = model.getRootElements();
-        assertNotNull(roots);
-        AntElementNode rootProject= roots[0];
-        // Get the content as string
-        String wholeDocumentString = getCurrentDocument().get();
-        
-        // <project>
-        assertNotNull(rootProject);
-        assertEquals(2, getStartingRow(rootProject));
-        assertEquals(2, getStartingColumn(rootProject));
-        int offset = wholeDocumentString.indexOf("project");
-        
-	    assertEquals(offset, rootProject.getOffset());
-        
-		// <target name="properties">
-        AntElementNode element = (AntElementNode)rootProject.getChildNodes().get(1);
-        assertNotNull(element);
-        assertEquals("properties", element.getLabel());
-        assertEquals(16, getStartingRow(element));
-        assertEquals(3, getStartingColumn(element));
-        offset = wholeDocumentString.indexOf("target name=\"properties\"");
-      
-	    assertEquals(offset, element.getOffset());
-	}
-
-    public static Test suite() {
-		return new TestSuite(AntEditorContentOutlineTests.class);
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/CodeCompletionTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/CodeCompletionTest.java
deleted file mode 100644
index dc2b520..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/CodeCompletionTest.java
+++ /dev/null

@@ -1,648 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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.ant.tests.ui.editor;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.tests.ui.editor.support.TestTextCompletionProcessor;
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class CodeCompletionTest extends AbstractAntUITest {
-
-    /**
-     * Constructor for CodeCompletionTest.
-     * @param name
-     */
-    public CodeCompletionTest(String name) {
-        super(name);
-    }
-    
-	public static Test suite() {
-		return new TestSuite(CodeCompletionTest.class);
-	}
-
-    /**
-     * Tests the code completion for attributes of tasks.
-     */
-    public void testAttributeProposals() {
-        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(16, proposals.length);
-        ICompletionProposal proposal = proposals[0];
-        String displayString = proposal.getDisplayString();
-        assertTrue(displayString.equals("id") 
-        || displayString.equals("taskname")
-        || displayString.equals("description")
-        || displayString.equals("file")
-        || displayString.equals("preservelastmodified - (true | false | on | off | yes | no)")
-        || displayString.equals("tofile")
-        || displayString.equals("todir")
-        || displayString.equals("overwrite - (true | false | on | off | yes | no)")
-        || displayString.equals("filtering - (true | false | on | off | yes | no)")
-        || displayString.equals("flatten - (true | false | on | off | yes | no)")
-        || displayString.equals("includeemptydirs")
-        || displayString.equals("failonerror - (true | false | on | off | yes | no)")
-        || displayString.equals("verbose - (true | false | on | off | yes | no)")
-        || displayString.equals("encoding")
-        || displayString.equals("outputencoding")
-        || displayString.equals("enablemultiplemapping - (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");
-        //id includesfile includes
-        assertEquals(3, proposals.length);
-        displayString= proposals[0].getDisplayString();
-        assertTrue(displayString.equals("id") 
-        		||  displayString.equals("includeFile")
-				|| displayString.equals("includes"));
-
-        proposals = processor.getAttributeProposals("project", "de");
-        assertEquals(1, proposals.length);
-    }
-    
-    /**
-     * Test the code completion for properties, including unquoted (bug 40871)
-     */
-    public void testPropertyProposals() throws BadLocationException {
-    	TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("buildtest1.xml"));
-
-    	int lineNumber= 7;
-    	int columnNumber= 17;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getPropertyProposals(getCurrentDocument(), "", lineOffset + columnNumber);
-    	assertTrue(proposals.length >= 1);
-    	assertContains("prop1", proposals);
-    	
-    	lineNumber= 18;
-    	columnNumber= 25;
-    	lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	proposals = processor.getPropertyProposals(getCurrentDocument(), "", lineOffset + columnNumber);
-    	assertTrue(proposals.length >= 1);
-    	assertContains("prop2", proposals);
-    }
-    
-    /**
-     * Test the code completion for "system" properties
-     */
-    public void testSystemPropertyProposals() throws BadLocationException {
-    	TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("buildtest1.xml"));
-    	
-    	int lineNumber= 18;
-    	int columnNumber= 25;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getPropertyProposals(getCurrentDocument(), "", lineOffset + columnNumber);
-    	assertTrue(proposals.length >= 1);
-    	assertContains("java.home", proposals);
-    }
-    
-    /**
-     * Test the code completion for the depend attribute of a target.
-     */
-    public void testTargetDependProposals() throws BadLocationException {
-    	TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("buildtest1.xml"));
-    	//simple depends
-    	int lineNumber= 10;
-    	int columnNumber= 34;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getTargetAttributeValueProposals(getCurrentDocument(), getCurrentDocument().get(0, lineOffset + columnNumber), "", "depends");
-    	assertTrue(proposals.length == 7);
-    	assertContains("pretest", proposals);
-    	assertContains("testMoreDepends", proposals);
-    	//comma separated depends
-    	lineNumber= 17;
-    	columnNumber= 53;
-    	lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	proposals = processor.getTargetAttributeValueProposals(getCurrentDocument(), getCurrentDocument().get(0, lineOffset + columnNumber), "", "depends");
-    	assertTrue(proposals.length == 6);
-    	assertContains("main", proposals);
-    	assertDoesNotContain("pretest", proposals);
-    	
-    }
-    
-    /**
-     * Test the code completion for the if attribute of a target.
-     */
-    public void testTargetIfProposals() throws BadLocationException {
-    	TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("buildtest1.xml"));
-
-    	int lineNumber= 15;
-    	int columnNumber= 31;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getTargetAttributeValueProposals(getCurrentDocument(), getCurrentDocument().get(0, lineOffset + columnNumber), "", "if");
-    	assertTrue(proposals.length >= 1);
-    	assertContains("prop1", proposals);
-    }
-    
-    /**
-     * Test the code completion for the unless attribute of a target.
-     */
-    public void testTargetUnlessProposals() throws BadLocationException {
-    	TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("buildtest1.xml"));
-
-    	int lineNumber= 16;
-    	int columnNumber= 43;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getTargetAttributeValueProposals(getCurrentDocument(), getCurrentDocument().get(0, lineOffset + columnNumber), "prop", "unless");
-    	assertTrue(proposals.length >= 1);
-    	assertContains("prop1", 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);
-    }        
-    
-    /**
- 	 * Asserts that <code>displayString</code> is not in one of the 
- 	 * completion proposals.
- 	 */
-    private void assertDoesNotContain(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(false, found);
-    }        
-
-	/**
-	 * Tests the property proposals for the case that they are defined in
-	 * a dependent targets.
-	 */
-    public void testPropertyProposalDefinedInDependantTargets() throws FileNotFoundException {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("dependencytest.xml"));
-
-        File file= getBuildFile("dependencytest.xml");
-        processor.setEditedFile(file);
-		String documentText = getFileContentAsString(file);
-
-		processor.setLineNumber(35);
-		processor.setColumnNumber(41);
-		int cursorPosition = documentText.lastIndexOf("${");
-		assertTrue(cursorPosition != -1);
-        ICompletionProposal[] proposals = processor.getPropertyProposals(new org.eclipse.jface.text.Document(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 that have been defined in the buildfile
-     */
-	public void testCustomTaskProposals() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("taskdef.xml"));
-
-		ICompletionProposal[] proposals = processor.getTaskProposals(getCurrentDocument(), "target", "min");
-		assertEquals(1, proposals.length);
-		ICompletionProposal proposal = proposals[0];
-		assertEquals("mine", proposal.getDisplayString());
-	}
-    
-    /**
-     * Tests the code completion for tasks that have been defined via the task extension point
-     */
-	public void testExtensionPointTaskProposals() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("taskdef.xml"));
-
-		ICompletionProposal[] proposals = processor.getTaskProposals(getCurrentDocument(), "target", "cool");
-		assertEquals(4, proposals.length);
-		assertContains("coolUITask", proposals);
-	}
-    
-    /**
-     * Tests the code completion for tasks that have been defined via macrodef in the buildfile
-     */
-	public void testMacrodefProposals() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("macrodef.xml"));
-
-		ICompletionProposal[] proposals = processor.getTaskProposals(getCurrentDocument(), "target", "eclipsema");
-		assertEquals(1, proposals.length);
-		ICompletionProposal proposal = proposals[0];
-		assertEquals("eclipseMacro", proposal.getDisplayString());
-        
-	}
-	
-	/**
-     * Tests the code completion for nested element attributes
-     */
-	public void testNestedElementAttributeProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("macrodef.xml"));
-		int lineNumber= 5;
-    	int columnNumber= 11;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "");
-    	assertTrue(proposals.length == 4);
-    	assertContains("description", proposals);
-    	assertContains("name", proposals);
-	}
-	
-	/**
-     * Tests the code completion for tasks that have been defined via macrodef in the buildfile
-     */
-	public void testMacrodefAttributeProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("macrodef.xml"));
-		int lineNumber= 12;
-    	int columnNumber= 16;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "");
-    	assertTrue(proposals.length == 2);
-    	assertContains("v", proposals);
-    	assertContains("eclipse", proposals);
-    	assertTrue("Additional proposal information not correct", proposals[1].getAdditionalProposalInfo().startsWith("Testing Eclipse"));
-	}
-	
-	/**
-     * Tests the code completion for elements that have been defined via macrodef in the buildfile
-     */
-	public void testMacrodefElementProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("macrodef.xml"));
-		int lineNumber= 13;
-    	int columnNumber= 3;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "");
-    	assertTrue(proposals.length == 1);
-    	assertTrue("Proposal not correct", proposals[0].getDisplayString().equals("some-tasks"));
-    	assertTrue("Additional proposal information not correct", proposals[0].getAdditionalProposalInfo().endsWith("Not required"));
-	}
-
-    /**
-     * Tests the code completion for tasks having parent tasks.
-     */
-    public void testTaskProposals() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("buildtest1.xml"));
-
-       
-        ICompletionProposal[] proposals = processor.getTaskProposals("         <", "rename", "");
-        assertEquals(0, proposals.length);
-
-        proposals = processor.getTaskProposals("       <cl", "property", "cl");
-        assertEquals(1, proposals.length);
-        ICompletionProposal proposal = proposals[0];
-        assertEquals("classpath", proposal.getDisplayString());
-
-        proposals = processor.getTaskProposals("       <pr", "property", "");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("classpath", proposal.getDisplayString());
-        
-        // "<project><target><mk"
-        proposals = processor.getTaskProposals("<project><target><mk", "target", "mk");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("mkdir", proposal.getDisplayString());
-        
-    }
-    
-	/**
-	 * Test for bug 40951
-	 */
-	public void testMixedElements() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("mixed.xml"));
-		//String string = "<project><target><sql driver=\"\" password=\"\" url=\"\" userid=\"\"></sql><concat></concat>";
-		ICompletionProposal[] proposals = processor.getTaskProposals(getCurrentDocument(), processor.getParentName(getCurrentDocument(), 0, 62), "t");
-		assertEquals(1, proposals.length);
-		ICompletionProposal proposal = proposals[0];
-		assertEquals("transaction", proposal.getDisplayString());
-		
-		proposals = processor.getTaskProposals(getCurrentDocument(), processor.getParentName(getCurrentDocument(), 0, 76), "");
-		//filelist fileset filterchain footer header path
-		assertEquals(6, proposals.length);
-		proposal = proposals[0];
-		assertEquals("filelist", proposal.getDisplayString());
-	}
-	
-    /**
-     * 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());
-    }
-    
-    /**
-     * Tests how the processor determines the proposal mode.
-     */
-    public void testDeterminingAttributeProposalMode() {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-        int mode = processor.determineProposalMode("<project><property ta", 21, "ta");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL, mode);
-        mode = processor.determineProposalMode("<project><property ", 19, "");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL, mode);
-        mode = processor.determineProposalMode("<project><property   ", 21, "");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL, mode);
-        mode = processor.determineProposalMode("<property id=\"hu\" ", 18, "");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL, mode);
-        mode = processor.determineProposalMode("<property id=\"hu\" \r\n ", 21, "");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL, mode);
-        mode = processor.determineProposalMode("<property\n", 10, "");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL, mode);
-    }
-    
-	/**
-	* Tests how the processor determines the proposal mode.
-	*/
-   public void testDeterminingPropertyProposalMode() {
-	   TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-	   int mode =processor.determineProposalMode("<project><target name=\"$\"", 24, "");
-	   assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_PROPERTY_PROPOSAL, mode);
-	   mode = processor.determineProposalMode("<project><target name=\"${\"", 25, "");
-	   assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_PROPERTY_PROPOSAL, mode);
-	   mode = processor.determineProposalMode("<project><target name=\"${ja.bl\"", 30, "ja.bl");
-	   assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_PROPERTY_PROPOSAL, mode);
-	  
-		mode = processor.determineProposalMode("<project><target><echo>${", 25, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_PROPERTY_PROPOSAL, mode);
-   }
-    
-	/**
-	 * Tests how the processor determines the proposal mode.
-	 */
-	public void testDeterminingTaskProposalMode() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-    
-		int mode = processor.determineProposalMode("<project><prop", 14, "prop");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project> hjk", 13, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project> hjk<", 14, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode); // allow this case though it is not valid with Ant
-		mode = processor.determineProposalMode("<project>", 9, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project> ", 10, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project></", 11, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL_CLOSING, mode);
-		mode = processor.determineProposalMode("<project>< </project>", 10, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project default=\"hey\"><target name=\"hey\">a</target></project>", 44, "a");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project default=\"hey\"><target name=\"hey\"></target></project>", 43, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project default=\"hey\"><target name=\"hey\"><a</target></project>", 45, "<a");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<target name=\"main\"><zip><size></size></zip></", 46, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL_CLOSING, mode);
-		mode = processor.determineProposalMode("", 0, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_BUILDFILE, mode);
-		mode= processor.determineProposalMode("<project default=\"hey\"><target name=\"hey\"><javac>a</javac></target></project>", 51, "a");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-		mode = processor.determineProposalMode("<project> hjk", 13, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL, mode);
-	}
-	
-	/**
-	 * Tests how the processor determines the proposal mode.
-	 */
-	public void testDeterminingTaskClosingProposalMode() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-	
-		int mode = processor.determineProposalMode("<target name=\"main\"><zip><size></size></zip></", 46, "");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_TASK_PROPOSAL_CLOSING, 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);
-		
-		prefix = processor.getPrefixFromDocument("pro", 3);
-		assertEquals("pro", prefix);
-    }    
-    
-    /**
-     * Tests how the processor determines the proposal mode.
-     */
-    public void testDeterminingNoneProposalMode() {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        int mode = processor.determineProposalMode("<project><prop bla", 18, "bla");
-        assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_NONE, mode);
-		mode= processor.determineProposalMode("<project default=\"hey\"><target name=", 37, "name=");
-		assertEquals(TestTextCompletionProcessor.TEST_PROPOSAL_MODE_NONE, mode);
-	}
-    
-    /**
-     * Tests the code completion for tasks in an empty build file (no parent).
-     */
-    public void testTaskProposalsForEmptyBuildFile() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("empty.xml"));
-
-        ICompletionProposal[] proposals = processor.getBuildFileProposals("", "");
-        assertEquals(1, proposals.length);
-        assertEquals("project", proposals[0].getDisplayString());
-        
-        proposals = processor.getBuildFileProposals("            jl", "jl");
-        assertEquals(0, proposals.length);
-        
-        proposals = processor.getBuildFileProposals("    \n<project></project>", "");
-        assertEquals(1, proposals.length);
-    }
-    
-    /**
-     * Tests the code completion for refids (Bug 49830)
-     */
-    public void testRefidProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("refid.xml"));
-
-		int lineNumber= 9;
-    	int columnNumber= 16;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "");
-    	//for sure should have project.class.path and project.class.path2
-    	assertTrue(proposals.length >= 2);
-    	assertContains("project.class.path", proposals);
-    	assertDoesNotContain("project.class.path2", proposals);
-    }
-    
-    /**
-     * Tests the code completion for custom task that has a boolean attribute
-     */
-    public void testCustomBooleanProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("customBoolean.xml"));
-
-		int lineNumber= 2;
-    	int columnNumber= 44;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "");
-    	//true false yes no on off
-    	assertTrue(proposals.length == 6);
-    	assertContains("true", proposals);
-    	assertContains("no", proposals);
-    }
-    
-     /**
-     * Tests the code completion for custom task that has an enumerated attribute
-     */
-    public void testCustomEnumeratedProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("extensionPointTaskSepVM.xml"));
-		int lineNumber= 2;
-    	int columnNumber= 24;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "c");
-    	assertEquals("Incorrect number of proposals", 2, proposals.length);
-    	assertContains("cool", proposals);
-    	assertContains("chillin", proposals);
-    	assertDoesNotContain("awesome", proposals);
-    }
-    
-    /**
-     * Tests the code completion for custom task that have a reference attribute
-     */
-    public void testCustomReferenceProposals() throws BadLocationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor(getAntModel("extensionPointTaskSepVM.xml"));
-		int lineNumber= 2;
-    	int columnNumber= 41;
-    	int lineOffset= getCurrentDocument().getLineOffset(lineNumber);
-    	processor.setLineNumber(lineNumber);
-    	processor.setColumnNumber(columnNumber);
-    	processor.setCursorPosition(lineOffset + columnNumber);
-    	ICompletionProposal[] proposals = processor.getProposalsFromDocument(getCurrentDocument(), "e");
-    	assertEquals("Incorrect number of proposals", 1, proposals.length);
-    	//the reference to the project by name
-    	assertContains("Extension Point Task", proposals);
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/TaskDescriptionProviderTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/TaskDescriptionProviderTest.java
deleted file mode 100644
index 521ecdd..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/TaskDescriptionProviderTest.java
+++ /dev/null

@@ -1,65 +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.ant.tests.ui.editor;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-import org.eclipse.ant.internal.ui.editor.TaskDescriptionProvider;
-
-/**
- * Tests the tasks description provider.
- * 
- */
-public class TaskDescriptionProviderTest extends AbstractAntUITest {
-
-    public TaskDescriptionProviderTest(String name) {
-        super(name);
-    }
-
-    /** 
-     * Tests getting the description of a task.
-     */
-    public void testGettingTaskDescription() {
-        TaskDescriptionProvider provider = TaskDescriptionProvider.getDefault();
-        String description = provider.getDescriptionForTask("apply");
-        assertNotNull(description);
-        assertTrue(description.length() > 0);
-    }
-
-    /**
-     * Tests getting the description of an attribute.
-     */
-    public void testGettingAttribute() {
-        TaskDescriptionProvider provider = TaskDescriptionProvider.getDefault();
-        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 = TaskDescriptionProvider.getDefault();
-        String required = provider.getRequiredAttributeForTaskAttribute("apply", "executable");
-        assertNotNull(required);
-        assertEquals("yes", required);
-    }
-
-    public static Test suite() {
-		return new TestSuite(TaskDescriptionProviderTest.class);
-    }
-}

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/FormattingPreferencesTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/FormattingPreferencesTest.java
deleted file mode 100644
index 8295cfc..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/FormattingPreferencesTest.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.ui.editor.formatter;
-
-import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-
-public class FormattingPreferencesTest extends AbstractAntUITest {
-
-    /**
-     * @param name
-     */
-    public FormattingPreferencesTest(String name) {
-        super(name);
-    }
-
-    public final void testGetCanonicalIndent() {
-     
-        FormattingPreferences prefs;
-        
-        // test spaces 
-        prefs = new FormattingPreferences(){
-            public int getTabWidth() {                
-                return 3;
-            }
-            public boolean useSpacesInsteadOfTabs() {
-                return true;
-            }
-        };        
-        assertEquals("   ",prefs.getCanonicalIndent());
-        
-        // ensure the value is not hard coded
-        prefs = new FormattingPreferences(){
-            public int getTabWidth() {                
-                return 7;
-            }
-            public boolean useSpacesInsteadOfTabs() {
-                return true;
-            }
-        };        
-        assertEquals("       ",prefs.getCanonicalIndent());
-        
-        // use tab character
-        prefs = new FormattingPreferences(){
-            public int getTabWidth() {                
-                return 7;
-            }
-            public boolean useSpacesInsteadOfTabs() {
-                return false;
-            }
-        };        
-        assertEquals("\t",prefs.getCanonicalIndent());
-    }
-
-}

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlDocumentFormatterTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlDocumentFormatterTest.java
deleted file mode 100644
index 7852dd5..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlDocumentFormatterTest.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.ui.editor.formatter;
-
-import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
-import org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter;
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-
-/**
- *  
- */
-public class XmlDocumentFormatterTest extends AbstractAntUITest {
-
-    /**
-     * @param name
-     */
-    public XmlDocumentFormatterTest(String name) {
-        super(name);
-    }
-
-    /**
-     * General Test 
-     */
-    public final void testGeneralFormat() throws Exception {
-        FormattingPreferences prefs = new FormattingPreferences(){
-            public int getTabWidth() {                
-                return 3;
-            }
-            public boolean stripBlankLines() {
-                return false;
-            }
-            public boolean useSpacesInsteadOfTabs() {
-                return true;
-            }
-        };
-        simpleTest("formatTest_source01.xml","formatTest_target01.xml",prefs);        
-    }
-
-    /**
-     * Insure that tab width is not hard coded
-     */
-    public final void testTabWidth() throws Exception {
-        FormattingPreferences prefs = new FormattingPreferences(){
-            public int getTabWidth() {                
-                return 7;
-            }
-            public boolean stripBlankLines() {
-                return false;
-            }
-            public boolean useSpacesInsteadOfTabs() {
-                return true;
-            }
-        };
-        simpleTest("formatTest_source01.xml","formatTest_target02.xml",prefs);        
-    }
-
-    
-    /**
-     * Test with tab characters instead of spaces.
-     */
-    public final void testTabsInsteadOfSpaces() throws Exception {
-        FormattingPreferences prefs = new FormattingPreferences(){
-            public int getTabWidth() {                
-                return 3;
-            }
-            public boolean stripBlankLines() {
-                return false;
-            }
-            public boolean useSpacesInsteadOfTabs() {
-                return false;
-            }
-        };
-        simpleTest("formatTest_source01.xml","formatTest_target03.xml",prefs);        
-    }
-    
-    
-    /**
-     * @param sourceFileName - file to format
-     * @param targetFileName - the source file after a properly executed format
-     * @param prefs - given the included preference instructions
-     * @throws Exception
-     */
-    private void simpleTest(String sourceFileName, String targetFileName, FormattingPreferences prefs) throws Exception {
-        
-        XmlDocumentFormatter xmlFormatter = new XmlDocumentFormatter();
-        String result = xmlFormatter.format(getFileContentAsString(getBuildFile(sourceFileName)),prefs);
-        String expectedResult = getFileContentAsString(getBuildFile(targetFileName));
-        
-        assertEquals(expectedResult, result);
-    }
-}

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlTagFormatterTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlTagFormatterTest.java
deleted file mode 100644
index 1896ec8..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/formatter/XmlTagFormatterTest.java
+++ /dev/null

@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.ui.editor.formatter;
-
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.formatter.XmlTagFormatter;
-import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-
-/**
- *  
- */
-public class XmlTagFormatterTest extends AbstractAntUITest {
-
-    // TODO This test is too low level and too tightly coupled to internals.
-
-    /* ---------------- Test Fixture ---------------- */
-    // In case anyone wonders why many people recommend against testing
-    // privates, I produce this example...
-    private static class InnerClassFactory extends XmlTagFormatter {
-
-        public static class ParseException extends
-                XmlTagFormatter.ParseException {
-
-            public ParseException(String message) {
-                super(message);
-            }
-        }
-
-        public static class Tag extends XmlTagFormatter.Tag {
-        }
-
-        public static class TagFormatter extends XmlTagFormatter.TagFormatter {
-
-            public boolean lineRequiresWrap(String line, int lineWidth,
-                    int tabWidth) {
-                return super.lineRequiresWrap(line, lineWidth, tabWidth);
-            }
-
-            public int tabExpandedLineWidth(String line, int tabWidth) {
-                return super.tabExpandedLineWidth(line, tabWidth);
-            }
-
-            public String wrapTag(Tag tag, FormattingPreferences prefs,
-                    String indent) {
-                return super.wrapTag(tag, prefs, indent);
-            }
-        }
-
-        public static class TagParser extends XmlTagFormatter.TagParser {
-
-            public String getElementName(String tagText)
-                    throws XmlTagFormatter.ParseException {
-                return super.getElementName(tagText);
-            }
-
-            public List getAttibutes(String elementText)
-                    throws XmlTagFormatter.ParseException {
-                return super.getAttibutes(elementText);
-            }
-        }
-
-        public static Tag createTag() {
-            return new Tag();
-        }
-
-        public static TagFormatter createTagFormatter() {
-            return new TagFormatter();
-        }
-
-        public static TagParser createTagParser() {
-            return new TagParser();
-        }
-
-        public static void validateAttributePair(Object attributePair, String attribute, String value) {
-            XmlTagFormatter.AttributePair pair = (XmlTagFormatter.AttributePair) attributePair;
-            assertEquals(attribute, pair.getAttribute());
-            assertEquals(value, pair.getValue());
-        }
-    }
-
-    /**
-     * @param name
-     */
-    public XmlTagFormatterTest(String name) {
-        super(name);
-    }
-
-    private FormattingPreferences getPreferences(final boolean wrapLongTags,
-            final boolean alignCloseChar, final int maxLineWidth) {
-
-        return new FormattingPreferences() {
-
-            public boolean alignElementCloseChar() {
-                return alignCloseChar;
-            }
-
-            public boolean wrapLongTags() {
-                return wrapLongTags;
-            }
-
-            public int getMaximumLineWidth() {
-                return maxLineWidth;
-            }
-        };
-    }
-
-    /**
-     *  
-     */
-    private void simpleTest(String source, String target,
-            FormattingPreferences prefs, String indent) throws Exception {
-    	
-        String result = XmlTagFormatter.format(source, prefs, indent);
-        assertEquals(target, result);
-    }
-
-    /* ---------------- Test Methods ---------------- */
-
-    public void testParserGetElementName() throws Exception {
-
-        InnerClassFactory.TagParser tagParser = InnerClassFactory
-                .createTagParser();
-
-        String elementFixture1 = "<myElement attribute1=\"value1\" attribute2=\"value2\" />"; //$NON-NLS-1$
-        assertEquals("myElement", tagParser.getElementName(elementFixture1)); //$NON-NLS-1$
-
-        String elementFixture2 = "<myElement\t\nattribute1=\"value1\" attribute2=\"value2\" />"; //$NON-NLS-1$
-        assertEquals("myElement", tagParser.getElementName(elementFixture2)); //$NON-NLS-1$
-
-        assertEquals("x", tagParser.getElementName("<x/>")); //$NON-NLS-1$ //$NON-NLS-2$
-        assertEquals("x", tagParser.getElementName("<x>")); //$NON-NLS-1$ //$NON-NLS-2$
-        assertEquals("x:y", tagParser.getElementName("<x:y/>")); //$NON-NLS-1$ //$NON-NLS-2$
-        assertEquals("x:y", tagParser.getElementName("<x:y abc/>")); //$NON-NLS-1$ //$NON-NLS-2$
-
-        Exception e1 = null;
-        try {
-            tagParser.getElementName("<>"); //$NON-NLS-1$
-        } catch (Exception e) {
-            e1 = e;
-        }
-        assertNotNull(e1);
-        assertTrue(e1.getClass().isAssignableFrom(
-                InnerClassFactory.ParseException.class));
-
-        Exception e2 = null;
-        try {
-            tagParser.getElementName("<>"); //$NON-NLS-1$
-        } catch (Exception e) {
-            e2 = e;
-        }
-        assertNotNull(e2);
-        assertTrue(e2.getClass().isAssignableFrom(
-                InnerClassFactory.ParseException.class));
-
-    }
-
-    public void testParserGetAttributes() throws Exception {
-        InnerClassFactory.TagParser tagParser = InnerClassFactory
-                .createTagParser();
-
-        List attributePairs;
-
-        // test normal situation
-        attributePairs = tagParser
-                .getAttibutes("<myElement attribute1=\"value1\" attribute2=\"value2\" />"); //$NON-NLS-1$
-
-        assertEquals(2, attributePairs.size());
-        InnerClassFactory.validateAttributePair(attributePairs.get(0),
-                "attribute1", "value1"); //$NON-NLS-1$ //$NON-NLS-2$
-        InnerClassFactory.validateAttributePair(attributePairs.get(1),
-                "attribute2", "value2"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        
-        // test with extra whitespace and funny quotes
-        attributePairs = tagParser
-                .getAttibutes("<myElement \nattribute1 =  'value1\"'\nattribute2\t=\"value2'\" />"); //$NON-NLS-1$
-
-        assertEquals(2, attributePairs.size());
-        InnerClassFactory.validateAttributePair(attributePairs.get(0),
-                "attribute1", "value1\""); //$NON-NLS-1$ //$NON-NLS-2$
-        InnerClassFactory.validateAttributePair(attributePairs.get(1),
-                "attribute2", "value2'"); //$NON-NLS-1$ //$NON-NLS-2$
-
-// TODO attributes which contain whitespace should throw a parse error
-//       
-//        // test parse errors - whitespace in attribute name
-//        Exception e1 = null;
-//        try {
-//            attributePairs = tagParser
-//                    .getAttibutes("<myElement at tribute1 = \"value1\" attribute2=\"value2\" />");
-//        } catch (Exception e) {
-//            e1 = e;
-//        }
-//        assertNotNull(e1);
-//        assertTrue(e1.getClass().isAssignableFrom(
-//                InnerClassFactory.ParseException.class));
-        
-        
-        // test parse errors - equals in the wrong place
-        Exception e2 = null;
-        try {
-            attributePairs = tagParser
-                    .getAttibutes("<myElement attribute1=\"value1\" = attribute2=\"value2\" />"); //$NON-NLS-1$
-        } catch (Exception e) {
-            e2 = e;
-        }
-        assertNotNull(e2);
-        assertTrue(e2.getClass().isAssignableFrom(
-                InnerClassFactory.ParseException.class));
-        
-        
-        // test parse errors - quotes in the wrong place
-        Exception e3 = null;
-        try {
-            attributePairs = tagParser
-                    .getAttibutes("<myElement attribute1=\"\"value1\"  attribute2=\"value2\" />"); //$NON-NLS-1$
-        } catch (Exception e) {
-            e3 = e;
-        }
-        assertNotNull(e3);
-        assertTrue(e3.getClass().isAssignableFrom(
-                InnerClassFactory.ParseException.class));
-        
-
-    }
-
-    /**
-     *  
-     */
-    public void testFormat01() throws Exception {
-        String indent = "\t"; //$NON-NLS-1$
-        String source = "<target name=\"myTargetName\" depends=\"a,b,c,d,e,f,g\" description=\"This is a very long element which ought to be wrapped.\">"; //$NON-NLS-1$
-        String target = "<target name=\"myTargetName\"\n" //$NON-NLS-1$
-                + indent
-                + "        depends=\"a,b,c,d,e,f,g\"\n" //$NON-NLS-1$
-                + indent
-                + "        description=\"This is a very long element which ought to be wrapped.\">"; //$NON-NLS-1$
-
-        simpleTest(source, target, getPreferences(true, false, 60), indent);
-    }
-
-    /**
-     *  
-     */
-    public void testFormat02() throws Exception {
-        String indent = "\t"; //$NON-NLS-1$
-        String source = "<target name=\"myTargetName\" depends=\"a,b,c,d,e,f,g\" description=\"This is a very long element which ought to be wrapped.\">"; //$NON-NLS-1$
-        String target = "<target name=\"myTargetName\"\n" //$NON-NLS-1$
-                + indent
-                + "        depends=\"a,b,c,d,e,f,g\"\n" //$NON-NLS-1$
-                + indent
-                + "        description=\"This is a very long element which ought to be wrapped.\"\n" //$NON-NLS-1$
-                + indent + ">"; //$NON-NLS-1$
-
-        simpleTest(source, target, getPreferences(true, true, 60), indent);
-    }
-
-    /**
-     *  
-     */
-    public void testLineRequiresWrap() throws Exception {
-
-        InnerClassFactory.TagFormatter tagFormatter = InnerClassFactory
-                .createTagFormatter();
-
-        boolean shouldWrap = tagFormatter
-                .lineRequiresWrap(
-                        "\t\t  <myElement attribute1=\"value1\" attribute2=\"value2\" />", //$NON-NLS-1$
-                        70, 8);
-        boolean shouldNotWrap = tagFormatter
-                .lineRequiresWrap(
-                        "\t\t <myElement attribute1=\"value1\" attribute2=\"value2\" />", //$NON-NLS-1$
-                        70, 8);
-        assertTrue(shouldWrap);
-        assertTrue(!shouldNotWrap);
-
-    }
-
-    /**
-     *  
-     */
-    public void testTabExpandedLineWidth() throws Exception {
-
-        InnerClassFactory.TagFormatter tagFormatter = InnerClassFactory
-                .createTagFormatter();
-
-        assertEquals(20, tagFormatter.tabExpandedLineWidth("\t  1234567890", 8)); //$NON-NLS-1$
-        assertEquals(10, tagFormatter.tabExpandedLineWidth("1234567890", 8)); //$NON-NLS-1$
-        assertEquals(19, tagFormatter
-                .tabExpandedLineWidth("\t1\t2	34567890", 3)); //$NON-NLS-1$
-    }
-
-    public void testTabToStringAndMinimumLength() throws Exception {
-        InnerClassFactory.Tag tag = InnerClassFactory.createTag();
-
-        tag.setElementName("myElement"); //$NON-NLS-1$
-        tag.setClosed(false);
-        assertEquals("<myElement>", tag.toString()); //$NON-NLS-1$
-        assertEquals(tag.toString().length(), tag.minimumLength());
-
-        tag.setClosed(true);
-        assertEquals("<myElement />", tag.toString()); //$NON-NLS-1$
-        assertEquals(tag.toString().length(), tag.minimumLength());
-
-        tag.addAttribute("attribute1", "value1"); //$NON-NLS-1$ //$NON-NLS-2$
-        tag.addAttribute("attribute2", "value2"); //$NON-NLS-1$ //$NON-NLS-2$
-        assertEquals(
-                "<myElement attribute1=\"value1\" attribute2=\"value2\" />", //$NON-NLS-1$
-                tag.toString());
-        assertEquals(tag.toString().length(), tag.minimumLength());
-
-        tag.setClosed(false);
-        assertEquals("<myElement attribute1=\"value1\" attribute2=\"value2\">", //$NON-NLS-1$
-                tag.toString());
-        assertEquals(tag.toString().length(), tag.minimumLength());
-    }
-
-    /**
-     *  
-     */
-    public void testWrapTag() throws Exception {
-
-        InnerClassFactory.Tag tag = InnerClassFactory.createTag();
-
-        InnerClassFactory.TagFormatter tagFormatter = InnerClassFactory
-                .createTagFormatter();
-
-        FormattingPreferences dontAlignCloseChar = new FormattingPreferences() {
-
-            public boolean alignElementCloseChar() {
-                return false;
-            }
-        };
-        FormattingPreferences doAlignCloseChar = new FormattingPreferences() {
-
-            public boolean alignElementCloseChar() {
-                return true;
-            }
-        };
-
-        tag.setElementName("myElement"); //$NON-NLS-1$
-        tag.addAttribute("attribute1", "value1"); //$NON-NLS-1$ //$NON-NLS-2$
-        tag.addAttribute("attribute2", "value2"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        tag.setClosed(true);
-
-        assertEquals("<myElement attribute1=\"value1\"\n" //$NON-NLS-1$
-                + "\t\t             attribute2=\"value2\" />", tagFormatter //$NON-NLS-1$
-                .wrapTag(tag, dontAlignCloseChar, "\t\t  ")); //$NON-NLS-1$
-
-        assertEquals("<myElement attribute1=\"value1\"\n" //$NON-NLS-1$
-                + "\t\t             attribute2=\"value2\"\n\t\t  />", //$NON-NLS-1$
-                tagFormatter.wrapTag(tag, doAlignCloseChar, "\t\t  ")); //$NON-NLS-1$
-
-        tag.setClosed(false);
-
-        assertEquals("<myElement attribute1=\"value1\"\n" //$NON-NLS-1$
-                + "\t\t             attribute2=\"value2\">", tagFormatter //$NON-NLS-1$
-                .wrapTag(tag, dontAlignCloseChar, "\t\t  ")); //$NON-NLS-1$
-
-        assertEquals("<myElement attribute1=\"value1\"\n" //$NON-NLS-1$
-                + "\t\t             attribute2=\"value2\"\n\t\t  >", //$NON-NLS-1$
-                tagFormatter.wrapTag(tag, doAlignCloseChar, "\t\t  ")); //$NON-NLS-1$
-
-    }
-
-}

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestEditor.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestEditor.java
deleted file mode 100644
index 5aa6c93..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/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.ant.tests.ui.editor.support;
-
-import org.eclipse.ant.internal.ui.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/ant/tests/ui/editor/support/TestLocationProvider.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestLocationProvider.java
deleted file mode 100644
index de85de3..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestLocationProvider.java
+++ /dev/null

@@ -1,36 +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.ui.editor.support;
-
-import java.io.File;
-
-import org.eclipse.ant.internal.ui.editor.outline.LocationProvider;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-
-public class TestLocationProvider extends LocationProvider {
-
-	private File buildFile;
-	
-	public TestLocationProvider(File buildFile) {
-		super(null);
-		this.buildFile= buildFile;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.ILocationProvider#getLocation()
-	 */
-	public IPath getLocation() {
-		return new Path(buildFile.getAbsolutePath());
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestProblemRequestor.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestProblemRequestor.java
deleted file mode 100644
index 12378d0..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/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.ant.tests.ui.editor.support;
-
-import org.eclipse.ant.internal.ui.editor.outline.IProblem;
-import org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor;
-
-public class TestProblemRequestor implements IProblemRequestor {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.internal.ui.editor.outline.IProblem)
-	 */
-	public void acceptProblem(IProblem problem) {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor#beginReporting()
-	 */
-	public void beginReporting() {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor#endReporting()
-	 */
-	public void endReporting() {
-
-	}
-}

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestTextCompletionProcessor.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestTextCompletionProcessor.java
deleted file mode 100644
index 987b8f3..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ant/tests/ui/editor/support/TestTextCompletionProcessor.java
+++ /dev/null

@@ -1,165 +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.ui.editor.support;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import junit.framework.Assert;
-
-import org.eclipse.ant.internal.ui.editor.AntEditorCompletionProcessor;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.w3c.dom.Element;
-
-public class TestTextCompletionProcessor extends AntEditorCompletionProcessor {
-
-	public final static int TEST_PROPOSAL_MODE_NONE = AntEditorCompletionProcessor.PROPOSAL_MODE_NONE;
-	public final static int TEST_PROPOSAL_MODE_BUILDFILE = AntEditorCompletionProcessor.PROPOSAL_MODE_BUILDFILE;
-	public final static int TEST_PROPOSAL_MODE_TASK_PROPOSAL = AntEditorCompletionProcessor.PROPOSAL_MODE_TASK_PROPOSAL;
-	public final static int TEST_PROPOSAL_MODE_PROPERTY_PROPOSAL = AntEditorCompletionProcessor.PROPOSAL_MODE_PROPERTY_PROPOSAL;
-	public final static int TEST_PROPOSAL_MODE_ATTRIBUTE_PROPOSAL = AntEditorCompletionProcessor.PROPOSAL_MODE_ATTRIBUTE_PROPOSAL;
-	public final static int TEST_PROPOSAL_MODE_TASK_PROPOSAL_CLOSING = AntEditorCompletionProcessor.PROPOSAL_MODE_TASK_PROPOSAL_CLOSING;
-	public final static int TEST_PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL = AntEditorCompletionProcessor.PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL;
-	
-	private File editedFile;
-
-	public TestTextCompletionProcessor(AntModel model) {
-		super(model);
-	}
-	
-	public TestTextCompletionProcessor() {
-		super(null);
-	}
-	
-    public ICompletionProposal[] getAttributeProposals(String taskName, String prefix) {
-    	cursorPosition= taskName.length();
-        return super.getAttributeProposals(taskName, prefix);
-    }
-
-    public Element findChildElementNamedOf(Element anElement, String childElementName) {
-        return super.findChildElementNamedOf(anElement, childElementName);
-    }
-
-    public ICompletionProposal[] getTaskProposals(String text, String parentName, String prefix) {
-    	cursorPosition= Math.max(0, text.length() - 1);
-        return super.getTaskProposals(new Document(text), parentName, prefix);
-    }
-    
-    public ICompletionProposal[] getTaskProposals(IDocument document, String parentName, String aPrefix) {
-    	cursorPosition= Math.max(0, document.getLength() - 1);
-    	return super.getTaskProposals(document, parentName, aPrefix);
-    }
-    
-    //TODO add template proposal testing
-    protected Collection getTemplateProposals(IDocument document, String prefix) {
-    	return new ArrayList();
-    }
-
-    public int determineProposalMode(String text, int theCursorPosition, String prefix) {
-        return super.determineProposalMode(new Document(text), theCursorPosition, prefix);
-    }
-
-    public String getParentName(String text, int aLineNumber, int aColumnNumber) {
-        return super.getParentName(new Document(text), aLineNumber, aColumnNumber);
-    }
-    
-    public String getParentName(IDocument doc, int aLineNumber, int aColumnNumber) {
-    	return super.getParentName(doc, aLineNumber, aColumnNumber);
-    }
-
-    public String getPrefixFromDocument(String aDocumentText, int anOffset) {
-        String prefix= super.getPrefixFromDocument(aDocumentText, anOffset);
-        currentPrefix= null;
-        return prefix;
-    }
-
-    public ICompletionProposal[] getPropertyProposals(IDocument document, String prefix, int cursorPos) {
-        return super.getPropertyProposals(document, prefix, cursorPos);
-    }
-
-    /**
-     * Returns the edited File that org.eclipse.ant.internal.ui.editor.AntEditorCompletionProcessor sets or a temporary 
-     * file, which only serves as a dummy.
-     * @see org.eclipse.ant.internal.ui.editor.AntEditorCompletionProcessor#getEditedFile()
-     */
-	public File getEditedFile() {
-		if (editedFile != null){
-			return editedFile;
-		}
-		File tempFile = null;
-        try {
-            tempFile = File.createTempFile("test", null);
-        } catch (IOException e) {
-            Assert.fail(e.getMessage());
-        }
-        tempFile.deleteOnExit();
-        return tempFile;
-    }
-
-	public void setLineNumber(int aLineNumber) {
-    	lineNumber = aLineNumber;
-    }
-
-	public void setColumnNumber(int aColumnNumber) {
-    	columnNumber = aColumnNumber;
-    }
-	
-	public void setCursorPosition(int cursorPosition) {
-		this.cursorPosition = cursorPosition;
-	}
-    
-	public void setEditedFile(File aFile) {
-		editedFile= aFile;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.AntEditorCompletionProcessor#getTargetAttributeValueProposals(org.eclipse.jface.text.IDocument, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public ICompletionProposal[] getTargetAttributeValueProposals(IDocument document, String textToSearch, String prefix, String attributeName) {
-		return super.getTargetAttributeValueProposals(document, textToSearch, prefix, attributeName);
-	}
-	/**
-	 * Since the testing occurs without necessarily having an associated viewer, return
-	 * a dummy value.
-	 */
-	protected char getPreviousChar() {
-		return '?';
-	}
-	
-	 /**
-     * Returns whether the specified task name is known.
-     */
-    protected boolean isKnownElement(String elementName) {
-    	if (antModel != null) {
-    		return super.isKnownElement(elementName);
-    	} 
-    	return dtd.getElement(elementName) != null ;
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.AntEditorCompletionProcessor#getProposalsFromDocument(org.eclipse.jface.text.IDocument, java.lang.String)
-	 */
-	public ICompletionProposal[] getProposalsFromDocument(IDocument document, String prefix) {
-		return super.getProposalsFromDocument(document, prefix);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.AntEditorCompletionProcessor#getBuildFileProposals(org.eclipse.jface.text.IDocument, java.lang.String)
-	 */
-	public ICompletionProposal[] getBuildFileProposals(String text, String prefix) {
-		return super.getBuildFileProposals(new Document(text), prefix);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/AbstractAntUIBuildTest.java b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/AbstractAntUIBuildTest.java
deleted file mode 100644
index cb1f244..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/AbstractAntUIBuildTest.java
+++ /dev/null

@@ -1,91 +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.ui;
-
-import junit.framework.TestResult;
-
-import org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest;
-import org.eclipse.ant.tests.ui.testplugin.ConsoleLineTracker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.swt.widgets.Display;
-
-
-public abstract class AbstractAntUIBuildTest extends AbstractAntUITest {
-
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean testing = true;
-		
-	public AbstractAntUIBuildTest(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Runs the test and collects the result in a TestResult without blocking
-	 * the UI thread.
-	 */
-	public void run(final TestResult result) {
-		final Display display = Display.getCurrent();
-		Thread thread = null;
-		try {
-			Runnable r = new Runnable() {
-				public void run() {
-					AbstractAntUIBuildTest.super.run(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();
-			}			
-		}		
-	}
-	
-	/**
-	 * Launches the Ant build with the buildfile name (no extension).
-	 * Waits for all of the lines to be appended to the console.
-	 * 
-	 * @param mainTypeName the program to launch
-	 * @return thread in which the first suspend event occurred
-	 */
-	protected void launch(String buildFileName) throws CoreException {
-		super.launch(buildFileName);
-		ConsoleLineTracker.waitForConsole();
-	}
-	
-	protected void activateLink(final IConsoleHyperlink link) {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				link.linkActivated();
-			}
-		});
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.tests.ui.testplugin.AbstractAntUITest#launch(java.lang.String, java.lang.String)
-	 */
-	protected void launch(String buildFileName, String arguments) throws CoreException {
-		super.launch(buildFileName, arguments);
-		ConsoleLineTracker.waitForConsole();
-	}
-}

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/BuildTests.java b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/BuildTests.java
deleted file mode 100644
index a4d21f2..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/BuildTests.java
+++ /dev/null

@@ -1,171 +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.ui;
-
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.ant.tests.ui.testplugin.ConsoleLineTracker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.swt.graphics.Color;
-
-
-public class BuildTests extends AbstractAntUIBuildTest {
-
-	public BuildTests(String name) {
-		super(name);
-	}
-	
-  /**
-   * Tests launching Ant and getting messages
-   * logged to the console.
-   */
-  public void testOutput() throws CoreException {
-	  launch("echoing");
-	  assertTrue("Incorrect number of messages logged for build. Should be 8. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 8);
-	  String message= ConsoleLineTracker.getMessage(6);
-	  assertTrue("Incorrect last message. Should start with Total time:. Message: " + message, message.startsWith("Total time:"));
-  }
-  
-  /**
-	 * Tests launching Ant and getting the build failed message
-	 * logged to the console with associated link.
-	 * Bug 42333 and 44565
-	 */
-	public void testBuildFailedMessage() throws CoreException {
-		launch("bad");
-		assertTrue("Incorrect number of messages logged for build. Should be 7. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 7);
-		String message= ConsoleLineTracker.getMessage(4);
-		assertTrue("Incorrect last message. Should start with Build Failed:. Message: " + message, message.startsWith("BUILD FAILED:"));
-		int offset= -1;
-		try {
-			offset= ConsoleLineTracker.getDocument().getLineOffset(4) + 30; //link to buildfile that failed
-		} catch (BadLocationException e) {
-			assertTrue("failed getting offset of line", false);
-		}
-		IConsoleHyperlink link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No hyperlink found at offset " + offset, link);
-	}
-  
-  /**
-	 * Tests launching Ant and that the
-	 * correct links are in the console doc
-	 */
-	public void testLinks() throws CoreException {
-		launch("build");
-		int offset= 25; //buildfile link
-		IConsoleHyperlink link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No hyperlink found at offset " + offset, link);
-		activateLink(link);
-		
-		try {
-			offset= ConsoleLineTracker.getDocument().getLineOffset(4) + 10; //echo link
-		} catch (BadLocationException e) {
-			assertTrue("failed getting offset of line", false);
-		}
-		link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No hyperlink found at offset " + offset, link);
-		activateLink(link);
-	}
-	
-	/**
-	 * Tests launching Ant and that the
-	 * correct colors are in the console doc
-	 */
-	public void testColor() throws BadLocationException, CoreException {		
-		launch("echoing");
-		int offset= 15; //buildfile
-		Color color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No color found at " + offset, color);
-		assertEquals(JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_INFO_COLOR), color);
-		try {
-			offset= ConsoleLineTracker.getDocument().getLineOffset(4) + 10; //echo
-		} catch (BadLocationException e) {
-			assertTrue("failed getting offset of line", false);
-		}
-		color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No color found at " + offset, color);
-		assertEquals(JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_WARNING_COLOR), color);
-	}
-	
-	/**
-	 * Tests launching Ant and getting the build failed message
-	 * logged to the console.
-	 * Bug 42333.
-	 */
-//	public void testBuildFailedMessageDebug() throws CoreException {
-//		launchInDebug("bad");
-//		assertTrue("Incorrect number of messages logged for build. Should be 35. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 35);
-//		String message= ConsoleLineTracker.getMessage(33);
-//		assertTrue("Incorrect last message. Should start with Build Failed:. Message: " + message, message.startsWith("BUILD FAILED:"));
-//		}
-//  
-//	  /**
-//	 * Tests launching Ant and that the
-//	 * correct links are in the console doc
-//	 */
-//	public void testLinksDebug() throws CoreException {
-//		launchInDebug("echoing");
-//		int offset= 0; 
-//		try {
-//			offset= ConsoleLineTracker.getDocument().getLineOffset(2) + 15; //buildfile line 3
-//		} catch (BadLocationException e) {
-//			assertTrue("failed getting offset of line", false);
-//		}
-//		IConsoleHyperlink link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-//		assertNotNull("No hyperlink found at offset " + offset, link);
-//	
-//		try {
-//			offset= ConsoleLineTracker.getDocument().getLineOffset(33) + 10; //echo link
-//		} catch (BadLocationException e) {
-//			assertTrue("failed getting offset of line", false);
-//		}
-//		link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-//		assertNotNull("No hyperlink found at offset " + offset, link);
-//	}
-//
-//	/**
-//	 * Tests launching Ant and that the
-//	 * correct colors are in the console doc
-//	 */
-//	public void testColorDebug() throws BadLocationException, CoreException {
-//		launchInDebug("echoing");
-//		int offset= 0; 
-//		try {
-//			offset= ConsoleLineTracker.getDocument().getLineOffset(2) + 15; //buildfile line 3
-//		} catch (BadLocationException e) {
-//			assertTrue("failed getting offset of line", false);
-//		}
-//		Color color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-//		assertNotNull("No color found at " + offset, color);
-//		assertEquals(AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_INFO_COLOR), color);
-//		
-//		try {
-//			offset= ConsoleLineTracker.getDocument().getLineOffset(4) + 3; //debug info
-//		} catch (BadLocationException e) {
-//			assertTrue("failed getting offset of line", false);
-//		}
-//		color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-//		assertNotNull("No color found at " + offset, color);
-//		assertEquals(AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_DEBUG_COLOR), color);
-//		
-//		try {
-//			offset= ConsoleLineTracker.getDocument().getLineOffset(33) + 10; //echo line 33
-//		} catch (BadLocationException e) {
-//			assertTrue("failed getting offset of line", false);
-//		}
-//		color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-//		assertNotNull("No color found at " + offset, color);
-//		assertEquals(AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_WARNING_COLOR), color);
-//	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java b/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
deleted file mode 100644
index d19f6bf..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Tests/org/eclipse/ant/tests/ui/separateVM/SeparateVMTests.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.separateVM;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.ant.tests.ui.AbstractAntUIBuildTest;
-import org.eclipse.ant.tests.ui.testplugin.ConsoleLineTracker;
-import org.eclipse.ant.tests.ui.testplugin.ProjectHelper;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.swt.graphics.Color;
-
-public class SeparateVMTests extends AbstractAntUIBuildTest {
-		
-    public SeparateVMTests(String name) {
-        super(name);
-    }
-    
-	public static Test suite() {
-		return new TestSuite(SeparateVMTests.class);
-	}
-
-    /**
-     * Tests launching Ant in a separate vm and getting messages
-     * logged to the console.
-     */
-    public void testBuild() throws CoreException {
-      	launch("echoingSepVM");
-      	assertTrue("Incorrect number of messages logged for build. Should be 6. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 6);
-      	assertTrue("Incorrect last message. Should start with Total time:. Message: " + ConsoleLineTracker.getMessage(4), ConsoleLineTracker.getMessage(4).startsWith("Total time:"));
-    }
-    
-    /**
-     * Tests launching Ant in a separate vm and having an extra classpath entry designated to be availble.
-     */
-    public void testExtraClasspathEntries() throws CoreException {
-      	launch("extensionPointSepVM");
-      	assertTrue("Incorrect number of messages logged for build. Should be 8. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 8);
-      	assertTrue("Incorrect last message. Should start with Total time:. Message: " + ConsoleLineTracker.getMessage(6), ConsoleLineTracker.getMessage(6).startsWith("Total time:"));
-    }
-    
-    /**
-     * Tests launching Ant in a separate vm and having an extra classpath entry designated to be available.
-     */
-    public void testProperties() throws CoreException {
-      	launch("extensionPointSepVM");
-      	assertTrue("Incorrect number of messages logged for build. Should be 8. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 8);
-      	assertTrue("Incorrect last message. Should start with [echo] ${property.ui.testing. Message: " + ConsoleLineTracker.getMessage(3), ConsoleLineTracker.getMessage(3).trim().startsWith("[echo] ${property.ui.testing"));
-      	assertTrue("Incorrect last message. Should start with [echo] hey. Message: " + ConsoleLineTracker.getMessage(4), ConsoleLineTracker.getMessage(4).trim().startsWith("[echo] hey"));
-    }
-    
-    /**
-     * Tests launching Ant in a separate vm and having an extra classpath entry designated to be available.
-     */
-    public void testExtensionPointTask() throws CoreException {
-      	launch("extensionPointTaskSepVM");
-      	assertTrue("Incorrect number of messages logged for build. Should be 6. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 6);
-      	assertTrue("Incorrect message. Should start with [null] Testing Ant in Eclipse with a custom task2. Message: " + ConsoleLineTracker.getMessage(2), ConsoleLineTracker.getMessage(2).trim().startsWith("[null] Testing Ant in Eclipse with a custom task2"));
-    }
-    
-    /**
-     * Tests launching Ant in a separate vm and having an extra classpath entry designated to be available.
-     */
-    public void testExtensionPointType() throws CoreException {
-      	launch("extensionPointTypeSepVM");
-      	assertTrue("Incorrect number of messages logged for build. Should be 6. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 6);
-      	assertTrue("Incorrect message. Should start with [echo] Ensure that an extension point defined type. Message: " + ConsoleLineTracker.getMessage(2), ConsoleLineTracker.getMessage(2).trim().startsWith("[echo] Ensure that an extension point defined type"));
-    }
-    
-	/**
-	 * Tests launching Ant in a separate vm and that the
-	 * correct links are in the console doc
-	 */
-	public void testLinks() throws CoreException {
-		launch("echoingSepVM");
-		int offset= 15; //buildfile link
-		IConsoleHyperlink link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No hyperlink found at offset " + offset, link);
-		try {
-			offset= ConsoleLineTracker.getDocument().getLineOffset(2) + 10; //echo link
-		} catch (BadLocationException e) {
-			assertTrue("failed getting offset of line", false);
-		}
-		link= getHyperlink(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No hyperlink found at offset " + offset, link);
-	}
-	
-	/**
-	 * Tests launching Ant in a separate vm and that the
-	 * correct colors are in the console doc
-	 */
-	public void testColor() throws BadLocationException, CoreException {
-		launch("echoingSepVM");
-		int offset= 15; //buildfile
-		Color color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No color found at " + offset, color);
-		assertEquals(color, JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_INFO_COLOR));
-		try {
-			offset= ConsoleLineTracker.getDocument().getLineOffset(2) + 10; //echo link
-		} catch (BadLocationException e) {
-			assertTrue("failed getting offset of line", false);
-		}
-		color= getColorAtOffset(offset, ConsoleLineTracker.getDocument());
-		assertNotNull("No color found at " + offset, color);
-		assertEquals(color, JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_WARNING_COLOR));
-	}
-	
-	/**
-	 * Tests launching Ant in a separate vm and that the
-	 * correct working directory is set
-	 */
-	public void testWorkingDirectory() throws CoreException {
-		ILaunchConfiguration config = getLaunchConfiguration("echoingSepVM");
-		assertNotNull("Could not locate launch configuration for " + "echoingSepVM", config);
-		ILaunchConfigurationWorkingCopy copy= config.getWorkingCopy();
-		copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, getJavaProject().getProject().getLocation().toOSString());
-		copy.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, "Bug42984");
-		launchAndTerminate(copy, 20000);
-		ConsoleLineTracker.waitForConsole();
-		assertTrue("Incorrect number of messages logged for build. Should be 6. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 6);
-		assertTrue("Incorrect last message. Should end with " + ProjectHelper.PROJECT_NAME + ". Message: " + ConsoleLineTracker.getMessage(2), ConsoleLineTracker.getMessage(2).endsWith(ProjectHelper.PROJECT_NAME));
-	}
-	
-	 /**
-     * Tests launching Ant in a separate vm and getting messages
-     * logged to the console for project help.
-     */
-    public void testProjectHelp() throws CoreException {
-      	launch("echoingSepVM", "-p");
-      	assertTrue("Incorrect number of messages logged for build. Should be 14. Was " + ConsoleLineTracker.getNumberOfMessages(), ConsoleLineTracker.getNumberOfMessages() == 14);
-      	assertTrue("Incorrect last message. Should start with echo2:. Message: " + ConsoleLineTracker.getMessage(12), ConsoleLineTracker.getMessage(12).trim().startsWith("echo2"));
-    }
-}
\ 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/External Tools/org/eclipse/ant/tests/ui/externaltools/MigrationTests.java b/ant/org.eclipse.ant.tests.ui/External Tools/org/eclipse/ant/tests/ui/externaltools/MigrationTests.java
deleted file mode 100644
index 3bdfb6a..0000000
--- a/ant/org.eclipse.ant.tests.ui/External Tools/org/eclipse/ant/tests/ui/externaltools/MigrationTests.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.externaltools;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.RefreshTab;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-import org.eclipse.ui.externaltools.internal.registry.ExternalToolMigration;
-
-/**
- * Tests migration of Ant and External Tool configurations from old
- * formats to the current format.
- */
-public class MigrationTests extends TestCase {
-	
-	/**
-	 * Tests migration of arguments from an Eclipse 2.0 Ant buildfile
-	 * configuration to a current launch configuration.
-	 * 
-	 * @throws CoreException
-	 */
-	public void test20AntMigration() throws CoreException {
-		Map argumentMap= get20AntArgumentMap();
-		ILaunchConfigurationWorkingCopy config = ExternalToolMigration.configFromArgumentMap(argumentMap);
-		assertNotNull("Migration failed", config);
-		
-		assertEquals("Wrong configuration type", IAntLaunchConfigurationConstants.ID_ANT_BUILDER_LAUNCH_CONFIGURATION_TYPE, config.getType().getIdentifier());
-		assertEquals("ant tool", config.getName());
-		assertEquals("location", config.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""));
-		assertEquals("refresh scope", config.getAttribute(RefreshTab.ATTR_REFRESH_SCOPE, ""));
-		String[] targets= AntUtil.getTargetsFromConfig(config);
-		assertNotNull("No targets found", targets);
-		assertEquals("Wrong number of targets", 2, targets.length);
-		assertEquals("target1", targets[0]);
-		assertEquals("target2", targets[1]);
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, false));
-		assertEquals(true, config.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false));
-		assertEquals("build kinds", config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, ""));
-		assertEquals("arg  ", config.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""));
-		assertEquals("working dir", config.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""));
-	}
-	
-	/**
-	 * Returns a map of arguments for an Ant buildfile using
-	 * Eclipse 2.0 arguments.
-	 * 
-	 * @return a map of 2.0 arguments for an Ant buildfile.
-	 */
-	private Map get20AntArgumentMap() {
-		HashMap arguments= new HashMap();
-		arguments.put(ExternalToolMigration.TAG_VERSION, "2.0");
-		arguments.put(ExternalToolMigration.TAG_TOOL_TYPE, "org.eclipse.ui.externaltools.type.ant");
-		arguments.put(ExternalToolMigration.TAG_TOOL_NAME, "ant tool");
-		arguments.put(ExternalToolMigration.TAG_TOOL_LOCATION, "location");
-		arguments.put(ExternalToolMigration.TAG_TOOL_REFRESH, "refresh scope");
-		arguments.put(ExternalToolMigration.TAG_TOOL_ARGUMENTS, "arg ${ant_target:target1} ${ant_target:target2}");
-		arguments.put(ExternalToolMigration.TAG_TOOL_SHOW_LOG, "true");
-		arguments.put(ExternalToolMigration.TAG_TOOL_BLOCK, "false");
-		arguments.put(ExternalToolMigration.TAG_TOOL_BUILD_TYPES, "build kinds");
-		arguments.put(ExternalToolMigration.TAG_TOOL_DIRECTORY, "working dir");
-		return arguments;
-	}
-
-	/**
-	 * Tests migration of arguments from an Eclipse 2.0 Ant buildfile
-	 * configuration to a current launch configuration.
-	 * 
-	 * @throws CoreException
-	 */
-	public void test20ProgramMigration() throws CoreException {
-		Map argumentMap= get20ProgramArgumentMap();
-		ILaunchConfigurationWorkingCopy config = ExternalToolMigration.configFromArgumentMap(argumentMap);
-		assertEquals("Wrong configuration type", IExternalToolConstants.ID_PROGRAM_BUILDER_LAUNCH_CONFIGURATION_TYPE, config.getType().getIdentifier());
-		assertEquals("program tool", config.getName());
-		assertEquals("location", config.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""));
-		assertEquals("refresh scope", config.getAttribute(RefreshTab.ATTR_REFRESH_SCOPE, ""));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, false));
-		assertEquals(true, config.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false));
-		assertEquals("build kinds", config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, ""));
-		assertEquals("arg ${ant_target:target1} ${ant_target:target2}", config.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""));
-		assertEquals("working dir", config.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""));
-	}
-	
-	/**
-	 * Returns a map of arguments for executing a program
-	 * using Eclipse 2.0 arguments.
-	 * 
-	 * @return a map of 2.0 arguments for a program
-	 */
-	private Map get20ProgramArgumentMap() {
-		HashMap arguments= new HashMap();
-		arguments.put(ExternalToolMigration.TAG_VERSION, "2.0");
-		arguments.put(ExternalToolMigration.TAG_TOOL_TYPE, "org.eclipse.ui.externaltools.type.program");
-		arguments.put(ExternalToolMigration.TAG_TOOL_NAME, "program tool");
-		arguments.put(ExternalToolMigration.TAG_TOOL_LOCATION, "location");
-		arguments.put(ExternalToolMigration.TAG_TOOL_REFRESH, "refresh scope");
-		arguments.put(ExternalToolMigration.TAG_TOOL_ARGUMENTS, "arg ${ant_target:target1} ${ant_target:target2}");
-		arguments.put(ExternalToolMigration.TAG_TOOL_SHOW_LOG, "true");
-		arguments.put(ExternalToolMigration.TAG_TOOL_BLOCK, "false");
-		arguments.put(ExternalToolMigration.TAG_TOOL_BUILD_TYPES, "build kinds");
-		arguments.put(ExternalToolMigration.TAG_TOOL_DIRECTORY, "working dir");
-		return arguments;
-	}
-	
-	/**
-	 * Tests migration of arguments from an Eclipse 2.1 Ant buildfile
-	 * configuration to a current launch configuration.
-	 * 
-	 * @throws CoreException
-	 */
-	public void test21AntMigration() throws CoreException {
-		Map argumentMap= get21AntArgumentMap();
-		ILaunchConfigurationWorkingCopy config = ExternalToolMigration.configFromArgumentMap(argumentMap);
-		assertNotNull("Migration failed", config);
-		
-		assertEquals("Wrong config type", IAntLaunchConfigurationConstants.ID_ANT_BUILDER_LAUNCH_CONFIGURATION_TYPE, config.getType().getIdentifier());
-		assertEquals("ant config", config.getName());
-		assertEquals("location", config.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""));
-		assertEquals("working directory", config.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, false));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_SHOW_CONSOLE, false));
-		assertEquals(true, config.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_PROMPT_FOR_ARGUMENTS, false));
-		assertEquals("refresh scope", config.getAttribute(RefreshTab.ATTR_REFRESH_SCOPE, ""));
-		assertEquals(true, config.getAttribute(RefreshTab.ATTR_REFRESH_RECURSIVE, false));
-		assertEquals("build kinds", config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, ""));
-		assertEquals("arg1 arg2", config.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""));
-		String[] targets= AntUtil.getTargetsFromConfig(config);
-		assertEquals("Wrong number of targets", 2, targets.length);
-		assertEquals("target1", targets[0]);
-		assertEquals("target2", targets[1]);
-	}
-	
-	/**
-	 * Returns a map of arguments for executing an Ant
-	 * buildfile using Eclipse 2.1 arguments.
-	 * 
-	 * @return a map of 2.1 arguments for an Ant buildfile
-	 */
-	private Map get21AntArgumentMap() {
-		HashMap arguments= new HashMap();
-		arguments.put(ExternalToolMigration.TAG_VERSION, "2.1");
-		arguments.put(ExternalToolMigration.TAG_NAME, "ant config");
-		arguments.put(ExternalToolMigration.TAG_TYPE, ExternalToolMigration.TOOL_TYPE_ANT_BUILD);
-		arguments.put(ExternalToolMigration.TAG_LOCATION, "location");
-		arguments.put(ExternalToolMigration.TAG_WORK_DIR, "working directory");
-		arguments.put(ExternalToolMigration.TAG_CAPTURE_OUTPUT, "true");
-		arguments.put(ExternalToolMigration.TAG_SHOW_CONSOLE, "true");
-		arguments.put(ExternalToolMigration.TAG_SHOW_CONSOLE, "true");
-		arguments.put(ExternalToolMigration.TAG_RUN_BKGRND, "true");
-		arguments.put(ExternalToolMigration.TAG_PROMPT_ARGS, "true");
-		arguments.put(ExternalToolMigration.TAG_REFRESH_SCOPE, "refresh scope");
-		arguments.put(ExternalToolMigration.TAG_REFRESH_RECURSIVE, "true");
-		arguments.put(ExternalToolMigration.TAG_RUN_BUILD_KINDS, "build kinds");
-		arguments.put(ExternalToolMigration.TAG_ARGS, "arg1 arg2");
-		arguments.put(ExternalToolMigration.TAG_EXTRA_ATTR, ExternalToolMigration.RUN_TARGETS_ATTRIBUTE + "=target1,target2");
-		return arguments;
-	}
-	
-	/**
-	 * Tests migration of arguments from an Eclipse 2.1 program
-	 * configuration to a current launch configuration.
-	 * 
-	 * @throws CoreException
-	 */
-	public void test21ProgramMigration() throws CoreException {
-		Map argumentMap= get21ProgramArgumentMap();
-		ILaunchConfigurationWorkingCopy config = ExternalToolMigration.configFromArgumentMap(argumentMap);
-		assertNotNull("Migration failed", config);
-		
-		assertEquals("Wrong config type", IExternalToolConstants.ID_PROGRAM_BUILDER_LAUNCH_CONFIGURATION_TYPE, config.getType().getIdentifier());
-		assertEquals("program config", config.getName());
-		assertEquals("location", config.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""));
-		assertEquals("working directory", config.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, false));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_SHOW_CONSOLE, false));
-		assertEquals(true, config.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false));
-		assertEquals(true, config.getAttribute(IExternalToolConstants.ATTR_PROMPT_FOR_ARGUMENTS, false));
-		assertEquals("refresh scope", config.getAttribute(RefreshTab.ATTR_REFRESH_SCOPE, ""));
-		assertEquals(true, config.getAttribute(RefreshTab.ATTR_REFRESH_RECURSIVE, false));
-		assertEquals("build kinds", config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, ""));
-		assertEquals("arg1 arg2", config.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""));
-	}
-	
-	/**
-	 * Returns a map of arguments for executing a program
-	 * buildfile using Eclipse 2.1 arguments.
-	 * 
-	 * @return a map of 2.1 arguments for a program
-	 */
-	private Map get21ProgramArgumentMap() {
-		HashMap arguments= new HashMap();
-		arguments.put(ExternalToolMigration.TAG_VERSION, "2.1");
-		arguments.put(ExternalToolMigration.TAG_NAME, "program config");
-		arguments.put(ExternalToolMigration.TAG_TYPE, IExternalToolConstants.TOOL_TYPE_PROGRAM);
-		arguments.put(ExternalToolMigration.TAG_LOCATION, "location");
-		arguments.put(ExternalToolMigration.TAG_WORK_DIR, "working directory");
-		arguments.put(ExternalToolMigration.TAG_CAPTURE_OUTPUT, "true");
-		arguments.put(ExternalToolMigration.TAG_SHOW_CONSOLE, "true");
-		arguments.put(ExternalToolMigration.TAG_SHOW_CONSOLE, "true");
-		arguments.put(ExternalToolMigration.TAG_RUN_BKGRND, "true");
-		arguments.put(ExternalToolMigration.TAG_PROMPT_ARGS, "true");
-		arguments.put(ExternalToolMigration.TAG_REFRESH_SCOPE, "refresh scope");
-		arguments.put(ExternalToolMigration.TAG_REFRESH_RECURSIVE, "true");
-		arguments.put(ExternalToolMigration.TAG_RUN_BUILD_KINDS, "build kinds");
-		arguments.put(ExternalToolMigration.TAG_ARGS, "arg1 arg2");
-		return arguments;
-	}
-	
-}

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 2b6d76e..0000000
--- a/ant/org.eclipse.ant.tests.ui/build.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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/,\
-               lib/,\
-               lib/*.jar,\
-               *.jar
-               
-source.anttestsui.jar = test plugin/,\
-						Ant Editor Tests/,\
-						External Tools/,\
-						Ant Tests/,\
-                        buildfiles/
-						
-source.lib/antUITestsSupport.jar = test support/
-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/buildfiles/buildAntTestsSupportJAR.xml b/ant/org.eclipse.ant.tests.ui/buildfiles/buildAntTestsSupportJAR.xml
deleted file mode 100644
index e8956d0..0000000
--- a/ant/org.eclipse.ant.tests.ui/buildfiles/buildAntTestsSupportJAR.xml
+++ /dev/null

@@ -1,44 +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" depends="clean, lib/antUITestsSupport.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="version.suffix" value="_3.0.0"/>
-		<property name="ant_version.suffix" value="_1.6.1"/>
-		<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="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<target name="lib/antUITestsSupport.jar" depends="init" description= "Builds the support JAR">
-		<property name="destdir" value="${temp.folder}/lib/antUITestsSupport.jar.bin"/>
-		<delete dir="${temp.folder}/lib/antUITestsSupport.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/antUITestsSupport.jar.bin"/>
-		<!-- compile the source code -->
-		<javac target="1.1" destdir="${temp.folder}/lib/antUITestsSupport.jar.bin" failonerror="false" verbose="false" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" 
-			classpath="${basedir}/../org.eclipse.core.runtime/bin;
-			${eclipse.home}/plugins/org.eclipse.core.runtime${version.suffix}/runtime.jar;
-			${basedir}/../org.apache.ant/lib/ant.jar;
-			${eclipse.home}/plugins/org.apache.ant${ant_version.suffix}/lib/ant.jar;
-			${basedir}/bin;
-			${eclipse.home}/plugins/org.eclipse.ant.core${version.suffix}/antsupport.jar;
-			${basedir}/../org.eclipse.ant.core/bin">
-			<src path="test support/"/>
-		</javac>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar jarfile="${build.result.folder}/lib/antUITestsSupport.jar" basedir="${temp.folder}/lib/antUITestsSupport.jar.bin"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init">
-		<delete file="${build.result.folder}/lib/antUITestsSupport.jar"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/icons/ant.gif b/ant/org.eclipse.ant.tests.ui/icons/ant.gif
deleted file mode 100644
index 6da365c..0000000
--- a/ant/org.eclipse.ant.tests.ui/icons/ant.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.tests.ui/lib/.cvsignore b/ant/org.eclipse.ant.tests.ui/lib/.cvsignore
deleted file mode 100644
index 2b90898..0000000
--- a/ant/org.eclipse.ant.tests.ui/lib/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-antUITestsSupport.jar

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 cb5d656..0000000
--- a/ant/org.eclipse.ant.tests.ui/plugin.xml
+++ /dev/null

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ant.tests.ui"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.tests.ui.testplugin.AntUITestPlugin">
-   
-   <requires>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.apache.ant"/>
-	  <import plugin="org.junit"/>   
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.debug"/>
-      <import plugin="org.eclipse.update.core"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="org.eclipse.ant.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
- 
-<runtime>
-  <library name="anttestsui.jar" >
-     <export name = "*"/>
-  </library> 
-</runtime>
-
- <extension
-     point="org.eclipse.debug.ui.consoleLineTrackers">
-	  <consoleLineTracker
-	        class="org.eclipse.ant.tests.ui.testplugin.ConsoleLineTracker"
-	        processType="org.eclipse.ant.ui.antProcess"
-	        id="org.eclipse.ant.tests.ui.testplugin.ConsoleLineTracker">
-	  </consoleLineTracker>
-  </extension>
-  
-  <extension
-         point="org.eclipse.ant.core.extraClasspathEntries">
-      <extraClasspathEntry
-            library="lib/antUITestsSupport.jar"
-            eclipseRuntime="false">
-      </extraClasspathEntry>
-   </extension>
-   
-    <extension point="org.eclipse.ant.core.antTasks">
-	    <antTask 
-	    	name="coolUITask" 
-	    	class="org.eclipse.ant.tests.ui.support.tasks.AntTestTask2"
-	    	library="lib/antUITestsSupport.jar"
-	    	eclipseRuntime="false">
-	    </antTask>
-   </extension>
-
-	<extension point="org.eclipse.ant.core.antTypes">
-	    <antType 
-	    	name="coolUIType" 
-	    	class="org.eclipse.ant.tests.ui.support.types.AntTestPath"
-	    	library="lib/antUITestsSupport.jar"
-	    	eclipseRuntime="false">
-	    </antType>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ant.core.antProperties">
-      <antProperty
-            name="property.ui.testing"
-            value="true">
-      </antProperty>
-       <antProperty
-            name="property.ui.testing2"
-            value="hey"
-             eclipseRuntime="false">
-      </antProperty>
-   </extension>
-</plugin>

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java
deleted file mode 100644
index d84caff..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java
+++ /dev/null

@@ -1,344 +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.ui.testplugin;
-
-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.io.UnsupportedEncodingException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.outline.XMLCore;
-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.tests.ui.editor.support.TestLocationProvider;
-import org.eclipse.ant.tests.ui.editor.support.TestProblemRequestor;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-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.IProcess;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.views.console.ConsoleDocumentPartitioner;
-import org.eclipse.debug.internal.ui.views.console.HyperlinkPosition;
-import org.eclipse.debug.internal.ui.views.console.StreamPartition;
-import org.eclipse.debug.ui.console.IConsoleColorProvider;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public abstract class AbstractAntUITest extends TestCase {
-	private IDocument currentDocument;
-
-	public AbstractAntUITest(String name) {
-		super(name);
-	}
-		
-	protected File getBuildFile(String buildFileName) {
-		IFile file = getProject().getFolder("buildfiles").getFile(buildFileName);
-		assertTrue("Could not find build file named: " + buildFileName, file.exists());
-		return file.getLocation().toFile();
-	}
-	
-	/**
-	 * Returns the 'AntUITests' project.
-	 * 
-	 * @return the test project
-	 */
-	protected IProject getProject() {
-		return ResourcesPlugin.getWorkspace().getRoot().getProject(ProjectHelper.PROJECT_NAME);
-	}
-	
-	protected IDocument getDocument(String fileName) {
-		File file = getBuildFile(fileName);
-		InputStream in;
-		try {
-			in = new FileInputStream(file);
-		} catch (FileNotFoundException e) {
-			return null;
-		}
-		String initialContent= getStreamContentAsString(in);
-		return new Document(initialContent);
-	}
-
-	protected 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 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();
-	}
-		
-	protected AntModel getAntModel(String fileName) {
-		currentDocument= getDocument(fileName);
-		AntModel model= new AntModel(XMLCore.getDefault(), currentDocument, new TestProblemRequestor(), new TestLocationProvider(getBuildFile(fileName)));
-		model.reconcile(null);
-		return model;
-	}
-	
-	/**
-	 * @return
-	 */
-	public IDocument getCurrentDocument() {
-		return currentDocument;
-	}
-
-	/**
-	 * @param currentDocument
-	 */
-	public void setCurrentDocument(IDocument currentDocument) {
-		this.currentDocument = currentDocument;
-	}
-	
-	/**
-	 * Launches the Ant build with the buildfile name (no extension).
-	 * 
-	 * @param buildFileName the ant buildfile name
-	 */
-	protected void launch(String buildFileName) throws CoreException {
-		ILaunchConfiguration config = getLaunchConfiguration(buildFileName);
-		assertNotNull("Could not locate launch configuration for " + buildFileName, config);
-		launchAndTerminate(config, 20000);
-	}
-	
-	/**
-	 * Launches the Ant build with the buildfile name (no extension).
-	 * 
-	 * @param buildFileName the buildfile
-	 * @param arguments the ant arguments
-	 */
-	protected void launch(String buildFileName, String arguments) throws CoreException {
-		ILaunchConfiguration config = getLaunchConfiguration(buildFileName);
-		assertNotNull("Could not locate launch configuration for " + buildFileName, config);
-		ILaunchConfigurationWorkingCopy copy= config.getWorkingCopy();
-		copy.setAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, arguments);
-		launchAndTerminate(copy, 20000);
-	}
-	
-	/**
-	* Launches the Ant build in debug mode with the buildfile name (no extension).
-	* 
-	* @param mainTypeName the program to launch
-	* @return thread in which the first suspend event occurred
-	*/
-	protected void launchInDebug(String buildFileName) throws CoreException {
-		ILaunchConfiguration config = getLaunchConfiguration(buildFileName);
-		assertNotNull("Could not locate launch configuration for " + buildFileName, config);
-		ILaunchConfigurationWorkingCopy copy= config.getWorkingCopy();
-		copy.setAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, "-debug");
-		launchAndTerminate(copy, 10000);
-	}
-	
-	/**
-	 * Returns the launch configuration for the given buildfile
-	 * 
-	 * @param buildFileName buildfile to launch
-	 * @see ProjectCreationDecorator
-	 */
-	protected ILaunchConfiguration getLaunchConfiguration(String buildFileName) {
-		IFile file = getJavaProject().getProject().getFolder("launchConfigurations").getFile(buildFileName + ".launch");
-		ILaunchConfiguration config = getLaunchManager().getLaunchConfiguration(file);
-		assertTrue("Could not find launch configuration for " + buildFileName, config.exists());
-		return config;
-	}
-
-	/**
-	 * Returns the content of the specified file as <code>String</code>.
-	 */
-	protected 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;
-	}
-	
-	protected SAXParser getSAXParser() {
-		SAXParser parser = null;
-		try {
-			parser = SAXParserFactory.newInstance().newSAXParser();
-		} catch (ParserConfigurationException e) {
-			AntUIPlugin.log(e);
-		} catch (SAXException e) {
-			AntUIPlugin.log(e);
-		}
-		return parser;
-	}
-
-	
-	protected void parse(InputStream stream, SAXParser parser, DefaultHandler handler, File editedFile) {
-		InputSource inputSource= new InputSource(stream);
-		if (editedFile != null) {
-			//needed for resolving relative external entities
-			inputSource.setSystemId(editedFile.getAbsolutePath());
-		}
-
-		try {
-			parser.parse(inputSource, handler);
-		} catch (SAXException e) {
-		} catch (IOException e) {
-		}
-	}
-	
-	/**
-	 * Returns the launch manager
-	 * 
-	 * @return launch manager
-	 */
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Returns the 'AntUITests' project.
-	 * 
-	 * @return the test project
-	 */
-	protected IJavaProject getJavaProject() {
-		return JavaCore.create( getProject());
-	}
-	
-	protected void launchAndTerminate(ILaunchConfiguration config, int timeout) throws CoreException {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.TERMINATE, IProcess.class);
-		waiter.setTimeout(timeout);
-
-		Object terminatee = launchAndWait(config, waiter);		
-		assertNotNull("Program did not terminate.", terminatee);
-		assertTrue("terminatee is not an IProcess", terminatee instanceof IProcess);
-		IProcess process = (IProcess) terminatee;
-		assertTrue("process is not terminated", process.isTerminated());
-	}
-	
-	/**
-	 * Launches the given configuration and waits for an event. Returns the
-	 * source of the event. If the event is not received, the launch is
-	 * terminated and an exception is thrown.
-	 * 
-	 * @param configuration the configuration to launch
-	 * @param waiter the event waiter to use
-	 * @return Object the source of the event
-	 * @exception Exception if the event is never received.
-	 */
-	protected Object launchAndWait(ILaunchConfiguration configuration, DebugEventWaiter waiter) throws CoreException {
-		ILaunch launch = configuration.launch(ILaunchManager.RUN_MODE, null);
-		Object suspendee= waiter.waitForEvent();
-		if (suspendee == null) {
-			try {
-				launch.terminate();
-			} catch (CoreException e) {
-				e.printStackTrace();
-				fail("Program did not suspend, and unable to terminate launch.");
-			}
-		}
-		assertNotNull("Program did not suspend, launch terminated.", suspendee);
-		return suspendee;		
-	}
-	
-	protected IConsoleHyperlink getHyperlink(int offset, IDocument doc) {
-		if (offset >= 0 && doc != null) {
-			Position[] positions = null;
-			try {
-				positions = doc.getPositions(HyperlinkPosition.HYPER_LINK_CATEGORY);
-			} catch (BadPositionCategoryException ex) {
-				// no links have been added
-				return null;
-			}
-			for (int i = 0; i < positions.length; i++) {
-				Position position = positions[i];
-				if (offset >= position.getOffset() && offset <= (position.getOffset() + position.getLength())) {
-					return ((HyperlinkPosition)position).getHyperLink();
-				}
-			}
-		}
-		return null;
-	}
-	
-	protected Color getColorAtOffset(int offset, IDocument document) throws BadLocationException {
-		if (document != null) {
-			ConsoleDocumentPartitioner partitioner = (ConsoleDocumentPartitioner)document.getDocumentPartitioner();
-			if (partitioner != null) {
-				IConsoleColorProvider colorProvider = DebugUIPlugin.getDefault().getConsoleDocumentManager().getColorProvider(IAntLaunchConfigurationConstants.ID_ANT_PROCESS_TYPE);
-				ITypedRegion[] regions= partitioner.computePartitioning(offset, document.getLineInformationOfOffset(offset).getLength());
-				
-				for (int i = 0; i < regions.length; i++) {
-					StreamPartition partition = (StreamPartition)regions[i];
-					return colorProvider.getColor(partition.getStreamIdentifier());
-				}	
-			}
-		}
-		return null;
-	}
-}

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITestPlugin.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITestPlugin.java
deleted file mode 100644
index 41f1b1a..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITestPlugin.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.ant.tests.ui.testplugin;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-
-
-public class AntUITestPlugin extends AbstractUIPlugin {
-	
-	private static AntUITestPlugin deflt;
-	
-	public AntUITestPlugin() {
-		super();
-		deflt= this;
-	}
-	
-	public static AntUITestPlugin getDefault() {
-		return deflt;
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	public static void enableAutobuild(boolean enable) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= AntUITestPlugin.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			Bundle bundle = getDefault().getBundle();
-			URL installURL= new URL(bundle.getEntry("/"), 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.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITests.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITests.java
deleted file mode 100644
index a7006eb..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUITests.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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.ant.tests.ui.testplugin;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.tests.ui.BuildTests;
-import org.eclipse.ant.tests.ui.editor.AntEditorContentOutlineTests;
-import org.eclipse.ant.tests.ui.editor.CodeCompletionTest;
-import org.eclipse.ant.tests.ui.editor.TaskDescriptionProviderTest;
-import org.eclipse.ant.tests.ui.editor.formatter.XmlTagFormatterTest;
-import org.eclipse.ant.tests.ui.editor.formatter.FormattingPreferencesTest;
-import org.eclipse.ant.tests.ui.editor.formatter.XmlDocumentFormatterTest;
-import org.eclipse.ant.tests.ui.externaltools.MigrationTests;
-import org.eclipse.ant.tests.ui.separateVM.SeparateVMTests;
-
-/**
- * Test suite for the Ant UI
- */
-public class AntUITests extends TestSuite {
-
-    public static Test suite() {
-
-        TestSuite suite= new AntUITests();
-        suite.setName("Ant UI Unit Tests");
-		suite.addTest(new TestSuite(ProjectCreationDecorator.class));
-		suite.addTest(new TestSuite(BuildTests.class));
-		suite.addTest(new TestSuite(SeparateVMTests.class));
-        suite.addTest(new TestSuite(CodeCompletionTest.class));
-        suite.addTest(new TestSuite(TaskDescriptionProviderTest.class));
-        suite.addTest(new TestSuite(AntEditorContentOutlineTests.class));
-        suite.addTest(new TestSuite(MigrationTests.class));
-        suite.addTest(new TestSuite(FormattingPreferencesTest.class));
-        suite.addTest(new TestSuite(XmlDocumentFormatterTest.class));
-        suite.addTest(new TestSuite(XmlTagFormatterTest.class));
-        return suite;
-    }
-}

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ConsoleLineTracker.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ConsoleLineTracker.java
deleted file mode 100644
index fed66a9..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ConsoleLineTracker.java
+++ /dev/null

@@ -1,112 +0,0 @@
-package org.eclipse.ant.tests.ui.testplugin;
-
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.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 java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Simple console line tracker extension point that collects the lines
- * appended to the console. 
- */
-public class ConsoleLineTracker implements IConsoleLineTrackerExtension {
-	
-	private static IConsole console;
-	private static List lines= new ArrayList(); 
-	
-	private static boolean consoleClosed= false;
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-		console = null;
-		lines= new ArrayList();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public synchronized void init(IConsole c) {
-		ConsoleLineTracker.console= c;
-		lines= new ArrayList();
-		consoleClosed= false;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		lines.add(line);
-	}
-	
-	public static int getNumberOfMessages() {
-		return lines.size();
-	}
-	
-	public static String getMessage(int index) {
-		if (index < lines.size()){
-			IRegion lineRegion= (IRegion)lines.get(index);
-			try {
-				return console.getDocument().get(lineRegion.getOffset(), lineRegion.getLength());
-			} catch (BadLocationException e) {
-				return null;
-			}
-		}
-		return null;
-	}
-	
-	public static List getAllMessages() {
-		List all= new ArrayList(lines.size());
-		for (int i = 0; i < lines.size(); i++) {
-			IRegion lineRegion= (IRegion)lines.get(i);
-			try {
-				all.add(console.getDocument().get(lineRegion.getOffset(), lineRegion.getLength()));
-			} catch (BadLocationException e) {
-				continue;
-			}
-		}
-		return all;
-	}
-	
-	public static IDocument getDocument() {
-		return console.getDocument();
-	}
-	
-	public static void waitForConsole() {
-		if (consoleClosed) {
-			return;
-		}
-		try {
-			synchronized (lines) {
-				lines.wait(20000);
-			}
-		} catch (InterruptedException ie) {
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
-	 */
-	public void consoleClosed() {
-		consoleClosed= true;
-		
-		synchronized (lines) {
-			lines.notifyAll();
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugElementKindEventWaiter.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugElementKindEventWaiter.java
deleted file mode 100644
index e7ea27a..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugElementKindEventWaiter.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.tests.ui.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Waits for a type of event on a kind of element.  Compare this to SpecificDebugElementEventWaiter which is
- * used to wait for a type of event on a specific debug element object.
- */
-
-public class DebugElementKindEventWaiter extends DebugEventWaiter {
-	
-	protected Class fElementClass;
-	
-	public DebugElementKindEventWaiter(int eventKind, Class elementClass) {
-		super(eventKind);
-		fElementClass = elementClass;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		Object o = event.getSource();
-		return super.accept(event) && fElementClass.isInstance(o);
-	}
-
-}
-
-

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugEventWaiter.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugEventWaiter.java
deleted file mode 100644
index 130637e..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/DebugEventWaiter.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.ui.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-
-/**
- * The <code>DebugEventWaiter</code> is
- * to wait for a specific kind of debug event.
- * <p>
- * When a <code>DebugEventWaiter</code> is created, it
- * registers itself with the <code>DebugPlugin</code> as
- * an <code>IDebugEventSetListener</code>.
- * <p>
- * NOTE: <code>DebugEventWaiter</code> objects are intended for
- * one time use only!
- */
-public class DebugEventWaiter implements IDebugEventSetListener {
-	/**
-	 * The kind of event the waiter is waiting for
-	 */
-	protected int fEventType;
-
-	/**
-	 * The number of milliseconds the waiter will wait before timing out.
-	 */
-	protected long fTimeout;
-
-	/**
-	 * The <code>IDebugModelManager</code> this waiter is listening to.
-	 */
-	protected DebugPlugin fDebugPlugin;
-
-	/**
-	 * The <code>DebugEvent</code> received.
-	 */
-	protected DebugEvent fEvent;
-	
-	/**
-	 * The event set that was accepted
-	 */
-	protected DebugEvent[] fEventSet;
-
-	/**
-	 * The default timeout value if none is given (20000).
-	 */
-	public static final long DEFAULT_TIMEOUT= 15000;
-
-	/**
-	 * Creates a new <code>DebugEventWaiter</code> which
-	 * waits for events of a kind <code>eventType</code>.
-	 * The wait method will wait the default timeout value.
-	 */
-	public DebugEventWaiter(int eventType) {
-		fDebugPlugin= DebugPlugin.getDefault();
-		fEventType= eventType;
-		fTimeout= DEFAULT_TIMEOUT;
-
-		fDebugPlugin.addDebugEventListener(this);
-	}
-
-	/**
-	 * Answers true if the <code>DebugEvent</code> is acceptable.
-	 */
-	public boolean accept(DebugEvent event) {
-		return event.getKind() == fEventType && event.getDetail() != DebugEvent.EVALUATION_IMPLICIT;
-	}
-	/**
-	 * Answers the event name associated with the given flag.
-	 */
-	public String getEventName(int flag) {
-		switch (flag) {
-			case DebugEvent.CREATE :
-				return "Create";
-			case DebugEvent.TERMINATE :
-				return "Terminate";
-			case DebugEvent.RESUME :
-				return "Resume";
-			case DebugEvent.SUSPEND :
-				return "Suspend";
-			default :
-				return "UNKNOWN";
-		}
-	}
-
-	/**
-	 * Handles debug events.
-	 *
-	 * @see IDebugEventListener
-	 * @see #accept(DebugEvent)
-	 */
-	public synchronized void handleDebugEvents(DebugEvent[] events) {
-		//printReceived(events);
-		for (int i = 0; i < events.length; i++) {
-			if (accept(events[i])) {
-				fEvent= events[i];
-				fEventSet = events;
-				unregister();
-				notifyAll();
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Prints a message indicating which event was received.
-	 */
-	protected void printReceived(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			System.out.println(this +" got " + events[i]);
-		}
-	}
-
-	/**
-	 * Sets the number of milliseconds to wait for this callback
-	 */
-	public void setTimeout(long milliseconds) {
-		fTimeout= milliseconds;
-	}
-
-	/**
-	 * Unregisters this waiter as a listener
-	 */
-	public void unregister() {
-		fDebugPlugin.removeDebugEventListener(this);
-	}
-
-	/**
-	 * Returns the source of the accepted event, or <code>null</code>
-	 * if no event was accepted.
-	 */
-	public synchronized Object waitForEvent() {
-		if (fEvent == null) {
-			try {
-				wait(fTimeout);
-			} catch (InterruptedException ie) {
-				System.err.println("Interrupted waiting for event");
-			}
-		}
-		unregister();
-		if (fEvent == null)
-			return null;
-		return fEvent.getSource();
-	}
-
-	/**
-	 * Returns the accepted event, if any.
-	 */
-	public DebugEvent getEvent() {
-		return fEvent;
-	}
-	
-	/**
-	 * Returns the accepted event set, if any.
-	 */
-	public DebugEvent[] getEventSet() {
-		return fEventSet;
-	}	
-}
-

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectCreationDecorator.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectCreationDecorator.java
deleted file mode 100644
index 5fb4ffd..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectCreationDecorator.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.testplugin;
-
-
-import java.io.File;
-
-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-
-/**
- * Test to close the workbench, since debug tests do not run in the UI
- * thread.
- */
-public class ProjectCreationDecorator extends AbstractAntUITest {
-	
-	public ProjectCreationDecorator(String name) {
-		super(name);
-	}
-	
-	public void testProjectCreation() throws Exception {
-		try {
-			// delete any pre-existing project
-			IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject(ProjectHelper.PROJECT_NAME);
-			if (pro.exists()) {
-				pro.delete(true, true, null);
-			}
-			// create project and import buildfiles and support files
-			IProject project = ProjectHelper.createProject(ProjectHelper.PROJECT_NAME);
-			IFolder folder = ProjectHelper.addFolder(project, "buildfiles");
-			ProjectHelper.addFolder(project, "launchConfigurations");
-			File root = AntUITestPlugin.getDefault().getFileInPlugin(ProjectHelper.TEST_BUILDFILES_DIR);
-			ProjectHelper.importFilesFromDirectory(root, folder.getFullPath(), null);
-			
-			createLaunchConfiguration("echoing");
-			createLaunchConfiguration("build");
-			createLaunchConfiguration("bad");
-			createLaunchConfigurationForSeparateVM("echoingSepVM");
-			createLaunchConfigurationForSeparateVM("extensionPointSepVM");
-			createLaunchConfigurationForSeparateVM("extensionPointTaskSepVM");
-			createLaunchConfigurationForSeparateVM("extensionPointTypeSepVM");
-		} finally {
-			//do not show the Ant build failed error dialog
-			AntUIPlugin.getDefault().getPreferenceStore().setValue(IAntUIPreferenceConstants.ANT_ERROR_DIALOG, false);
-		}
-	}
-	
-	/**
-	 * Creates a shared launch configuration for launching Ant in a separate VM with the given
-	 * name.
-	 */
-	protected void createLaunchConfigurationForSeparateVM(String launchConfigName) throws Exception {
-		ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IAntLaunchConfigurationConstants.ID_ANT_LAUNCH_CONFIGURATION_TYPE);
-		ILaunchConfigurationWorkingCopy config = type.newInstance(getJavaProject().getProject().getFolder("launchConfigurations"), launchConfigName);
-		
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"); //$NON-NLS-1$
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-		config.setAttribute(IExternalToolConstants.ATTR_LOCATION, "${workspace_loc:/" + ProjectHelper.PROJECT_NAME + "/buildfiles/" + launchConfigName + ".xml}");
-		config.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, true);
-		config.setAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, IAntUIConstants.REMOTE_ANT_PROCESS_FACTORY_ID);
-		 
-		setVM(config);
-				
-		config.doSave();
-	}
-	
-	/**
-	 * Creates a shared launch configuration for launching Ant in a separate VM with the given
-	 * name.
-	 */
-	protected void createLaunchConfiguration(String launchConfigName) throws Exception {
-		ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IAntLaunchConfigurationConstants.ID_ANT_LAUNCH_CONFIGURATION_TYPE);
-		ILaunchConfigurationWorkingCopy config = type.newInstance(getJavaProject().getProject().getFolder("launchConfigurations"), launchConfigName);
-	
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-		config.setAttribute(IExternalToolConstants.ATTR_LOCATION, "${workspace_loc:/" + ProjectHelper.PROJECT_NAME + "/buildfiles/" + launchConfigName + ".xml}");
-		config.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, true);
-			
-		config.doSave();
-	}
-
-	private void setVM(ILaunchConfigurationWorkingCopy config) {
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		String vmName= vm.getName();
-		String vmTypeID= vm.getVMInstallType().getId();			
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, vmName);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, vmTypeID);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java
deleted file mode 100644
index b662503..0000000
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.testplugin;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * 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");
-	
-	public static final String PROJECT_NAME= "Ant UI Tests";
-	
-	/**
-	 * Creates a IProject.
-	 */	
-	public static IProject createProject(String projectName) 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);
-		}
-		
-		if (!project.hasNature(JavaCore.NATURE_ID)) {
-			addNatureToProject(project, JavaCore.NATURE_ID, null);
-		}
-		
-		return project;
-	}
-	
-	private static void addNatureToProject(IProject proj, String natureId, IProgressMonitor monitor) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures= description.getNatureIds();
-		String[] newNatures= new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length]= natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, monitor);
-	}
-	
-	/**
-	 * 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;
-		}	
-	}			
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask.java b/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask.java
deleted file mode 100644
index ce7b33a..0000000
--- a/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask2.java b/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask2.java
deleted file mode 100644
index 3ab7baf..0000000
--- a/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/tasks/AntTestTask2.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.support.tasks;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Echo;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Reference;
-
-
-public class AntTestTask2 extends Task {
-	
-	String fMessage= "Default";
-	Reference fRef= null;
-	
-	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 task2: " + fMessage);
-		echo.execute();
-	}
-	
-    public void setMessage(Cool attr) {
-        fMessage = attr.getValue();
-    }
-    
-    public void setReference(Reference ref) {
-        fRef= ref;
-    }
-	
-	/**
-     * Enumerated attribute with the values "cool", "chillin" and "awesome".
-     */
-    public static class Cool extends EnumeratedAttribute {
-        public String[] getValues() {
-            return new String[] {"cool", "chillin", "awesome"};
-        }
-    }
-}

diff --git a/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/types/AntTestPath.java b/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/types/AntTestPath.java
deleted file mode 100644
index 6022420..0000000
--- a/ant/org.eclipse.ant.tests.ui/test support/org/eclipse/ant/tests/ui/support/types/AntTestPath.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.ui/test.xml b/ant/org.eclipse.ant.tests.ui/test.xml
deleted file mode 100644
index e5dff43..0000000
--- a/ant/org.eclipse.ant.tests.ui/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.ui"/>
-  <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.ui.testplugin.AntUITests"/>
-    </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.ui/testbuildfiles/antUITestsSupport.jar b/ant/org.eclipse.ant.tests.ui/testbuildfiles/antUITestsSupport.jar
deleted file mode 100644
index 054eec8..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/antUITestsSupport.jar
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/bad.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/bad.xml
deleted file mode 100644
index f1c4d51..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/bad.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<project name="Echoing" default="echo1" basedir="..">
-
-	<target name="echo1">
-		<echo messge="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.ui/testbuildfiles/build.Cp1251.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.Cp1251.xml
deleted file mode 100644
index 6ff9539..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.Cp1251.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<project name="test" default="init" basedir=".">
-
-     <target name="init">
-          <!-- displays Hello in Russian -->
-          <echo message="Çäðàâñòâóéòå"/>
-     </target>
-
-
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.UTF8.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.UTF8.xml
deleted file mode 100644
index 08e4733..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.UTF8.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="test" default="init" basedir=".">
-
-     <target name="init">
-          <!-- displays Hello in Russian -->
-          <echo message="ÐÐ´ÑÐ°Ð²Ñ?ÑÐ²ÑÐ¹ÑÐµ"/>
-     </target>
-
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.xml
deleted file mode 100644
index 5cdd64d..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/build.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<project name="Echoing" 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.ui/testbuildfiles/buildtest1.properties b/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.properties
deleted file mode 100644
index c407ebe..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.properties
+++ /dev/null

@@ -1,2 +0,0 @@
-prop1=val1
-prop2 = val2

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.xml
deleted file mode 100644
index 9e042ff..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest1.xml
+++ /dev/null

@@ -1,21 +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"/>
-        <echo>${</echo>
-    </target>
-	<target name="pretest"></target>
-	<target name="test" depends="">
-		<echo>depends</echo>
-	</target>
-	<target name="test2"></target>
-	<target name="test3"></target>
-	<target name="testIf" if=""></target>
-	<target name="testUnless" unless="prop"></target>
-	<target name="testMoreDepends" depends="pretest, ">
-		<echo message="$"></echo>
-	</target>
-</project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest2.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/buildtest2.xml
deleted file mode 100644
index 0e3e5d3..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/customBoolean.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/customBoolean.xml
deleted file mode 100644
index 1dd37a0..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/customBoolean.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<project default="defaultTargetName">
-	<target name="defaultTargetName">
-		<eclipse.buildScript recursivegeneration=""/>
-	</target>
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/dependencytest.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/dependencytest.xml
deleted file mode 100644
index d26ba57..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/echoing.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/echoing.xml
deleted file mode 100644
index 5cdd64d..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/echoing.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<project name="Echoing" 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.ui/testbuildfiles/echoingSepVM.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/echoingSepVM.xml
deleted file mode 100644
index 97b4984..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/echoingSepVM.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<project name="Echoing" 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>
-	
-	<target name="Bug42984">
-		<echo message="user.dir: ${user.dir}"/>
-	</target>
-	
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/empty.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/empty.xml
+++ /dev/null


diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointSepVM.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointSepVM.xml
deleted file mode 100644
index 2735ed0..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointSepVM.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<project name="Extension point testing in separate VM"
-         default="Extension Points"
-         basedir="."
- >
-    <taskdef name="separateVMTask" classname="org.eclipse.ant.tests.ui.support.tasks.AntTestTask">
-    </taskdef>
-    <target name="Extension Points"
-            description= "Ensure that an extra classpath entry designated as not requiring the Eclipse runtime shows up in a separate VM build"
-     >
-        <separateVMTask/>
-         <echo>${property.ui.testing}</echo>
-        <echo>${property.ui.testing2}</echo>
-    </target>
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTaskSepVM.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTaskSepVM.xml
deleted file mode 100644
index c8e4945..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTaskSepVM.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<project name="Extension Point Task" default="Extension Point Task" basedir=".">
-	<target name="Extension Point Task" description= "Ensure that an extension point defined task is present">
-		<coolUITask message="cool" reference=""/>
-	</target>
-</project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTypeSepVM.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTypeSepVM.xml
deleted file mode 100644
index bba955e..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/extensionPointTypeSepVM.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<project name="Extension Point Type" default="Extension Point Type" basedir=".">
-
-	<coolUIType id="compile.classpath">
-      <fileset dir="lib">
-        <include name="**/*.jar"/>
-      </fileset>
-    </coolUIType>
-    
-	<target name="Extension Point Type" description= "Ensure that an extension point defined type is present">
-		<echo message="Ensure that an extension point defined type is present"/>
-	</target>
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_source01.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_source01.xml
deleted file mode 100644
index be1ff78..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_source01.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<project default="formatTest">
-
-<!-- = = = = = = --><!-- formatTest  --><!-- = = = = = = --><target name="formatTest" depends="init" description="--> test target one"><!-- hello world --><greeting /></target>
-
-<!-- - - - - - - -->
-<!-- init        -->
-<!-- - - - - - - -->
-<target name="init">
-  <property name="greeting" value="hi" />
-  <presetdef name="greeting"><echo>${greeting}</echo>
-</presetdef>
-   </target>
-
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target01.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target01.xml
deleted file mode 100644
index 3059228..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target01.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<project default="formatTest">
-
-   <!-- = = = = = = -->
-   <!-- formatTest  -->
-   <!-- = = = = = = -->
-   <target name="formatTest" depends="init" description="--> test target one">
-      <!-- hello world -->
-      <greeting />
-   </target>
-
-   <!-- - - - - - - -->
-   <!-- init        -->
-   <!-- - - - - - - -->
-   <target name="init">
-      <property name="greeting" value="hi" />
-      <presetdef name="greeting">
-         <echo>${greeting}</echo>
-      </presetdef>
-   </target>
-
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target02.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target02.xml
deleted file mode 100644
index 6a1ad9c..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target02.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<project default="formatTest">
-
-       <!-- = = = = = = -->
-       <!-- formatTest  -->
-       <!-- = = = = = = -->
-       <target name="formatTest" depends="init" description="--> test target one">
-              <!-- hello world -->
-              <greeting />
-       </target>
-
-       <!-- - - - - - - -->
-       <!-- init        -->
-       <!-- - - - - - - -->
-       <target name="init">
-              <property name="greeting" value="hi" />
-              <presetdef name="greeting">
-                     <echo>${greeting}</echo>
-              </presetdef>
-       </target>
-
-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target03.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target03.xml
deleted file mode 100644
index 89cd953..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/formatTest_target03.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<project default="formatTest">
-
-	<!-- = = = = = = -->
-	<!-- formatTest  -->
-	<!-- = = = = = = -->
-	<target name="formatTest" depends="init" description="--> test target one">
-		<!-- hello world -->
-		<greeting />
-	</target>
-
-	<!-- - - - - - - -->
-	<!-- init        -->
-	<!-- - - - - - - -->
-	<target name="init">
-		<property name="greeting" value="hi" />
-		<presetdef name="greeting">
-			<echo>${greeting}</echo>
-		</presetdef>
-	</target>
-
-</project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/macrodef.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/macrodef.xml
deleted file mode 100644
index 051f01b..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/macrodef.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<project default="type">
-
-	<macrodef name="eclipseMacro">
-		<attribute name="v" default="NOT SET" />
-		<attribute name="eclipse" default="yes" description="Testing Eclipse"/>
-		<element name="some-tasks" optional="yes" />
-		<sequential>
-			<echo>Eclipse!: @{v}</echo>
-		</sequential>
-	</macrodef>
-
-	<target name="type">
-		<eclipseMacro v="This is v">
-			
-		</eclipseMacro>
-	</target>
-
-</project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/mixed.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/mixed.xml
deleted file mode 100644
index 368edbb..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/mixed.xml
+++ /dev/null

@@ -1 +0,0 @@
-<project><target><sql driver="" password="" url="" userid=""></sql><concat></concat></target></project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/outline_select_test_build.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/outline_select_test_build.xml
deleted file mode 100644
index 7df0f5e..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/projectOnly.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/projectOnly.xml
deleted file mode 100644
index 35ece5b..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/refid.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/refid.xml
deleted file mode 100644
index 23eb56c..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/refid.xml
+++ /dev/null

@@ -1,13 +0,0 @@
-<project default="1">
-	<path id="project.class.path">
-		<pathelement location="lib/" />
-		<pathelement path="${java.class.path}/" />
-		<pathelement path="${additional.path}" />
-	</path>
-
-	<target name="1">
-		<path id="project.class.path2">
-			<path refid="project.class.path" />
-		</path>
-	</target>
-</project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/russianbuild.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/russianbuild.xml
deleted file mode 100644
index d853566..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/russianbuild.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<project name="test" default="init" 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/testbuildfiles/taskdef.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/taskdef.xml
deleted file mode 100644
index 4aa66a8..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/taskdef.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<project default="type">
-
-	<taskdef name="mine" classname="org.eclipse.ant.tests.ui.support.tasks.AntTestTask" classpath="antUITestsSupport.jar">
-	</taskdef>
-
-	<target name="type">
-
-	</target>
-
-</project>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/test1.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/test1.xml
deleted file mode 100644
index 6f60a32..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/test2.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/test2.xml
deleted file mode 100644
index 1ca8765..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/test3.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/test3.xml
deleted file mode 100644
index 674088e..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/test3.xml
+++ /dev/null

@@ -1,4 +0,0 @@
-<bla>
-  <blub>
-  </blub>
-</

diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/test4.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/test4.xml
deleted file mode 100644
index fd60f79..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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/testbuildfiles/test5.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/test5.xml
deleted file mode 100644
index c297d95..0000000
--- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/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.ui/.classpath b/ant/org.eclipse.ant.ui/.classpath
deleted file mode 100644
index 68f4ccf..0000000
--- a/ant/org.eclipse.ant.ui/.classpath
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="Ant Tools Support"/>
-	<classpathentry output="ant_runner_support_bin" kind="src" path="Ant Runner Support"/>
-	<classpathentry kind="src" path="Ant Editor"/>
-	<classpathentry kind="src" path="Remote Ant Support"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 df6c5d0..0000000
--- a/ant/org.eclipse.ant.ui/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-lib
-temp.folder
-antui.jar
-ant_runner_support_bin

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 e5086b1..0000000
--- a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<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.debug.core.ATTR_REFRESH_SCOPE" value="${resource:/org.eclipse.ant.ui}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
-</launchConfiguration>

diff --git a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch b/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch
deleted file mode 100644
index ae8ad8f..0000000
--- a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<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/Remote Ant Support/org&quot; type=&quot;2&quot;/&gt;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.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.debug.core.ATTR_REFRESH_SCOPE" value="${resource:/org.eclipse.ant.ui}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</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 2567d39..0000000
--- a/ant/org.eclipse.ant.ui/.project
+++ /dev/null

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.ui</name>
-	<comment></comment>
-	<projects>
-	</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>
-		<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 Remote Ant JAR.launch&quot;/&gt;
-</value>
-				</dictionary>
-			</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/TaskXMLFileMerger.java b/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java
deleted file mode 100644
index cfac853..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java
+++ /dev/null

@@ -1,336 +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.internal.ui.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.internal.ui.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("Did not find Task \"{0}\" in HTML XML file.", new String[]{tmpTaskName})); //$NON-NLS-1$
-			}
-		}
-		else {
-			System.out.println(MessageFormat.format("Did not find TaskName in TargetTaskNode: {0}", 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$
-//    	} 
-    }
-	
-	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 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.6.0.dtd b/ant/org.eclipse.ant.ui/Ant Editor/ant1.6.0.dtd
deleted file mode 100644
index 142a9bd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/ant1.6.0.dtd
+++ /dev/null

@@ -1,4964 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!ENTITY % boolean "(true|false|on|off|yes|no)">
-<!ENTITY % tasks "propertyfile | importtypelib | 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 | sync | p4delete | vssadd | javadoc | p4integrate | translate | signjar | cclock | chown | vajload | jarlib-available | WsdlToDotnet | buildnumber | jpcovmerge | ejbjar | war | rename | sequential | serverdeploy | property | subant | move | ildasm | copydir | cccheckin | ccunlock | wljspc | fixcrlf | sosget | pathconvert | record | p4sync | exec | ccmklabel | p4edit | manifest | maudit | antlr | netrexxc | jpcovreport | execon | ccmcheckout | ant | xmlvalidate | xslt | p4resolve | iplanet-ejbc | ccmcheckintask | gzip | native2ascii | ccrmtype | starteam | ear | input | presetdef | rmic | checksum | mail | loadfile | vsscheckout | stylebook | soscheckin | mimemail | stlabel | gunzip | concat | cab | touch | parallel | splash | antcall | ccmkbl | cccheckout | typedef | p4have | filter | xmlproperty | import | copy | jsharpc | symlink | antstructure | script | ccmcreatetask | rpm | delete | replace | mmetrics | attrib | waitfor | untar | loadproperties | available | echoproperties | chgrp | vajexport | bunzip2 | whichresource | copyfile | p4labelsync | vsscreate | macrodef | ejbc | unjar | vbc | wsdltodotnet | mkdir | condition | cvs | tempfile | junitreport | taskdef | echo | ccupdate | java | vsslabel | renameext | basename | javadoc2 | tar | vsscp | vajimport | p4fstat | setproxy | p4counter | wlstop | ilasm | soscheckout | apply | ccuncheckout | jarlib-resolve | jlink | cvstagdiff | javacc | chmod | pvcs | jarlib-manifest | jar | ccmklbtype | sound | scriptdef | defaultexcludes | mparse | blgenclient | uptodate | jjdoc | genkey | javah | ccmreconfigure | fail | unzip | javac | p4add | jpcoverage | soslabel | depend | vssget | deltree | ddcreator | image">
-<!ENTITY % types "patternset | assertions | propertyset | filterset | libfileset | filterreader | scriptfilter | extension | fileset | dirset | filelist | filterchain | path | classfileset | selector | xmlcatalog | description | mapper | zipfileset | substitution | extensionSet | regexp">
-
-<!ELEMENT project (target | %tasks; | %types;)*>
-<!ATTLIST project
-          name    CDATA #IMPLIED
-          default CDATA #IMPLIED
-          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
-          description CDATA #IMPLIED
-          excludesfile 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 assertions (disable | enable)*>
-<!ATTLIST assertions
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          enablesystemassertions %boolean; #IMPLIED>
-
-<!ELEMENT disable EMPTY>
-<!ATTLIST disable
-          id ID #IMPLIED
-          package CDATA #IMPLIED
-          class CDATA #IMPLIED>
-
-<!ELEMENT enable EMPTY>
-<!ATTLIST enable
-          id ID #IMPLIED
-          package CDATA #IMPLIED
-          class CDATA #IMPLIED>
-
-<!ELEMENT propertyset (propertyref | propertyset | mapper)*>
-<!ATTLIST propertyset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          dynamic %boolean; #IMPLIED>
-
-<!ELEMENT propertyref EMPTY>
-<!ATTLIST propertyref
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          builtin (all | system | commandline) #IMPLIED
-          regex CDATA #IMPLIED
-          prefix CDATA #IMPLIED>
-
-<!ELEMENT mapper (classpath)*>
-<!ATTLIST mapper
-          id ID #IMPLIED
-          classpath CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          type (identity | flatten | glob | merge | regexp | package | unpackage) #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          classname CDATA #IMPLIED
-          from CDATA #IMPLIED
-          to CDATA #IMPLIED>
-
-<!ELEMENT classpath (fileset | dirset | extdirs | existing | 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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST fileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 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 param EMPTY>
-<!ATTLIST param
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          type CDATA #IMPLIED
-          value CDATA #IMPLIED>
-
-<!ELEMENT present (mapper)*>
-<!ATTLIST present
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          targetdir CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          present (srconly | both) #IMPLIED>
-
-<!ELEMENT none (custom | none | present | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | date | and | depth)*>
-<!ATTLIST none
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT not (custom | none | present | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | date | and | depth)*>
-<!ATTLIST not
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT type EMPTY>
-<!ATTLIST type
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          type (file | dir) #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT modified (param)*>
-<!ATTLIST modified
-          id ID #IMPLIED
-          comparator (equal | rule) #IMPLIED
-          seldirs %boolean; #IMPLIED
-          cache (propertyfile) #IMPLIED
-          algorithm (hashvalue | digest) #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          update %boolean; #IMPLIED>
-
-<!ELEMENT or (custom | none | present | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | date | and | depth)*>
-<!ATTLIST or
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT contains EMPTY>
-<!ATTLIST contains
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          ignorewhitespace %boolean; #IMPLIED
-          text CDATA #IMPLIED>
-
-<!ELEMENT depend (mapper)*>
-<!ATTLIST depend
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          targetdir CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          granularity CDATA #IMPLIED>
-
-<!ELEMENT different (mapper)*>
-<!ATTLIST different
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          targetdir CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          ignorefiletimes %boolean; #IMPLIED
-          granularity 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 majority (custom | none | present | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | date | and | depth)*>
-<!ATTLIST majority
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          allowtie %boolean; #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT containsregexp EMPTY>
-<!ATTLIST containsregexp
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          expression CDATA #IMPLIED>
-
-<!ELEMENT filename EMPTY>
-<!ATTLIST filename
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          name CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          negate %boolean; #IMPLIED>
-
-<!ELEMENT selector (custom | none | present | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | date | and | depth)*>
-<!ATTLIST selector
-          id ID #IMPLIED
-          error CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          unless CDATA #IMPLIED
-          if CDATA #IMPLIED>
-
-<!ELEMENT date EMPTY>
-<!ATTLIST date
-          id ID #IMPLIED
-          when (before | after | equal) #IMPLIED
-          error CDATA #IMPLIED
-          millis CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          checkdirs %boolean; #IMPLIED
-          granularity CDATA #IMPLIED
-          datetime CDATA #IMPLIED>
-
-<!ELEMENT and (custom | none | present | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | date | and | depth)*>
-<!ATTLIST and
-          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 dirset (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST dirset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 extdirs (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST extdirs
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT existing (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST existing
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT filelist EMPTY>
-<!ATTLIST filelist
-          id ID #IMPLIED
-          dir CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          files CDATA #IMPLIED>
-
-<!ELEMENT pathelement EMPTY>
-<!ATTLIST pathelement
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT path (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST path
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path 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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST libfileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          urlbase CDATA #IMPLIED
-          includeimpl %boolean; #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          includeurl %boolean; #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes 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 scriptfilter (#PCDATA)>
-<!ATTLIST scriptfilter
-          id ID #IMPLIED
-          byline %boolean; #IMPLIED
-          token CDATA #IMPLIED
-          src CDATA #IMPLIED
-          language 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 (headfilter | classconstants | linecontains | filterreader | replaceregex | replacetokens | escapeunicode | ignoreblank | tailfilter | tabstospaces | prefixlines | expandproperties | striplinebreaks | trim | striplinecomments | replacestring | tokenfilter | stripjavacomments | containsregex | deletecharacters | linecontainsregexp)*>
-<!ATTLIST filterchain
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT headfilter EMPTY>
-<!ATTLIST headfilter
-          id ID #IMPLIED
-          lines CDATA #IMPLIED
-          skip CDATA #IMPLIED>
-
-<!ELEMENT classconstants EMPTY>
-<!ATTLIST classconstants
-          id ID #IMPLIED>
-
-<!ELEMENT linecontains (contains)*>
-<!ATTLIST linecontains
-          id ID #IMPLIED>
-
-<!ELEMENT replaceregex EMPTY>
-<!ATTLIST replaceregex
-          id ID #IMPLIED
-          flags CDATA #IMPLIED
-          byline %boolean; #IMPLIED
-          replace CDATA #IMPLIED
-          pattern CDATA #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 escapeunicode EMPTY>
-<!ATTLIST escapeunicode
-          id ID #IMPLIED>
-
-<!ELEMENT ignoreblank EMPTY>
-<!ATTLIST ignoreblank
-          id ID #IMPLIED
-          byline %boolean; #IMPLIED>
-
-<!ELEMENT tailfilter EMPTY>
-<!ATTLIST tailfilter
-          id ID #IMPLIED
-          lines CDATA #IMPLIED
-          skip CDATA #IMPLIED>
-
-<!ELEMENT tabstospaces EMPTY>
-<!ATTLIST tabstospaces
-          id ID #IMPLIED
-          tablength CDATA #IMPLIED>
-
-<!ELEMENT prefixlines EMPTY>
-<!ATTLIST prefixlines
-          id ID #IMPLIED
-          prefix CDATA #IMPLIED>
-
-<!ELEMENT expandproperties EMPTY>
-<!ATTLIST expandproperties
-          id ID #IMPLIED>
-
-<!ELEMENT striplinebreaks EMPTY>
-<!ATTLIST striplinebreaks
-          id ID #IMPLIED
-          linebreaks CDATA #IMPLIED>
-
-<!ELEMENT trim EMPTY>
-<!ATTLIST trim
-          id ID #IMPLIED
-          byline %boolean; #IMPLIED>
-
-<!ELEMENT striplinecomments (comment)*>
-<!ATTLIST striplinecomments
-          id ID #IMPLIED>
-
-<!ELEMENT comment EMPTY>
-<!ATTLIST comment
-          id ID #IMPLIED
-          value CDATA #IMPLIED>
-
-<!ELEMENT replacestring EMPTY>
-<!ATTLIST replacestring
-          id ID #IMPLIED
-          byline %boolean; #IMPLIED
-          from CDATA #IMPLIED
-          to CDATA #IMPLIED>
-
-<!ELEMENT tokenfilter (containsstring | linetokenizer | trim | stringtokenizer | replaceregex | replacestring | ignoreblank | deletecharacters | containsregex | filetokenizer)*>
-<!ATTLIST tokenfilter
-          id ID #IMPLIED
-          delimoutput CDATA #IMPLIED>
-
-<!ELEMENT containsstring EMPTY>
-<!ATTLIST containsstring
-          id ID #IMPLIED
-          contains CDATA #IMPLIED>
-
-<!ELEMENT linetokenizer EMPTY>
-<!ATTLIST linetokenizer
-          id ID #IMPLIED
-          includedelims %boolean; #IMPLIED>
-
-<!ELEMENT stringtokenizer EMPTY>
-<!ATTLIST stringtokenizer
-          id ID #IMPLIED
-          suppressdelims %boolean; #IMPLIED
-          includedelims %boolean; #IMPLIED
-          delimsaretokens %boolean; #IMPLIED
-          delims CDATA #IMPLIED>
-
-<!ELEMENT deletecharacters EMPTY>
-<!ATTLIST deletecharacters
-          id ID #IMPLIED
-          chars CDATA #IMPLIED>
-
-<!ELEMENT containsregex EMPTY>
-<!ATTLIST containsregex
-          id ID #IMPLIED
-          flags CDATA #IMPLIED
-          byline %boolean; #IMPLIED
-          replace CDATA #IMPLIED
-          pattern CDATA #IMPLIED>
-
-<!ELEMENT filetokenizer EMPTY>
-<!ATTLIST filetokenizer
-          id ID #IMPLIED>
-
-<!ELEMENT stripjavacomments EMPTY>
-<!ATTLIST stripjavacomments
-          id ID #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 classfileset (patternset | exclude | include | custom | rootfileset | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | root | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST classfileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          rootclass CDATA #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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST rootfileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 xmlcatalog (entity | classpath | catalogpath | dtd | xmlcatalog)*>
-<!ATTLIST xmlcatalog
-          id ID #IMPLIED
-          catalogpathref IDREF #IMPLIED
-          classpath CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT entity EMPTY>
-<!ATTLIST entity
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          base CDATA #IMPLIED
-          publicid CDATA #IMPLIED>
-
-<!ELEMENT catalogpath (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST catalogpath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT dtd EMPTY>
-<!ATTLIST dtd
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          base CDATA #IMPLIED
-          publicid CDATA #IMPLIED>
-
-<!ELEMENT description (#PCDATA)>
-<!ATTLIST description
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT zipfileset (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST zipfileset
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          filemode CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          fullpath CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          dirmode 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 importtypelib EMPTY>
-<!ATTLIST importtypelib
-          id ID #IMPLIED
-          unsafe %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          usesysarray %boolean; #IMPLIED
-          namespace CDATA #IMPLIED
-          description CDATA #IMPLIED
-          extraoptions CDATA #IMPLIED
-          srcfile CDATA #IMPLIED
-          destfile CDATA #IMPLIED>
-
-<!ELEMENT vsscheckin EMPTY>
-<!ATTLIST vsscheckin
-          id ID #IMPLIED
-          ssdir CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          autoresponse CDATA #IMPLIED
-          vsspath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          serverpath CDATA #IMPLIED
-          writable %boolean; #IMPLIED
-          login CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          localpath CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT sql (#PCDATA | fileset | classpath | transaction)*>
-<!ATTLIST sql
-          id ID #IMPLIED
-          onerror (continue | stop | abort) #IMPLIED
-          userid CDATA #IMPLIED
-          password 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
-          escapeprocessing %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          caching %boolean; #IMPLIED
-          keepformat %boolean; #IMPLIED
-          delimiter CDATA #IMPLIED>
-
-<!ELEMENT transaction (#PCDATA)>
-<!ATTLIST transaction
-          id ID #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT cvspass EMPTY>
-<!ATTLIST cvspass
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          password 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
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT csc (patternset | exclude | include | custom | present | none | resource | define | not | type | modified | reference | src | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST csc
-          id ID #IMPLIED
-          excludes CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          destfile CDATA #IMPLIED
-          win32icon CDATA #IMPLIED
-          definitions CDATA #IMPLIED
-          referencefiles CDATA #IMPLIED
-          fullpaths %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          outputfile CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          mainclass CDATA #IMPLIED
-          utf8output %boolean; #IMPLIED
-          useresponsefile %boolean; #IMPLIED
-          failonerror %boolean; #IMPLIED
-          destdir CDATA #IMPLIED
-          debug %boolean; #IMPLIED
-          includedefaultreferences %boolean; #IMPLIED
-          warnlevel CDATA #IMPLIED
-          win32res CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          extraoptions CDATA #IMPLIED
-          incremental %boolean; #IMPLIED
-          noconfig %boolean; #IMPLIED
-          includesfile CDATA #IMPLIED
-          references CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          srcdir CDATA #IMPLIED
-          optimize %boolean; #IMPLIED
-          additionalmodules CDATA #IMPLIED
-          docfile CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          unsafe %boolean; #IMPLIED
-          filealign CDATA #IMPLIED
-          targettype (exe | library | module | winexe) #IMPLIED>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          file CDATA #IMPLIED
-          public %boolean; #IMPLIED
-          embed %boolean; #IMPLIED>
-
-<!ELEMENT define EMPTY>
-<!ATTLIST define
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          unless CDATA #IMPLIED
-          if CDATA #IMPLIED>
-
-<!ELEMENT reference (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST reference
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 src (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST src
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 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
-          args CDATA #IMPLIED
-          policy CDATA #IMPLIED
-          properties CDATA #IMPLIED
-          home CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          password CDATA #IMPLIED
-          jvmargs CDATA #IMPLIED>
-
-<!ELEMENT wlclasspath (fileset | dirset | extdirs | existing | 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
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          desc CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED
-          lock CDATA #IMPLIED>
-
-<!ELEMENT p4revert EMPTY>
-<!ATTLIST p4revert
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          revertonlyunchanged %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          change CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT replaceregexp (fileset | substitution | regexp)*>
-<!ATTLIST replaceregexp
-          id ID #IMPLIED
-          flags CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          match CDATA #IMPLIED
-          byline CDATA #IMPLIED
-          replace CDATA #IMPLIED
-          file CDATA #IMPLIED
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED>
-
-<!ELEMENT get EMPTY>
-<!ATTLIST get
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          ignoreerrors %boolean; #IMPLIED
-          username CDATA #IMPLIED
-          usetimestamp %boolean; #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
-          outputfile CDATA #IMPLIED
-          static %boolean; #IMPLIED
-          javacchome CDATA #IMPLIED
-          nodeprefix CDATA #IMPLIED
-          nodefactory %boolean; #IMPLIED
-          multi %boolean; #IMPLIED
-          visitor %boolean; #IMPLIED
-          target CDATA #IMPLIED
-          nodeusesparser %boolean; #IMPLIED
-          visitorexception CDATA #IMPLIED
-          nodescopehook %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          nodepackage CDATA #IMPLIED>
-
-<!ELEMENT sleep EMPTY>
-<!ATTLIST sleep
-          id ID #IMPLIED
-          hours CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          milliseconds CDATA #IMPLIED
-          minutes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          seconds CDATA #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 | present | none | not | type | targetfileset | srcfileset | modified | or | contains | depend | different | size | majority | containsregexp | 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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST targetfileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST srcfileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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
-          description CDATA #IMPLIED
-          files CDATA #IMPLIED>
-
-<!ELEMENT targetfilelist EMPTY>
-<!ATTLIST targetfilelist
-          id ID #IMPLIED
-          dir CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          files CDATA #IMPLIED>
-
-<!ELEMENT zip (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | fileset | different | size | majority | containsregexp | filename | selector | includesfile | zipgroupfileset | zipfileset | date | excludesfile | depth | and)*>
-<!ATTLIST zip
-          id ID #IMPLIED
-          whenempty (fail | skip | create) #IMPLIED
-          keepcompression %boolean; #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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST zipgroupfileset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 patch EMPTY>
-<!ATTLIST patch
-          id ID #IMPLIED
-          strip CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          destfile CDATA #IMPLIED
-          quiet %boolean; #IMPLIED
-          originalfile CDATA #IMPLIED
-          patchfile CDATA #IMPLIED
-          reverse %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          backups %boolean; #IMPLIED
-          ignorewhitespace %boolean; #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT jspc (patternset | exclude | include | custom | present | none | not | type | compilerclasspath | modified | or | contains | depend | classpath | different | size | majority | containsregexp | 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
-          compilerclasspath 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
-          description CDATA #IMPLIED
-          webxml CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          srcdir CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          uriroot CDATA #IMPLIED
-          webinc CDATA #IMPLIED>
-
-<!ELEMENT compilerclasspath (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST compilerclasspath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT webapp EMPTY>
-<!ATTLIST webapp
-          id ID #IMPLIED
-          basedir CDATA #IMPLIED>
-
-<!ELEMENT style (patternset | exclude | include | custom | present | none | not | type | factory | modified | param | or | contains | depend | classpath | different | size | majority | containsregexp | filename | xmlcatalog | selector | includesfile | outputproperty | 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
-          followsymlinks %boolean; #IMPLIED
-          extension CDATA #IMPLIED
-          in CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          reloadstylesheet %boolean; #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          out CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          style CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED>
-
-<!ELEMENT factory (attribute)*>
-<!ATTLIST factory
-          id ID #IMPLIED
-          name CDATA #IMPLIED>
-
-<!ELEMENT attribute EMPTY>
-<!ATTLIST attribute
-          id ID #IMPLIED>
-
-<!ELEMENT outputproperty EMPTY>
-<!ATTLIST outputproperty
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          value CDATA #IMPLIED>
-
-<!ELEMENT test (classpath | sysproperty | bootclasspath | env | syspropertyset | permissions | jvmarg | arg | assertions | testlet)*>
-<!ATTLIST test
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          jvmargs CDATA #IMPLIED
-          fork %boolean; #IMPLIED
-          args CDATA #IMPLIED
-          maxmemory CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          jar CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          forceshowtrace %boolean; #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          jvm CDATA #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          showsuccess %boolean; #IMPLIED
-          jvmversion CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          showbanner CDATA #IMPLIED
-          newenvironment %boolean; #IMPLIED
-          classname CDATA #IMPLIED
-          showtrace %boolean; #IMPLIED>
-
-<!ELEMENT sysproperty EMPTY>
-<!ATTLIST sysproperty
-          id ID #IMPLIED
-          key CDATA #IMPLIED
-          file CDATA #IMPLIED
-          value CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT bootclasspath (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST bootclasspath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT env EMPTY>
-<!ATTLIST env
-          id ID #IMPLIED
-          key CDATA #IMPLIED
-          file CDATA #IMPLIED
-          value CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT syspropertyset (propertyref | propertyset | mapper)*>
-<!ATTLIST syspropertyset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          dynamic %boolean; #IMPLIED>
-
-<!ELEMENT permissions (grant | revoke)*>
-<!ATTLIST permissions
-          id ID #IMPLIED>
-
-<!ELEMENT grant EMPTY>
-<!ATTLIST grant
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          class CDATA #IMPLIED
-          actions CDATA #IMPLIED>
-
-<!ELEMENT revoke EMPTY>
-<!ATTLIST revoke
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          class CDATA #IMPLIED
-          actions CDATA #IMPLIED>
-
-<!ELEMENT jvmarg EMPTY>
-<!ATTLIST jvmarg
-          id ID #IMPLIED
-          line CDATA #IMPLIED
-          file CDATA #IMPLIED
-          pathref IDREF #IMPLIED
-          value CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT arg EMPTY>
-<!ATTLIST arg
-          id ID #IMPLIED
-          line CDATA #IMPLIED
-          file CDATA #IMPLIED
-          pathref IDREF #IMPLIED
-          value CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT testlet (#PCDATA)>
-<!ATTLIST testlet
-          id ID #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
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          encoding 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
-          taskname CDATA #IMPLIED
-          tolabel CDATA #IMPLIED
-          dateformat CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT icontract (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | classpath | different | size | majority | containsregexp | 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
-          followsymlinks %boolean; #IMPLIED
-          builddir CDATA #IMPLIED
-          updateicontrol %boolean; #IMPLIED
-          classpath CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          pre %boolean; #IMPLIED
-          controlfile CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          invariant %boolean; #IMPLIED
-          post %boolean; #IMPLIED
-          includesfile CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          srcdir CDATA #IMPLIED
-          failthrowable CDATA #IMPLIED
-          verbosity CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          repbuilddir CDATA #IMPLIED
-          targets CDATA #IMPLIED>
-
-<!ELEMENT cvschangelog (fileset | user)*>
-<!ATTLIST cvschangelog
-          id ID #IMPLIED
-          end CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          dir 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
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          change CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT ccmcheckin (fileset)*>
-<!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
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT bzip2 EMPTY>
-<!ATTLIST bzip2
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          zipfile CDATA #IMPLIED
-          description CDATA #IMPLIED
-          src CDATA #IMPLIED
-          destfile CDATA #IMPLIED>
-
-<!ELEMENT sync (fileset)*>
-<!ATTLIST sync
-          id ID #IMPLIED
-          verbose %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          todir CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          includeemptydirs %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT p4delete EMPTY>
-<!ATTLIST p4delete
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          change CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT vssadd EMPTY>
-<!ATTLIST vssadd
-          id ID #IMPLIED
-          ssdir CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          autoresponse CDATA #IMPLIED
-          vsspath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          serverpath CDATA #IMPLIED
-          writable %boolean; #IMPLIED
-          login CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          localpath CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT javadoc (taglet | doclet | package | arg | link | doctitle | bottom | group | packageset | fileset | classpath | sourcepath | footer | source | bootclasspath | header | excludepackage | 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
-          noqualifier CDATA #IMPLIED
-          public %boolean; #IMPLIED
-          author %boolean; #IMPLIED
-          footer CDATA #IMPLIED
-          docletpath CDATA #IMPLIED
-          package %boolean; #IMPLIED
-          useexternalfile %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          sourcepathref IDREF #IMPLIED
-          protected %boolean; #IMPLIED
-          breakiterator %boolean; #IMPLIED
-          nonavbar %boolean; #IMPLIED
-          maxmemory CDATA #IMPLIED
-          group CDATA #IMPLIED
-          source CDATA #IMPLIED
-          linkoffline CDATA #IMPLIED
-          additionalparam CDATA #IMPLIED
-          linksource %boolean; #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 taglet (path)*>
-<!ATTLIST taglet
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          pathref IDREF #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT doclet (path | param)*>
-<!ATTLIST doclet
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          pathref IDREF #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT package EMPTY>
-<!ATTLIST package
-          id ID #IMPLIED
-          name CDATA #IMPLIED>
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-          id ID #IMPLIED
-          href CDATA #IMPLIED
-          offline %boolean; #IMPLIED
-          packagelistloc CDATA #IMPLIED>
-
-<!ELEMENT doctitle (#PCDATA)>
-<!ATTLIST doctitle
-          id ID #IMPLIED>
-
-<!ELEMENT bottom (#PCDATA)>
-<!ATTLIST bottom
-          id ID #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 packageset (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST packageset
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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 | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST sourcepath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT footer (#PCDATA)>
-<!ATTLIST footer
-          id ID #IMPLIED>
-
-<!ELEMENT source EMPTY>
-<!ATTLIST source
-          id ID #IMPLIED
-          file CDATA #IMPLIED>
-
-<!ELEMENT header (#PCDATA)>
-<!ATTLIST header
-          id ID #IMPLIED>
-
-<!ELEMENT excludepackage EMPTY>
-<!ATTLIST excludepackage
-          id ID #IMPLIED
-          name CDATA #IMPLIED>
-
-<!ELEMENT tag (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST tag
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          name CDATA #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          enabled %boolean; #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          scope CDATA #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT p4integrate EMPTY>
-<!ATTLIST p4integrate
-          id ID #IMPLIED
-          branch CDATA #IMPLIED
-          leavetargetrevision %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED
-          forceintegrate %boolean; #IMPLIED
-          client CDATA #IMPLIED
-          enablebaselessmerges %boolean; #IMPLIED
-          fromfile CDATA #IMPLIED
-          reversebranchmappings %boolean; #IMPLIED
-          port CDATA #IMPLIED
-          change CDATA #IMPLIED
-          simulationmode %boolean; #IMPLIED
-          propagatesourcefiletype %boolean; #IMPLIED
-          view CDATA #IMPLIED
-          nocopynewtargetfiles %boolean; #IMPLIED
-          tofile CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          restoredeletedrevisions %boolean; #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED>
-
-<!ELEMENT translate (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | fileset | different | size | majority | containsregexp | 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
-          jar CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          keypass CDATA #IMPLIED
-          maxmemory CDATA #IMPLIED
-          alias CDATA #IMPLIED
-          sectionsonly %boolean; #IMPLIED
-          keystore CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          sigfile CDATA #IMPLIED
-          description CDATA #IMPLIED
-          internalsf %boolean; #IMPLIED
-          storetype CDATA #IMPLIED
-          signedjar CDATA #IMPLIED>
-
-<!ELEMENT cclock EMPTY>
-<!ATTLIST cclock
-          id ID #IMPLIED
-          replace %boolean; #IMPLIED
-          pname CDATA #IMPLIED
-          viewpath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          objselect CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          nusers CDATA #IMPLIED
-          obsolete %boolean; #IMPLIED>
-
-<!ELEMENT chown (arg | fileset | dirset | env | filelist | targetfile | srcfile | mapper)*>
-<!ATTLIST chown
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          owner CDATA #IMPLIED
-          skipemptyfilesets %boolean; #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          type (file | dir | both) #IMPLIED
-          command CDATA #IMPLIED
-          maxparallel CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          os CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          addsourcefile %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          forwardslash %boolean; #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          resolveexecutable %boolean; #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 targetfile EMPTY>
-<!ATTLIST targetfile
-          id ID #IMPLIED>
-
-<!ELEMENT srcfile EMPTY>
-<!ATTLIST srcfile
-          id ID #IMPLIED>
-
-<!ELEMENT vajload (vajproject)*>
-<!ATTLIST vajload
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          remote CDATA #IMPLIED
-          haltonerror %boolean; #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
-          destfile CDATA #IMPLIED
-          server %boolean; #IMPLIED
-          namespace CDATA #IMPLIED
-          language CDATA #IMPLIED
-          extraoptions CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #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
-          description CDATA #IMPLIED
-          tofile CDATA #IMPLIED
-          home CDATA #IMPLIED>
-
-<!ELEMENT ejbjar (patternset | exclude | include | custom | weblogictoplink | present | none | jboss | not | borland | weblogic | type | modified | iplanet | or | jonas | contains | depend | support | classpath | different | size | majority | websphere | containsregexp | 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
-          cmpversion (1.0 | 2.0) #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 | sysproperty | wlclasspath)*>
-<!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
-          noejbc %boolean; #IMPLIED
-          toplinkdescriptor CDATA #IMPLIED
-          genericjarsuffix CDATA #IMPLIED>
-
-<!ELEMENT jboss (classpath)*>
-<!ATTLIST jboss
-          id ID #IMPLIED
-          destdir CDATA #IMPLIED
-          genericjarsuffix CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          suffix 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
-          java2iiopparams CDATA #IMPLIED
-          version CDATA #IMPLIED
-          basdtd CDATA #IMPLIED
-          verify %boolean; #IMPLIED
-          suffix CDATA #IMPLIED
-          generateclient %boolean; #IMPLIED>
-
-<!ELEMENT weblogic (classpath | sysproperty | wlclasspath)*>
-<!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
-          classpath CDATA #IMPLIED
-          keepgenerated %boolean; #IMPLIED
-          debug %boolean; #IMPLIED
-          suffix CDATA #IMPLIED
-          iashome CDATA #IMPLIED>
-
-<!ELEMENT jonas (classpath)*>
-<!ATTLIST jonas
-          id ID #IMPLIED
-          jonasroot CDATA #IMPLIED
-          keepgeneric %boolean; #IMPLIED
-          additionalargs CDATA #IMPLIED
-          javac CDATA #IMPLIED
-          destdir CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          orb CDATA #IMPLIED
-          jarsuffix CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          genericjarsuffix CDATA #IMPLIED
-          nogenic %boolean; #IMPLIED
-          rmicopts CDATA #IMPLIED
-          javacopts CDATA #IMPLIED
-          novalidation %boolean; #IMPLIED
-          keepgenerated %boolean; #IMPLIED
-          nocompil %boolean; #IMPLIED
-          secpropag %boolean; #IMPLIED>
-
-<!ELEMENT support (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST support
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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
-          rmicoptions CDATA #IMPLIED
-          noinform %boolean; #IMPLIED
-          rebuild %boolean; #IMPLIED
-          suffix CDATA #IMPLIED
-          quiet %boolean; #IMPLIED
-          dbschema CDATA #IMPLIED
-          destdir CDATA #IMPLIED
-          ejbdeploy %boolean; #IMPLIED
-          use35 %boolean; #IMPLIED
-          tempdir CDATA #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
-          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 | extdirs | existing | 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 | present | none | not | manifest | type | metainf | modified | or | contains | depend | lib | fileset | different | size | majority | containsregexp | filename | selector | includesfile | zipgroupfileset | zipfileset | classes | date | excludesfile | webinf | depth | and)*>
-<!ATTLIST war
-          id ID #IMPLIED
-          keepcompression %boolean; #IMPLIED
-          whenempty (fail | skip | create) #IMPLIED
-          duplicate (add | preserve | fail) #IMPLIED
-          excludes CDATA #IMPLIED
-          basedir CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          manifest CDATA #IMPLIED
-          jarfile CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          index %boolean; #IMPLIED
-          update %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          destfile CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          webxml CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          compress %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          manifestencoding CDATA #IMPLIED
-          filesonly %boolean; #IMPLIED
-          warfile CDATA #IMPLIED
-          file CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          filesetmanifest (skip | merge | mergewithoutmain) #IMPLIED
-          zipfile CDATA #IMPLIED>
-
-<!ELEMENT manifest (attribute | section)*>
-<!ATTLIST manifest
-          id ID #IMPLIED>
-
-<!ELEMENT section (attribute)*>
-<!ATTLIST section
-          id ID #IMPLIED
-          name CDATA #IMPLIED>
-
-<!ELEMENT metainf (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST metainf
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          filemode CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          fullpath CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          dirmode CDATA #IMPLIED>
-
-<!ELEMENT lib (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST lib
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          filemode CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          fullpath CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          dirmode CDATA #IMPLIED>
-
-<!ELEMENT classes (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST classes
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          filemode CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          fullpath CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          dirmode CDATA #IMPLIED>
-
-<!ELEMENT webinf (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST webinf
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          filemode CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          fullpath CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          dirmode CDATA #IMPLIED>
-
-<!ELEMENT rename EMPTY>
-<!ATTLIST rename
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dest 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 | classpath | jvmarg)*>
-<!ATTLIST generic
-          id ID #IMPLIED
-          classpath CDATA #IMPLIED
-          password CDATA #IMPLIED
-          server CDATA #IMPLIED
-          classname CDATA #IMPLIED
-          username CDATA #IMPLIED>
-
-<!ELEMENT property (classpath)*>
-<!ATTLIST property
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          url CDATA #IMPLIED
-          name CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          file CDATA #IMPLIED
-          resource CDATA #IMPLIED
-          environment CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          taskname CDATA #IMPLIED
-          value CDATA #IMPLIED
-          location CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT subant (reference | fileset | buildpathelement | dirset | buildpath | propertyset | filelist | property)*>
-<!ATTLIST subant
-          id ID #IMPLIED
-          genericantfile CDATA #IMPLIED
-          output CDATA #IMPLIED
-          inheritall %boolean; #IMPLIED
-          inheritrefs %boolean; #IMPLIED
-          antfile CDATA #IMPLIED
-          buildpathref IDREF #IMPLIED
-          target CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          buildpath CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT buildpathelement EMPTY>
-<!ATTLIST buildpathelement
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT buildpath (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST buildpath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT move (filterchain | fileset | filterset | mapper)*>
-<!ATTLIST move
-          id ID #IMPLIED
-          flatten %boolean; #IMPLIED
-          tofile CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          todir CDATA #IMPLIED
-          file CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          includeemptydirs %boolean; #IMPLIED
-          overwrite %boolean; #IMPLIED
-          enablemultiplemappings %boolean; #IMPLIED
-          outputencoding CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          preservelastmodified %boolean; #IMPLIED
-          filtering %boolean; #IMPLIED>
-
-<!ELEMENT ildasm EMPTY>
-<!ATTLIST ildasm
-          id ID #IMPLIED
-          assembler %boolean; #IMPLIED
-          encoding (ascii | utf8 | unicode) #IMPLIED
-          executable CDATA #IMPLIED
-          progressbar %boolean; #IMPLIED
-          linenumbers %boolean; #IMPLIED
-          rawexceptionhandling %boolean; #IMPLIED
-          showsource %boolean; #IMPLIED
-          metadata %boolean; #IMPLIED
-          destfile CDATA #IMPLIED
-          srcfile CDATA #IMPLIED
-          bytes %boolean; #IMPLIED
-          resourcedir CDATA #IMPLIED
-          quoteallnames %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          header %boolean; #IMPLIED
-          visibility CDATA #IMPLIED
-          sourcefile CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          item CDATA #IMPLIED>
-
-<!ELEMENT copydir (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | 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
-          description CDATA #IMPLIED
-          forceoverwrite %boolean; #IMPLIED
-          excludesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile 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
-          objselect CDATA #IMPLIED
-          identical %boolean; #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          keepcopy %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          commentfile CDATA #IMPLIED>
-
-<!ELEMENT ccunlock EMPTY>
-<!ATTLIST ccunlock
-          id ID #IMPLIED
-          objselect CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          pname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          viewpath CDATA #IMPLIED
-          comment CDATA #IMPLIED>
-
-<!ELEMENT wljspc (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | classpath | different | size | majority | containsregexp | 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
-          dest CDATA #IMPLIED
-          package CDATA #IMPLIED
-          description CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT fixcrlf (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | 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 | mac | unix | dos) #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
-          soshome CDATA #IMPLIED
-          file CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          vssserverpath CDATA #IMPLIED
-          username CDATA #IMPLIED
-          sosserverpath CDATA #IMPLIED
-          projectpath CDATA #IMPLIED
-          version CDATA #IMPLIED
-          nocompress %boolean; #IMPLIED
-          nocache %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED
-          localpath CDATA #IMPLIED
-          soscmd CDATA #IMPLIED
-          password CDATA #IMPLIED>
-
-<!ELEMENT pathconvert (path | map)*>
-<!ATTLIST pathconvert
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          pathsep CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          dirsep CDATA #IMPLIED
-          setonempty %boolean; #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
-          taskname CDATA #IMPLIED
-          name CDATA #IMPLIED
-          loglevel (error | warn | info | verbose | debug) #IMPLIED
-          description CDATA #IMPLIED
-          emacsmode %boolean; #IMPLIED
-          action (start | stop) #IMPLIED>
-
-<!ELEMENT p4sync EMPTY>
-<!ATTLIST p4sync
-          id ID #IMPLIED
-          force CDATA #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT exec (arg | env)*>
-<!ATTLIST exec
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          command CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          os CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          resolveexecutable %boolean; #IMPLIED
-          failonerror %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          newenvironment %boolean; #IMPLIED
-          vmlauncher %boolean; #IMPLIED>
-
-<!ELEMENT ccmklabel EMPTY>
-<!ATTLIST ccmklabel
-          id ID #IMPLIED
-          recurse %boolean; #IMPLIED
-          replace %boolean; #IMPLIED
-          viewpath CDATA #IMPLIED
-          typename CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          version CDATA #IMPLIED
-          objselect CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          vob CDATA #IMPLIED
-          description CDATA #IMPLIED
-          commentfile CDATA #IMPLIED>
-
-<!ELEMENT p4edit EMPTY>
-<!ATTLIST p4edit
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          change CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT maudit (fileset | jvmarg | classpath | rulespath | searchpath | sourcepath)*>
-<!ATTLIST maudit
-          id ID #IMPLIED
-          tofile CDATA #IMPLIED
-          exit %boolean; #IMPLIED
-          offsets %boolean; #IMPLIED
-          quiet %boolean; #IMPLIED
-          unused %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          maxmemory CDATA #IMPLIED
-          fix %boolean; #IMPLIED
-          metamatahome CDATA #IMPLIED
-          list %boolean; #IMPLIED
-          home CDATA #IMPLIED
-          fullsemanticize %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT rulespath (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST rulespath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT searchpath (fileset | dirset | extdirs | existing | 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 | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | 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
-          followsymlinks %boolean; #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          format %boolean; #IMPLIED
-          explicit %boolean; #IMPLIED
-          includesfile CDATA #IMPLIED
-          suppressprivatepropertynotused %boolean; #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
-          tofile CDATA #IMPLIED
-          filters 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 coveragepath (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST coveragepath
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT execon (arg | fileset | dirset | env | filelist | targetfile | srcfile | mapper)*>
-<!ATTLIST execon
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          skipemptyfilesets %boolean; #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          command CDATA #IMPLIED
-          type (file | dir | both) #IMPLIED
-          maxparallel CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          os CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          addsourcefile %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          forwardslash %boolean; #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          resolveexecutable %boolean; #IMPLIED
-          failonerror %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          newenvironment %boolean; #IMPLIED
-          vmlauncher %boolean; #IMPLIED
-          relative %boolean; #IMPLIED
-          parallel %boolean; #IMPLIED>
-
-<!ELEMENT ccmcheckout (fileset)*>
-<!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 | propertyset | property)*>
-<!ATTLIST ant
-          id ID #IMPLIED
-          output CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          inheritall %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          inheritrefs %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          antfile CDATA #IMPLIED
-          target CDATA #IMPLIED>
-
-<!ELEMENT xmlvalidate (fileset | classpath | attribute | 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 | present | none | not | type | factory | modified | param | or | contains | depend | classpath | different | size | majority | containsregexp | filename | xmlcatalog | selector | includesfile | outputproperty | 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
-          followsymlinks %boolean; #IMPLIED
-          extension CDATA #IMPLIED
-          in CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          reloadstylesheet %boolean; #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          out CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          style CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED>
-
-<!ELEMENT p4resolve EMPTY>
-<!ATTLIST p4resolve
-          id ID #IMPLIED
-          forcetextmode %boolean; #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          markersforall %boolean; #IMPLIED
-          simulationmode %boolean; #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED
-          resolvemode CDATA #IMPLIED
-          redoall %boolean; #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 (fileset)*>
-<!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
-          destfile CDATA #IMPLIED>
-
-<!ELEMENT native2ascii (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | mapper | date | excludesfile | depth | and)*>
-<!ATTLIST native2ascii
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          ext CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          reverse %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          dest CDATA #IMPLIED
-          description CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT ccrmtype EMPTY>
-<!ATTLIST ccrmtype
-          id ID #IMPLIED
-          viewpath CDATA #IMPLIED
-          typename CDATA #IMPLIED
-          rmall %boolean; #IMPLIED
-          comment CDATA #IMPLIED
-          ignore %boolean; #IMPLIED
-          typekind CDATA #IMPLIED
-          objselect CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          vob CDATA #IMPLIED
-          description CDATA #IMPLIED
-          commentfile 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
-          description CDATA #IMPLIED
-          password CDATA #IMPLIED
-          serverport CDATA #IMPLIED
-          foldername CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT ear (patternset | exclude | include | custom | present | none | not | manifest | type | metainf | modified | or | contains | depend | fileset | different | size | majority | containsregexp | archives | filename | selector | includesfile | zipgroupfileset | zipfileset | date | excludesfile | depth | and)*>
-<!ATTLIST ear
-          id ID #IMPLIED
-          keepcompression %boolean; #IMPLIED
-          whenempty (fail | skip | create) #IMPLIED
-          duplicate (add | preserve | fail) #IMPLIED
-          excludes CDATA #IMPLIED
-          basedir CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          manifest CDATA #IMPLIED
-          jarfile CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          index %boolean; #IMPLIED
-          update %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          destfile CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          earfile CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          appxml CDATA #IMPLIED
-          compress %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          manifestencoding CDATA #IMPLIED
-          filesonly %boolean; #IMPLIED
-          file CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          filesetmanifest (skip | merge | mergewithoutmain) #IMPLIED
-          zipfile CDATA #IMPLIED>
-
-<!ELEMENT archives (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST archives
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          filemode CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          fullpath CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          dirmode CDATA #IMPLIED>
-
-<!ELEMENT input (#PCDATA)>
-<!ATTLIST input
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          addproperty CDATA #IMPLIED
-          description CDATA #IMPLIED
-          defaultvalue CDATA #IMPLIED
-          validargs CDATA #IMPLIED
-          message CDATA #IMPLIED>
-
-<!ELEMENT presetdef (%tasks;)*>
-<!ATTLIST presetdef
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          name CDATA #IMPLIED
-          description CDATA #IMPLIED
-          uri CDATA #IMPLIED>
-
-<!ELEMENT rmic (patternset | exclude | include | custom | present | none | extdirs | not | type | modified | or | contains | depend | classpath | different | size | majority | containsregexp | filename | selector | includesfile | compilerarg | date | excludesfile | depth | and)*>
-<!ATTLIST rmic
-          id ID #IMPLIED
-          verify %boolean; #IMPLIED
-          excludes CDATA #IMPLIED
-          iiop %boolean; #IMPLIED
-          idlopts CDATA #IMPLIED
-          extdirs CDATA #IMPLIED
-          sourcebase CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          base CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          includeantruntime %boolean; #IMPLIED
-          includejavaruntime %boolean; #IMPLIED
-          classpath CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          debug %boolean; #IMPLIED
-          compiler CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          idl %boolean; #IMPLIED
-          iiopopts CDATA #IMPLIED
-          classname CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          filtering %boolean; #IMPLIED
-          stubversion CDATA #IMPLIED>
-
-<!ELEMENT compilerarg EMPTY>
-<!ATTLIST compilerarg
-          id ID #IMPLIED
-          line CDATA #IMPLIED
-          implementation CDATA #IMPLIED
-          file CDATA #IMPLIED
-          compiler CDATA #IMPLIED
-          pathref IDREF #IMPLIED
-          value CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT checksum (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | fileset | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST checksum
-          id ID #IMPLIED
-          excludes CDATA #IMPLIED
-          fileext CDATA #IMPLIED
-          totalproperty CDATA #IMPLIED
-          property CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          readbuffersize CDATA #IMPLIED
-          verifyproperty CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          todir CDATA #IMPLIED
-          algorithm CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          file CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          provider CDATA #IMPLIED
-          forceoverwrite %boolean; #IMPLIED>
-
-<!ELEMENT mail (fileset | bcc | message | replyto | cc | to | from)*>
-<!ATTLIST mail
-          id ID #IMPLIED
-          cclist CDATA #IMPLIED
-          messagefile CDATA #IMPLIED
-          password CDATA #IMPLIED
-          encoding (auto | mime | uu | plain) #IMPLIED
-          charset CDATA #IMPLIED
-          files CDATA #IMPLIED
-          subject CDATA #IMPLIED
-          message CDATA #IMPLIED
-          ssl %boolean; #IMPLIED
-          tolist CDATA #IMPLIED
-          mailport CDATA #IMPLIED
-          messagemimetype CDATA #IMPLIED
-          bcclist CDATA #IMPLIED
-          from CDATA #IMPLIED
-          description CDATA #IMPLIED
-          replyto CDATA #IMPLIED
-          mailhost CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          includefilenames %boolean; #IMPLIED
-          user 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
-          charset CDATA #IMPLIED>
-
-<!ELEMENT replyto EMPTY>
-<!ATTLIST replyto
-          id ID #IMPLIED
-          address CDATA #IMPLIED
-          name 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
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          property CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          srcfile CDATA #IMPLIED>
-
-<!ELEMENT vsscheckout EMPTY>
-<!ATTLIST vsscheckout
-          id ID #IMPLIED
-          ssdir CDATA #IMPLIED
-          date CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          autoresponse CDATA #IMPLIED
-          vsspath CDATA #IMPLIED
-          getlocalcopy %boolean; #IMPLIED
-          version CDATA #IMPLIED
-          serverpath CDATA #IMPLIED
-          login CDATA #IMPLIED
-          filetimestamp (current | modified | updated) #IMPLIED
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          localpath CDATA #IMPLIED
-          writablefiles (replace | skip | fail) #IMPLIED>
-
-<!ELEMENT stylebook (classpath | sysproperty | bootclasspath | syspropertyset | env | permissions | jvmarg | arg | assertions)*>
-<!ATTLIST stylebook
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          jvmargs CDATA #IMPLIED
-          loaderconfig CDATA #IMPLIED
-          fork %boolean; #IMPLIED
-          args CDATA #IMPLIED
-          maxmemory CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          jar CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          targetdirectory CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          jvm CDATA #IMPLIED
-          skindirectory CDATA #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          book CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          jvmversion CDATA #IMPLIED
-          outputproperty 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
-          soshome CDATA #IMPLIED
-          file CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          vssserverpath CDATA #IMPLIED
-          username CDATA #IMPLIED
-          sosserverpath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          projectpath CDATA #IMPLIED
-          nocache %boolean; #IMPLIED
-          nocompress %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          localpath CDATA #IMPLIED
-          soscmd CDATA #IMPLIED
-          password CDATA #IMPLIED>
-
-<!ELEMENT mimemail (fileset | bcc | message | replyto | cc | to | from)*>
-<!ATTLIST mimemail
-          id ID #IMPLIED
-          cclist CDATA #IMPLIED
-          messagefile CDATA #IMPLIED
-          password CDATA #IMPLIED
-          encoding (auto | mime | uu | plain) #IMPLIED
-          charset CDATA #IMPLIED
-          files CDATA #IMPLIED
-          subject CDATA #IMPLIED
-          message CDATA #IMPLIED
-          ssl %boolean; #IMPLIED
-          tolist CDATA #IMPLIED
-          mailport CDATA #IMPLIED
-          messagemimetype CDATA #IMPLIED
-          bcclist CDATA #IMPLIED
-          from CDATA #IMPLIED
-          description CDATA #IMPLIED
-          replyto CDATA #IMPLIED
-          mailhost CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          includefilenames %boolean; #IMPLIED
-          user 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
-          revisionlabel %boolean; #IMPLIED
-          servername CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          serverport CDATA #IMPLIED
-          description CDATA #IMPLIED
-          password CDATA #IMPLIED
-          buildlabel %boolean; #IMPLIED>
-
-<!ELEMENT gunzip EMPTY>
-<!ATTLIST gunzip
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          description CDATA #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT concat (#PCDATA | filterchain | fileset | filelist | path | footer | header)*>
-<!ATTLIST concat
-          id ID #IMPLIED
-          force %boolean; #IMPLIED
-          encoding CDATA #IMPLIED
-          append %boolean; #IMPLIED
-          destfile CDATA #IMPLIED
-          eol (asis | cr | lf | crlf | mac | unix | dos) #IMPLIED
-          outputencoding CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          fixlastline %boolean; #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT cab (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | fileset | different | size | majority | containsregexp | 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
-          excludesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          options 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; | daemons)*>
-<!ATTLIST parallel
-          id ID #IMPLIED
-          pollinterval CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          threadsperprocessor CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          threadcount CDATA #IMPLIED
-          failonany %boolean; #IMPLIED>
-
-<!ELEMENT daemons (%tasks;)*>
-<!ATTLIST daemons
-          id ID #IMPLIED>
-
-<!ELEMENT splash EMPTY>
-<!ATTLIST splash
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          user CDATA #IMPLIED
-          proxy CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          imageurl CDATA #IMPLIED
-          description CDATA #IMPLIED
-          password CDATA #IMPLIED
-          showduration CDATA #IMPLIED
-          useproxy %boolean; #IMPLIED>
-
-<!ELEMENT antcall (reference | propertyset | param)*>
-<!ATTLIST antcall
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          inheritall %boolean; #IMPLIED
-          inheritrefs %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          target CDATA #IMPLIED>
-
-<!ELEMENT ccmkbl EMPTY>
-<!ATTLIST ccmkbl
-          id ID #IMPLIED
-          viewpath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          nlabel %boolean; #IMPLIED
-          full %boolean; #IMPLIED
-          nowarn %boolean; #IMPLIED
-          objselect CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          identical %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          baselinerootname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          commentfile CDATA #IMPLIED>
-
-<!ELEMENT cccheckout EMPTY>
-<!ATTLIST cccheckout
-          id ID #IMPLIED
-          reserved %boolean; #IMPLIED
-          viewpath CDATA #IMPLIED
-          out CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          nodata %boolean; #IMPLIED
-          version %boolean; #IMPLIED
-          nowarn %boolean; #IMPLIED
-          objselect CDATA #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
-          uri CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          file CDATA #IMPLIED
-          classname CDATA #IMPLIED
-          resource CDATA #IMPLIED
-          adaptto CDATA #IMPLIED
-          onerror (fail | report | ignore) #IMPLIED
-          loaderref IDREF #IMPLIED
-          classpathref IDREF #IMPLIED
-          taskname CDATA #IMPLIED
-          adapter CDATA #IMPLIED
-          format (properties | xml) #IMPLIED
-          description CDATA #IMPLIED
-          reverseloader %boolean; #IMPLIED>
-
-<!ELEMENT p4have EMPTY>
-<!ATTLIST p4have
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT xmlproperty EMPTY>
-<!ATTLIST xmlproperty
-          id ID #IMPLIED
-          file CDATA #IMPLIED
-          semanticattributes %boolean; #IMPLIED
-          keeproot %boolean; #IMPLIED
-          prefix CDATA #IMPLIED
-          collapseattributes %boolean; #IMPLIED
-          validate %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          rootdirectory CDATA #IMPLIED
-          includesemanticattribute %boolean; #IMPLIED>
-
-<!ELEMENT import EMPTY>
-<!ATTLIST import
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          optional %boolean; #IMPLIED
-          file CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT copy (filterchain | fileset | filterset | mapper)*>
-<!ATTLIST copy
-          id ID #IMPLIED
-          flatten %boolean; #IMPLIED
-          tofile CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          todir CDATA #IMPLIED
-          file CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          includeemptydirs %boolean; #IMPLIED
-          overwrite %boolean; #IMPLIED
-          enablemultiplemappings %boolean; #IMPLIED
-          outputencoding CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          preservelastmodified %boolean; #IMPLIED
-          filtering %boolean; #IMPLIED>
-
-<!ELEMENT jsharpc (patternset | exclude | include | custom | present | none | resource | define | not | type | modified | reference | src | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST jsharpc
-          id ID #IMPLIED
-          references CDATA #IMPLIED
-          useresponsefile %boolean; #IMPLIED
-          excludes CDATA #IMPLIED
-          mainclass CDATA #IMPLIED
-          extraoptions CDATA #IMPLIED
-          additionalmodules CDATA #IMPLIED
-          win32icon CDATA #IMPLIED
-          destdir CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          utf8output %boolean; #IMPLIED
-          includedefaultreferences %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          optimize %boolean; #IMPLIED
-          targettype (exe | library | module | winexe) #IMPLIED
-          destfile CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          win32res CDATA #IMPLIED
-          baseaddress CDATA #IMPLIED
-          debug %boolean; #IMPLIED
-          securescoping %boolean; #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          purejava %boolean; #IMPLIED
-          includesfile CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          warnlevel CDATA #IMPLIED
-          srcdir CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          referencefiles CDATA #IMPLIED>
-
-<!ELEMENT symlink (fileset)*>
-<!ATTLIST symlink
-          id ID #IMPLIED
-          linkfilename CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          link CDATA #IMPLIED
-          action CDATA #IMPLIED
-          resource CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT antstructure EMPTY>
-<!ATTLIST antstructure
-          id ID #IMPLIED
-          output CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          src CDATA #IMPLIED
-          language 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
-          taskname CDATA #IMPLIED
-          release 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
-          rpmbuildcommand CDATA #IMPLIED>
-
-<!ELEMENT delete (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | fileset | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!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
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT replace (patternset | exclude | include | custom | present | none | not | type | modified | replacefilter | or | contains | depend | replacetoken | different | size | majority | containsregexp | 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
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          replacefilterfile 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
-          description CDATA #IMPLIED
-          tofile CDATA #IMPLIED
-          maxmemory CDATA #IMPLIED
-          home CDATA #IMPLIED
-          granularity (compilation-units | files | methods | types | packages) #IMPLIED>
-
-<!ELEMENT attrib (arg | fileset | dirset | env | filelist | targetfile | srcfile | mapper)*>
-<!ATTLIST attrib
-          id ID #IMPLIED
-          addsourcefile %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          parallel %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          readonly %boolean; #IMPLIED
-          relative %boolean; #IMPLIED
-          skipemptyfilesets %boolean; #IMPLIED
-          command CDATA #IMPLIED
-          forwardslash %boolean; #IMPLIED
-          spawn %boolean; #IMPLIED
-          hidden %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          vmlauncher %boolean; #IMPLIED
-          file CDATA #IMPLIED
-          logerror %boolean; #IMPLIED
-          errorproperty CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          output CDATA #IMPLIED
-          error CDATA #IMPLIED
-          os CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          resolveexecutable %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          resultproperty CDATA #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          timeout CDATA #IMPLIED
-          maxparallel CDATA #IMPLIED
-          system %boolean; #IMPLIED
-          outputproperty CDATA #IMPLIED
-          archive %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          newenvironment %boolean; #IMPLIED
-          type (file | dir | both) #IMPLIED>
-
-<!ELEMENT waitfor (isfalse | isreference | 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 isreference EMPTY>
-<!ATTLIST isreference
-          id ID #IMPLIED
-          type CDATA #IMPLIED
-          refid IDREF #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
-          classname CDATA #IMPLIED
-          resource CDATA #IMPLIED
-          ignoresystemclasses %boolean; #IMPLIED
-          type (file | dir) #IMPLIED
-          classpathref IDREF #IMPLIED
-          taskname CDATA #IMPLIED
-          value CDATA #IMPLIED
-          description CDATA #IMPLIED
-          property CDATA #IMPLIED
-          filepath CDATA #IMPLIED>
-
-<!ELEMENT filepath (fileset | dirset | extdirs | existing | 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
-          errorsbeginat CDATA #IMPLIED>
-
-<!ELEMENT uptodate (srcfiles | mapper)*>
-<!ATTLIST uptodate
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          value CDATA #IMPLIED
-          property CDATA #IMPLIED
-          targetfile CDATA #IMPLIED
-          srcfile CDATA #IMPLIED>
-
-<!ELEMENT srcfiles (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST srcfiles
-          id ID #IMPLIED
-          refid IDREF #IMPLIED
-          file CDATA #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
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT loadproperties (filterchain)*>
-<!ATTLIST loadproperties
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          srcfile CDATA #IMPLIED>
-
-<!ELEMENT echoproperties (propertyset)*>
-<!ATTLIST echoproperties
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          format (xml | text) #IMPLIED
-          srcfile CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          destfile CDATA #IMPLIED>
-
-<!ELEMENT chgrp (arg | fileset | dirset | env | filelist | targetfile | srcfile | mapper)*>
-<!ATTLIST chgrp
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          skipemptyfilesets %boolean; #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          type (file | dir | both) #IMPLIED
-          command CDATA #IMPLIED
-          maxparallel CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          os CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          group CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          addsourcefile %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          forwardslash %boolean; #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          resolveexecutable %boolean; #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 vajexport (include | exclude)*>
-<!ATTLIST vajexport
-          id ID #IMPLIED
-          exportclasses %boolean; #IMPLIED
-          haltonerror %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 bunzip2 EMPTY>
-<!ATTLIST bunzip2
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          description CDATA #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT whichresource (classpath)*>
-<!ATTLIST whichresource
-          id ID #IMPLIED
-          classpath CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          resource CDATA #IMPLIED
-          class CDATA #IMPLIED
-          property CDATA #IMPLIED>
-
-<!ELEMENT copyfile EMPTY>
-<!ATTLIST copyfile
-          id ID #IMPLIED
-          forceoverwrite %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          description CDATA #IMPLIED
-          filtering CDATA #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT p4labelsync EMPTY>
-<!ATTLIST p4labelsync
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          simulationmode %boolean; #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED
-          delete %boolean; #IMPLIED
-          add %boolean; #IMPLIED>
-
-<!ELEMENT vsscreate EMPTY>
-<!ATTLIST vsscreate
-          id ID #IMPLIED
-          ssdir CDATA #IMPLIED
-          autoresponse CDATA #IMPLIED
-          quiet %boolean; #IMPLIED
-          vsspath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          serverpath CDATA #IMPLIED
-          login CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT macrodef (sequential | element | attribute)*>
-<!ATTLIST macrodef
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          name CDATA #IMPLIED
-          description CDATA #IMPLIED
-          uri CDATA #IMPLIED>
-
-<!ELEMENT element EMPTY>
-<!ATTLIST element
-          id ID #IMPLIED
-          optional %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          name CDATA #IMPLIED>
-
-<!ELEMENT ejbc (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | 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
-          description CDATA #IMPLIED
-          keepgenerated CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          descriptors CDATA #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT unjar (fileset | patternset)*>
-<!ATTLIST unjar
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT vbc (patternset | exclude | include | custom | present | none | resource | define | not | type | modified | reference | src | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST vbc
-          id ID #IMPLIED
-          references CDATA #IMPLIED
-          useresponsefile %boolean; #IMPLIED
-          removeintchecks %boolean; #IMPLIED
-          excludes CDATA #IMPLIED
-          mainclass CDATA #IMPLIED
-          extraoptions CDATA #IMPLIED
-          additionalmodules CDATA #IMPLIED
-          win32icon CDATA #IMPLIED
-          optionstrict %boolean; #IMPLIED
-          destdir CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          utf8output %boolean; #IMPLIED
-          includedefaultreferences %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          optimize %boolean; #IMPLIED
-          targettype (exe | library | module | winexe) #IMPLIED
-          destfile CDATA #IMPLIED
-          rootnamespace CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          win32res CDATA #IMPLIED
-          debug %boolean; #IMPLIED
-          optionexplicit %boolean; #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          warnlevel CDATA #IMPLIED
-          srcdir CDATA #IMPLIED
-          optioncompare CDATA #IMPLIED
-          imports CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          referencefiles CDATA #IMPLIED>
-
-<!ELEMENT wsdltodotnet EMPTY>
-<!ATTLIST wsdltodotnet
-          id ID #IMPLIED
-          url CDATA #IMPLIED
-          srcfile CDATA #IMPLIED
-          destfile CDATA #IMPLIED
-          server %boolean; #IMPLIED
-          namespace CDATA #IMPLIED
-          language CDATA #IMPLIED
-          extraoptions CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT mkdir EMPTY>
-<!ATTLIST mkdir
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT condition (isfalse | isreference | 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
-          reallyquiet %boolean; #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
-          pathref IDREF #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
-          taskname CDATA #IMPLIED
-          todir CDATA #IMPLIED
-          description CDATA #IMPLIED
-          tofile 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
-          uri CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          file CDATA #IMPLIED
-          classname CDATA #IMPLIED
-          resource CDATA #IMPLIED
-          adaptto CDATA #IMPLIED
-          onerror (fail | report | ignore) #IMPLIED
-          loaderref IDREF #IMPLIED
-          classpathref IDREF #IMPLIED
-          taskname CDATA #IMPLIED
-          adapter CDATA #IMPLIED
-          format (properties | xml) #IMPLIED
-          description CDATA #IMPLIED
-          reverseloader %boolean; #IMPLIED>
-
-<!ELEMENT echo (#PCDATA)>
-<!ATTLIST echo
-          id ID #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          file CDATA #IMPLIED
-          description CDATA #IMPLIED
-          message CDATA #IMPLIED
-          level (error | warning | info | verbose | debug) #IMPLIED>
-
-<!ELEMENT ccupdate EMPTY>
-<!ATTLIST ccupdate
-          id ID #IMPLIED
-          preservetime %boolean; #IMPLIED
-          rename %boolean; #IMPLIED
-          viewpath CDATA #IMPLIED
-          log CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          objselect CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          graphical %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          currenttime %boolean; #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT java (classpath | sysproperty | bootclasspath | syspropertyset | env | permissions | jvmarg | arg | assertions)*>
-<!ATTLIST java
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          jvmargs CDATA #IMPLIED
-          args CDATA #IMPLIED
-          fork %boolean; #IMPLIED
-          maxmemory CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          jar CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          jvm CDATA #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          jvmversion CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          newenvironment %boolean; #IMPLIED
-          classname 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
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT renameext (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST renameext
-          id ID #IMPLIED
-          replace %boolean; #IMPLIED
-          toextension CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          fromextension CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          srcdir CDATA #IMPLIED
-          description CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          includes 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 (taglet | doclet | package | arg | link | doctitle | bottom | group | packageset | fileset | classpath | sourcepath | footer | source | bootclasspath | header | excludepackage | 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
-          noqualifier CDATA #IMPLIED
-          public %boolean; #IMPLIED
-          author %boolean; #IMPLIED
-          footer CDATA #IMPLIED
-          docletpath CDATA #IMPLIED
-          package %boolean; #IMPLIED
-          useexternalfile %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          sourcepathref IDREF #IMPLIED
-          protected %boolean; #IMPLIED
-          breakiterator %boolean; #IMPLIED
-          nonavbar %boolean; #IMPLIED
-          maxmemory CDATA #IMPLIED
-          group CDATA #IMPLIED
-          source CDATA #IMPLIED
-          linkoffline CDATA #IMPLIED
-          additionalparam CDATA #IMPLIED
-          linksource %boolean; #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 tar (patternset | exclude | include | custom | tarfileset | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | 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
-          excludesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          compression (none | gzip | bzip2) #IMPLIED
-          longfile (warn | fail | truncate | gnu | omit) #IMPLIED
-          includes CDATA #IMPLIED>
-
-<!ELEMENT tarfileset (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
-<!ATTLIST tarfileset
-          id ID #IMPLIED
-          excludes CDATA #IMPLIED
-          preserveleadingslashes %boolean; #IMPLIED
-          username CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          fullpath CDATA #IMPLIED
-          group CDATA #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          refid IDREF #IMPLIED
-          casesensitive %boolean; #IMPLIED
-          mode CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          description CDATA #IMPLIED
-          prefix CDATA #IMPLIED
-          dirmode CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          file CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED>
-
-<!ELEMENT vsscp EMPTY>
-<!ATTLIST vsscp
-          id ID #IMPLIED
-          login CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          vsspath CDATA #IMPLIED
-          serverpath CDATA #IMPLIED
-          ssdir CDATA #IMPLIED
-          autoresponse CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED>
-
-<!ELEMENT vajimport (fileset)*>
-<!ATTLIST vajimport
-          id ID #IMPLIED
-          haltonerror %boolean; #IMPLIED
-          remote CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          importsources %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          project CDATA #IMPLIED
-          importresources %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          importclasses %boolean; #IMPLIED>
-
-<!ELEMENT p4fstat (fileset)*>
-<!ATTLIST p4fstat
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          changelist CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED
-          showfilter CDATA #IMPLIED>
-
-<!ELEMENT setproxy EMPTY>
-<!ATTLIST setproxy
-          id ID #IMPLIED
-          nonproxyhosts CDATA #IMPLIED
-          proxyhost CDATA #IMPLIED
-          socksproxyhost CDATA #IMPLIED
-          proxyport CDATA #IMPLIED
-          socksproxyport CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          proxyuser CDATA #IMPLIED
-          description CDATA #IMPLIED
-          proxypassword CDATA #IMPLIED>
-
-<!ELEMENT p4counter EMPTY>
-<!ATTLIST p4counter
-          id ID #IMPLIED
-          name CDATA #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          value CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          property CDATA #IMPLIED
-          errormessage CDATA #IMPLIED>
-
-<!ELEMENT wlstop (classpath)*>
-<!ATTLIST wlstop
-          id ID #IMPLIED
-          user CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          delay CDATA #IMPLIED
-          password CDATA #IMPLIED
-          url CDATA #IMPLIED
-          description CDATA #IMPLIED
-          beahome CDATA #IMPLIED>
-
-<!ELEMENT ilasm (patternset | exclude | include | custom | present | none | not | type | modified | reference | src | or | contains | depend | different | size | majority | containsregexp | 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 (exe | library) #IMPLIED
-          destfile 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
-          taskname CDATA #IMPLIED
-          resourcefile CDATA #IMPLIED
-          srcdir CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          listing %boolean; #IMPLIED
-          keyfile CDATA #IMPLIED>
-
-<!ELEMENT soscheckout EMPTY>
-<!ATTLIST soscheckout
-          id ID #IMPLIED
-          soshome CDATA #IMPLIED
-          file CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          vssserverpath CDATA #IMPLIED
-          username CDATA #IMPLIED
-          sosserverpath CDATA #IMPLIED
-          projectpath CDATA #IMPLIED
-          nocache %boolean; #IMPLIED
-          nocompress %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          localpath CDATA #IMPLIED
-          soscmd CDATA #IMPLIED
-          password CDATA #IMPLIED>
-
-<!ELEMENT apply (arg | fileset | dirset | env | filelist | targetfile | srcfile | mapper)*>
-<!ATTLIST apply
-          id ID #IMPLIED
-          resultproperty CDATA #IMPLIED
-          skipemptyfilesets %boolean; #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          command CDATA #IMPLIED
-          type (file | dir | both) #IMPLIED
-          maxparallel CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          os CDATA #IMPLIED
-          errorproperty CDATA #IMPLIED
-          output CDATA #IMPLIED
-          timeout CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          spawn %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          addsourcefile %boolean; #IMPLIED
-          verbose %boolean; #IMPLIED
-          logerror %boolean; #IMPLIED
-          dir CDATA #IMPLIED
-          forwardslash %boolean; #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          resolveexecutable %boolean; #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
-          objselect CDATA #IMPLIED
-          keepcopy %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          viewpath 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 jlink (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | mergefiles | different | size | majority | containsregexp | 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 | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST mergefiles
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT addfiles (fileset | dirset | extdirs | existing | filelist | pathelement | path)*>
-<!ATTLIST addfiles
-          id ID #IMPLIED
-          location CDATA #IMPLIED
-          refid IDREF #IMPLIED
-          description CDATA #IMPLIED
-          path CDATA #IMPLIED>
-
-<!ELEMENT cvstagdiff (commandline)*>
-<!ATTLIST cvstagdiff
-          id ID #IMPLIED
-          cvsrsh CDATA #IMPLIED
-          endtag CDATA #IMPLIED
-          quiet %boolean; #IMPLIED
-          passfile CDATA #IMPLIED
-          command CDATA #IMPLIED
-          package CDATA #IMPLIED
-          cvsroot CDATA #IMPLIED
-          reallyquiet %boolean; #IMPLIED
-          starttag CDATA #IMPLIED
-          output CDATA #IMPLIED
-          port CDATA #IMPLIED
-          compressionlevel CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          destfile CDATA #IMPLIED
-          enddate CDATA #IMPLIED
-          noexec %boolean; #IMPLIED
-          error CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          date CDATA #IMPLIED
-          startdate CDATA #IMPLIED
-          compression %boolean; #IMPLIED
-          tag CDATA #IMPLIED>
-
-<!ELEMENT javacc EMPTY>
-<!ATTLIST javacc
-          id ID #IMPLIED
-          debugparser %boolean; #IMPLIED
-          javacchome CDATA #IMPLIED
-          forcelacheck %boolean; #IMPLIED
-          optimizetokenmanager %boolean; #IMPLIED
-          commontokenaction %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
-          keeplinecolumn %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          outputdirectory CDATA #IMPLIED
-          cachetokens %boolean; #IMPLIED
-          javaunicodeescape %boolean; #IMPLIED
-          static %boolean; #IMPLIED
-          target CDATA #IMPLIED
-          ignorecase %boolean; #IMPLIED
-          usertokenmanager %boolean; #IMPLIED
-          errorreporting %boolean; #IMPLIED>
-
-<!ELEMENT chmod (mapper | include | srcfile | exclude | targetfile | patternset | env | filelist | fileset | dirset | arg)*>
-<!ATTLIST chmod
-          id ID #IMPLIED
-          addsourcefile %boolean; #IMPLIED
-          excludes CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          parallel %boolean; #IMPLIED
-          input CDATA #IMPLIED
-          executable CDATA #IMPLIED
-          inputstring CDATA #IMPLIED
-          relative %boolean; #IMPLIED
-          skipemptyfilesets %boolean; #IMPLIED
-          command CDATA #IMPLIED
-          forwardslash %boolean; #IMPLIED
-          spawn %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          vmlauncher %boolean; #IMPLIED
-          file CDATA #IMPLIED
-          logerror %boolean; #IMPLIED
-          errorproperty CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          output CDATA #IMPLIED
-          error CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          os CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          resolveexecutable %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          resultproperty CDATA #IMPLIED
-          failifexecutionfails %boolean; #IMPLIED
-          append %boolean; #IMPLIED
-          timeout CDATA #IMPLIED
-          maxparallel CDATA #IMPLIED
-          outputproperty CDATA #IMPLIED
-          perm CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          newenvironment %boolean; #IMPLIED
-          type (file | dir | both) #IMPLIED>
-
-<!ELEMENT pvcs (pvcsproject)*>
-<!ATTLIST pvcs
-          id ID #IMPLIED
-          updateonly %boolean; #IMPLIED
-          force CDATA #IMPLIED
-          config CDATA #IMPLIED
-          workspace CDATA #IMPLIED
-          pvcsbin CDATA #IMPLIED
-          pvcsproject CDATA #IMPLIED
-          filenameformat CDATA #IMPLIED
-          userid CDATA #IMPLIED
-          repository CDATA #IMPLIED
-          ignorereturncode %boolean; #IMPLIED
-          revision CDATA #IMPLIED
-          linestart CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          promotiongroup CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT pvcsproject EMPTY>
-<!ATTLIST pvcsproject
-          id ID #IMPLIED
-          name CDATA #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 jar (patternset | exclude | include | custom | present | none | not | manifest | type | metainf | modified | or | contains | depend | fileset | different | size | majority | containsregexp | filename | selector | includesfile | zipgroupfileset | zipfileset | date | excludesfile | depth | and)*>
-<!ATTLIST jar
-          id ID #IMPLIED
-          whenempty (fail | skip | create) #IMPLIED
-          keepcompression %boolean; #IMPLIED
-          duplicate (add | preserve | fail) #IMPLIED
-          excludes CDATA #IMPLIED
-          basedir CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          manifest CDATA #IMPLIED
-          jarfile CDATA #IMPLIED
-          defaultexcludes %boolean; #IMPLIED
-          index %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
-          manifestencoding CDATA #IMPLIED
-          filesonly %boolean; #IMPLIED
-          file CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          filesetmanifest (skip | merge | mergewithoutmain) #IMPLIED
-          zipfile CDATA #IMPLIED>
-
-<!ELEMENT ccmklbtype EMPTY>
-<!ATTLIST ccmklbtype
-          id ID #IMPLIED
-          global %boolean; #IMPLIED
-          replace %boolean; #IMPLIED
-          shared %boolean; #IMPLIED
-          viewpath CDATA #IMPLIED
-          typename CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          pbranch %boolean; #IMPLIED
-          objselect CDATA #IMPLIED
-          cleartooldir CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          vob CDATA #IMPLIED
-          description CDATA #IMPLIED
-          commentfile CDATA #IMPLIED
-          ordinary %boolean; #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 scriptdef (#PCDATA | classpath | element | attribute)*>
-<!ATTLIST scriptdef
-          id ID #IMPLIED
-          src CDATA #IMPLIED
-          name CDATA #IMPLIED
-          uri CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          language CDATA #IMPLIED
-          classpathref IDREF #IMPLIED
-          loaderref IDREF #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          reverseloader %boolean; #IMPLIED>
-
-<!ELEMENT defaultexcludes EMPTY>
-<!ATTLIST defaultexcludes
-          id ID #IMPLIED
-          remove CDATA #IMPLIED
-          echo %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          default %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          add CDATA #IMPLIED>
-
-<!ELEMENT mparse (fileset | 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
-          home CDATA #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 jjdoc EMPTY>
-<!ATTLIST jjdoc
-          id ID #IMPLIED
-          outputfile CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          javacchome CDATA #IMPLIED
-          target CDATA #IMPLIED
-          text %boolean; #IMPLIED
-          onetable %boolean; #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
-          classpath CDATA #IMPLIED
-          old %boolean; #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
-          ccmaction CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          ccmproject CDATA #IMPLIED
-          description CDATA #IMPLIED
-          recurse %boolean; #IMPLIED
-          ccmdir CDATA #IMPLIED>
-
-<!ELEMENT unzip (fileset | patternset)*>
-<!ATTLIST unzip
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dest CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          src CDATA #IMPLIED>
-
-<!ELEMENT javac (patternset | exclude | include | custom | present | none | extdirs | not | type | modified | src | or | contains | depend | classpath | sourcepath | different | size | majority | containsregexp | 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
-          description CDATA #IMPLIED
-          sourcepathref IDREF #IMPLIED
-          depend %boolean; #IMPLIED
-          includes CDATA #IMPLIED
-          source CDATA #IMPLIED
-          includejavaruntime %boolean; #IMPLIED
-          failonerror %boolean; #IMPLIED
-          destdir CDATA #IMPLIED
-          debug %boolean; #IMPLIED
-          tempdir CDATA #IMPLIED
-          classpath CDATA #IMPLIED
-          followsymlinks %boolean; #IMPLIED
-          casesensitive %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 p4add (fileset)*>
-<!ATTLIST p4add
-          id ID #IMPLIED
-          port CDATA #IMPLIED
-          client CDATA #IMPLIED
-          inerror %boolean; #IMPLIED
-          user CDATA #IMPLIED
-          changelist CDATA #IMPLIED
-          cmdopts CDATA #IMPLIED
-          globalopts CDATA #IMPLIED
-          view CDATA #IMPLIED
-          taskname CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          errormessage CDATA #IMPLIED
-          commandlength 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
-          home CDATA #IMPLIED
-          exitprompt 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 filters (include | exclude)*>
-<!ATTLIST filters
-          id ID #IMPLIED
-          defaultexclude %boolean; #IMPLIED>
-
-<!ELEMENT soslabel EMPTY>
-<!ATTLIST soslabel
-          id ID #IMPLIED
-          soshome CDATA #IMPLIED
-          verbose %boolean; #IMPLIED
-          vssserverpath CDATA #IMPLIED
-          username CDATA #IMPLIED
-          sosserverpath CDATA #IMPLIED
-          comment CDATA #IMPLIED
-          projectpath CDATA #IMPLIED
-          version CDATA #IMPLIED
-          nocache %boolean; #IMPLIED
-          nocompress %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED
-          localpath CDATA #IMPLIED
-          soscmd CDATA #IMPLIED
-          password CDATA #IMPLIED>
-
-<!ELEMENT vssget EMPTY>
-<!ATTLIST vssget
-          id ID #IMPLIED
-          ssdir CDATA #IMPLIED
-          date CDATA #IMPLIED
-          recursive %boolean; #IMPLIED
-          autoresponse CDATA #IMPLIED
-          quiet %boolean; #IMPLIED
-          vsspath CDATA #IMPLIED
-          version CDATA #IMPLIED
-          serverpath CDATA #IMPLIED
-          login CDATA #IMPLIED
-          filetimestamp (current | modified | updated) #IMPLIED
-          writable %boolean; #IMPLIED
-          taskname CDATA #IMPLIED
-          label CDATA #IMPLIED
-          description CDATA #IMPLIED
-          failonerror %boolean; #IMPLIED
-          localpath CDATA #IMPLIED
-          writablefiles (replace | skip | fail) #IMPLIED>
-
-<!ELEMENT deltree EMPTY>
-<!ATTLIST deltree
-          id ID #IMPLIED
-          taskname CDATA #IMPLIED
-          dir CDATA #IMPLIED
-          description CDATA #IMPLIED>
-
-<!ELEMENT ddcreator (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | 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
-          excludes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludesfile CDATA #IMPLIED
-          descriptors CDATA #IMPLIED
-          includes 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 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 image (include | patternset | exclude)*>
-<!ATTLIST image
-          id ID #IMPLIED
-          failonerror %boolean; #IMPLIED
-          srcdir IDREF #IMPLIED
-          description CDATA #IMPLIED
-          encoding CDATA #IMPLIED
-          overwrite %boolean; #IMPLIED
-          gc %boolean; #IMPLIED
-          destdir CDATA #IMPLIED
-          includes CDATA #IMPLIED
-          includesfile CDATA #IMPLIED
-          excludes CDATA #IMPLIED
-	      excludesfile CDATA #IMPLIED
-	      defaultexcludes CDATA #IMPLIED
-	      caseSensitive %boolean; #IMPLIED
-	      followSymlinks %boolean; #IMPLIED>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.6.0.xml b/ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.6.0.xml
deleted file mode 100644
index 7a5ef8f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.6.0.xml
+++ /dev/null

@@ -1,23697 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<tasks>
-
-  <task name="ant" catgory="control" classname="org.apache.tools.ant.taskdefs.Ant">
-    <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">
-          <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">
-
-          <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">
-
-  
-
-          <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">
- 		<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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Target to execute, required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="reference" type="org.apache.tools.ant.taskdefs.Ant.Reference" briefType="" required="NOTDEFINED">
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Invokes the ANTLR Translator generator on a grammar file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets a flag to enable ParseView debugging
-        </description>
-      
-        </attribute>
-      
-        <attribute name="diagnostic" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets a flag to emit diagnostic text
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          The working directory of the process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="glib" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets an optional super grammar file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="html" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, emit html
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputdirectory" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          The directory to write the generated files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The grammar file to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="trace" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, enables all tracing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tracelexer" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, enables lexer tracing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="traceparser" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, enables parser tracing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tracetreewalker" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a new JVM argument.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="antstructure" category="xml" classname="org.apache.tools.ant.taskdefs.AntStructure">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          The output file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="apply" category="control" classname="org.apache.tools.ant.taskdefs.ExecuteOn">
-
-  
-    
-  
-    <description>
-    Executes a given command, supplying a set of files as arguments.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          The directory where target files are to be placed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          The working directory of the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          The command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failifexecutionfails" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Stop the build if program cannot be started. Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Source files to operate upon.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the classpath by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the path to use when looking for a file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignoresystemclasses" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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="">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Path to search for file resources.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="basename" category="property" classname="org.apache.tools.ant.taskdefs.Basename">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          File or directory to get base name from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Property to set base name to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suffix" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Path to use for classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Reference to existing path, to use as a classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="clientjar" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Client JAR file name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          EJB JAR file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mode" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Command launching mode: java or fork.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds path to the classpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="buildnumber" category="other" classname="org.apache.tools.ant.taskdefs.BuildNumber">
-
-  
-    
-  
-    <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;">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          The destination file or directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          the file to compress; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="zipfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Create a CAB archive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Base directory to look in for files to CAB.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cabfile" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The name/location of where to create the .cab file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, compress the files otherwise only store them.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="options" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets additional cabarc options that are not supported directly.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, display cabarc output.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the comment string.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commentfile" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies a file containing a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="identical" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, keeps a copy of the file with a .keep extension.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nowarn" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, suppress warning messages.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservetime" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, preserve the modification time.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="viewpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Specify a branch to check out the file to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cleartooldir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the comment string.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commentfile" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies a file containing a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodata" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, warning messages are suppressed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="out" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Creates a writable file under a different filename.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="reserved" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, checks out the file as reserved.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Performs Continuus checkin command.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Performs Continuus Checkin Default task command.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Performs Continuus checkout command.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="platform" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies the target platform.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="release" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specify the CCM release.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resolver" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies the resolver.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="subsystem" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Specifies the subsystem.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="task" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Task allows to reconfigure a project, recurcively or not
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ccmproject" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the ccm project on which the operation is applied.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recurse" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, recurse on subproject (default false).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keepcopy" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="currenttime" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, displays a graphical dialog during the update.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="log" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Sets the log file where cleartool records
- the status of the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, overwrite hijacked files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservetime" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, hijacked files are renamed with a .keep extension.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="viewpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Used to create or verify file checksums.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="algorithm" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
- whether it is newer than
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the property to hold the generated checksum.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="provider" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          Sets the MessageDigest algorithm provider to be used
- to calculate the checksum.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="readbuffersize" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          The size of the read buffer to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verifyproperty" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Files to generate checksums for.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="chmod" category="filesystem" classname="org.apache.tools.ant.taskdefs.Chmod">
-
-  
-    
-  
-    <description>
-    Chmod equivalent for unix-like environments.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The directory where target files are to be placed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          The command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failifexecutionfails" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Stop the build if program cannot be started. Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputproperty" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          The new permissions.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="relative" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Whether the command works only on files, directories or both?
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vmlauncher" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Source files to operate upon.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a set of patterns.
-        </description>
-      
-        </element>
-
-      
-        <element name="srcfile" type="org.apache.tools.ant.types.Commandline.Marker" briefType="" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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     ">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          List of files to concatenate.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          The name of the property to set. Required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add an &amp;lt;available&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="checksum" type="org.apache.tools.ant.taskdefs.Checksum" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a &amp;lt;socket&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="uptodate" type="org.apache.tools.ant.taskdefs.UpToDate" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Sets the character encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no; defaults to true.">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Sets a single source file to copy.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          
-        
-          <description>
-          If true, enables filtering.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatten" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          
-
-        
-          <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.">
-        
-          
-        
-          <description>
-          Used to copy empty directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          
-        
-          <description>
-          Overwrite any existing destination file(s).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservelastmodified" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          
-        
-          <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="">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Sets the destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a set of files to copy.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a FilterChain.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterset" type="org.apache.tools.ant.types.FilterSet" briefType="Filterset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a filterset.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Copies a directory.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatten" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="copyfile" category="other" classname="org.apache.tools.ant.taskdefs.Copyfile" deprecated="true">
-
-  
-    
-  
-    <description>
-    Copies a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="csc" category="dotnet" classname="org.apache.tools.ant.taskdefs.optional.dotnet.CSharp" matchingTask="true">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Semicolon separated list of modules to refer to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          set the debug flag on or off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="definitions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Semicolon separated list of defined constants.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the destination directory of files to be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the name of exe/library to create.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="docfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          file for generated XML documentation
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extraoptions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Any extra options which are not explicitly supported
- by this task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, fail on compilation errors.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filealign" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, print the full path of files on errors.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includedefaultreferences" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
- in dotnet, and tells the compiler to link in mscore.dll.
-
-  set the automatic reference inclusion flag on or off this flag controls
-
-        
-          <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">
-        
-          
-        
-          <description>
-          set the incremental compilation flag on or off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mainclass" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the name of main class for executables.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="noconfig" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, enables optimization flag.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the output file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="referencefiles" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Path of references to include.
- Wildcards should work.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="references" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Semicolon separated list of DLLs to refer to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the source directory of the files to be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targettype" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the type of target.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unsafe" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, enables the unsafe keyword.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="utf8output" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, require all compiler output to be in UTF8 format.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="warnlevel" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the filename of icon to include.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="win32res" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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;.">
-        
-          
-        
-          <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;.">
-        
-          
-        
-          <description>
-          The CVS command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compression" type="boolean" briefType="boolean" required="no. defaults to false.">
-        
-          
-        
-          <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.">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The CVSROOT variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cvsrsh" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          The CVS_RSH variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="date" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          The file to direct standard error from the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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;">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          The file to direct standard output from the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          The package/module to operate upon.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="passfile" type="java.io.File" briefType="File" required="no, default file ~/.cvspass.">
-        
-          
-        
-          <description>
-          Password file to read passwords from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="no, default port 2401.">
-        
-          
-        
-          <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;">
-        
-          
-        
-          <description>
-          If true, suppress informational messages.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tag" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the output file for the log.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the base dir for cvs.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="end" type="java.util.Date" briefType="Date" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the date at which the changelog should stop.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="start" type="java.util.Date" briefType="Date" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the date at which the changelog should start.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usersfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Adds an new entry to a CVS password file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cvsroot" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Password file to add the entry to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          If true, this is the same as compressionlevel="3".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compressionlevel" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The CVSROOT variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cvsrsh" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The CVS_RSH variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Set the output file for the diff.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="enddate" type="java.lang.String" briefType="String" required="">
-        
-          
-        
-          <description>
-          Set the end date.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="endtag" type="java.lang.String" briefType="String" required="exactly one of the two.">
-        
-          
-        
-          <description>
-          Set the end tag.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The package/module to analyze.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="passfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Password file to read passwords from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Port used by CVS to communicate with the server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, suppress informational messages.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="startdate" type="java.lang.String" briefType="String" required="">
-        
-          
-        
-          <description>
-          Set the start date.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="starttag" type="java.lang.String" briefType="String" required="exactly one of the two.">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="descriptors" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="">
-        
-          
-        
-          <description>
-          Set the directory from which files are to be deleted
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludes" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the name of the file containing the includes patterns.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Set the name of a single file to be removed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeemptydirs" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, delete empty directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includes" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the name of the file containing the includes patterns.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Sets the dependency cache file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="closure" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the destination directory where the compiled Java files exist.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dump" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Add a list of source files.
-        </description>
-      
-        </element>
-
-      
-        <element name="srcfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a set of source files.
-        </description>
-      
-        </element>
-
-      
-        <element name="targetfilelist" type="org.apache.tools.ant.types.FileList" briefType="Filelist" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a list of target files.
-        </description>
-      
-        </element>
-
-      
-        <element name="targetfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a set of target files.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="dirname" category="property" classname="org.apache.tools.ant.taskdefs.Dirname">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Path to take the dirname of.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          File to incorporate as application.xml.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          Directory from which to archive files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          <description>
-          Whether we want to compress the files or only store them; default=true;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-       
-          <description>
-          The file to create.
-        </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">
-        
-          <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">
-        
-        
-          <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">
-        
-          <description>
-          If true, emulate Sun's jar utility by not adding parent directories; defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="index" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <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">
-        
-          
-        
-          <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">
-        
-       
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; 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">
-        
-          
-        
-          <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">
-
-          <description>
-          Adds zipfileset.
-        </description>
-      
-        </element>
-
-      
-        <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest" briefType="" required="NOTDEFINED">
-        
-        
-          <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">
-
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-
-          <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">
-
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-         
-        
-          <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">
-
-    <description>
-    Writes a message to the Ant logging facilities.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no - default is false.">
-
-          <description>
-          If true, append to existing file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no">
-	    <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;.">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <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">
-
-    <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">
-
-          <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">
-        
-          
-
-        
-          <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">
-        
-          <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">
-
-    <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">
-        
-          
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="descriptors" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <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">
-        
-          <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">
-        
-          <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">
-        
-          <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">
-        
-          <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">
-
-    <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">
-                
-          <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">
- 
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <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">
-          <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">
-        
-          
-        
-          <description>
-          Adds a deployment tool for Borland server.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-         <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">
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <description>
-          Adds a deployment tool for JOnAS server.
-        </description>
-      
-        </element>
-
-      
-        <element name="support" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        <description>
-          Adds a fileset for support elements.
-        </description>
-      
-        </element>
-
-      
-        <element name="weblogic" type="org.apache.tools.ant.taskdefs.optional.ejb.WeblogicDeploymentTool" briefType="" required="NOTDEFINED">
-        <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">
-        <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">
-      
-          <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">
-	<description>
-    Executes a given command if the os platform is appropriate.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <description>
-          The working directory of the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="">
-        
-          
-        
-          <description>
-          The command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failifexecutionfails" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Stop the build if program cannot be started. Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputproperty" type="java.lang.String" briefType="String" required="no">
-       
-         <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">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="fail" category="control" classname="org.apache.tools.ant.taskdefs.Exit">
-	<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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          A message giving further information on why the build exited.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unless" type="java.lang.String" briefType="String" required="no">
-        <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">
-
-  
-    
-  
-    <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*">
-        
-          
-        
-          <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*">
-        
-          
-        
-          <description>
-          The token string without @ delimiters.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="yes*">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          Specify how EndOfLine characters are to be handled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javafiles" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Set to true if modifying Java source files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Specify how tab characters are to be handled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tablength" type="int" briefType="int" required="no">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        <description>
-          Aet 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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the login password for the given user id.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          Sets the FTP port used by the remote server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="remotedir" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the FTP server to send files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="skipfailedtransfers" type="boolean" briefType="boolean" required="no">
-       <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the login user id to use on the specified server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-       <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Generates a key in a keystore.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="alias" type="java.lang.String" briefType="String" required="yes.">
-        
-          
-        
-          <description>
-          The alias to add under.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dname" type="java.lang.String" briefType="String" required="yes if dname element unspecified">
-        
-          
-        
-          <description>
-          The distinguished name for entity.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keyalg" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          The method to use when generating name-value pair.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keypass" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Password for private key (if different).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keysize" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Indicates the size of key generated.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keystore" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Keystore location.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sigalg" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          The algorithm to use in signing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storepass" type="java.lang.String" briefType="String" required="yes.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Keystore type.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="validity" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Indicates how many days certificate is valid.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Distinguished name list.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="get" category="network" classname="org.apache.tools.ant.taskdefs.Get">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Where to copy the source file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignoreerrors" type="boolean" briefType="boolean" required="no; default &quot;false&quot;">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          password for the basic authentication.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.net.URL" briefType="URL" required="yes">
-        
-          
-        
-          <description>
-          Set the URL to get.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usetimestamp" type="boolean" briefType="boolean" required="no; default &quot;false&quot;">
-        
-         <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">
-        
-          
-        
-          <description>
-          Username for basic auth.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no; default &quot;false&quot;">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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="no">
-        
-          
-        
-          <description>
-          The destination file or directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          <description>
-          The file to expand.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="gzip" category="packaging" classname="org.apache.tools.ant.taskdefs.GZip">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          the file to compress; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="zipfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-    <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">
-        
-          
-        
-          <description>
-          Sets the build directory for instrumented classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classdir" type="java.io.File" briefType="File" required="only if updateicontrol=true">
-        
-          
-        
-          <description>
-          Sets the class directory (uninstrumented classes).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the control file to pass to iContract.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failthrowable" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets the Throwable (Exception) to be thrown on assertion violation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="instrumentdir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets the instrumentation directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="invariant" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Turns on/off invariant instrumentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="post" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Turns on/off postcondition instrumentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pre" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Turns on/off precondition instrumentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Tells iContract to be quiet.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="repbuilddir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the build directory for instrumented classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="repositorydir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets the build directory for repository classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets the source directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targets" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, updates iControl properties file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbosity" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          set the debug flag on or off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extraoptions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          Any extra options which are not explicitly supported by this task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, fails if ilasm tool fails.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keyfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          the name of a file containing a private key.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="listing" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          If true, produce a listing (off by default).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the output file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resourcefile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          name of resource file to include.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the source directory containing the files to be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targettype" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the type of target, either "exe" or "library".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Reads an input line from the console.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="addproperty" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Creates a JAR archive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          Directory from which to archive files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        <description>
-          Whether we want to compress the files or only store them; default=true;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        <description>
-          If true, emulate Sun's jar utility by not adding parent directories; defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="index" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; 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">
-        <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">
-        
-          <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">
-        <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        <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">
-        
-          
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <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">
-  <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.">
-        
-          
-        
-          <description>
-          The JAR library to check.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the Extension looking for.
-        </description>
-      
-        </element>
-
-      
-        <element name="extensionset" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          <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.">
-        <description>
-          If true, failure to locate library should fail build.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the Extension looking for.
-        </description>
-      
-        </element>
-
-      
-        <element name="location" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.LocationResolver" briefType="" required="NOTDEFINED">
-        
-          <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">
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          If true, append output to existing file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="either jar or classname">
-        
-          
-        
-          <description>
-          Sets the Java class to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Classpath to use, by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          The working directory of the process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, execute in a new VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmversion" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the JVM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jar" type="java.io.File" briefType="File" required="either jar or classname">
-        
-          
-        
-          <description>
-          The location of the JAR file to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvm" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the command line arguments for the JVM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Corresponds to -mx or -Xmx depending on VM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Long" briefType="long" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a system property.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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>
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compiler" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Choose the implementation for this particular task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <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">
-        <description>
-          Enables dependency-tracking for compilers
- that support this (jikes and classic).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="deprecation" type="boolean" briefType="boolean" required="no">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          Set the Java source file encoding name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        <description>
-          Sets the extension directories that will be used during the
- compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <description>
-          If true, forks the javac compiler.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeantruntime" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, includes Ant's own classpath in the classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includejavaruntime" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, includes the Java runtime libraries in the classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="listfiles" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          If true, enables the -nowarn option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="optimize" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, compiles with optimization enabled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="source" type="java.lang.String" briefType="String" required="no">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Set the source directories to find the source Java files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a path to the bootclasspath.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="compilerarg" type="org.apache.tools.ant.taskdefs.Javac.ImplementationSpecificArgument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds an implementation specific command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to extdirs.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to sourcepath.
-        </description>
-      
-        </element>
-
-      
-        <element name="src" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    JavaCC compiler compiler task.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="buildparser" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the BUILD_PARSER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="buildtokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the BUILD_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cachetokens" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the CACHE_TOKENS grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="choiceambiguitycheck" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          Sets the CHOICE_AMBIGUITY_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commontokenaction" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the COMMON_TOKEN_ACTION grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debuglookahead" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the DEBUG_LOOKAHEAD grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugparser" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the DEBUG_PARSER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugtokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the DEBUG_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="errorreporting" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the ERROR_REPORTING grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forcelacheck" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the FORCE_LA_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignorecase" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the IGNORE_CASE grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javacchome" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The directory containing the JavaCC distribution.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javaunicodeescape" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the JAVA_UNICODE_ESCAPE grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lookahead" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          Sets the LOOKAHEAD grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="optimizetokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the OPTIMIZE_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="otherambiguitycheck" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          Sets the OTHER_AMBIGUITY_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputdirectory" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the SANITY_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="static" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the STATIC grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The grammar file to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unicodeinput" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the UNICODE_INPUT grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usercharstream" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the USER_CHAR_STREAM grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usertokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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>
-
-  
-    
-  
-    <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)">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set an additional parameter on the command line
-        </description>
-      
-        </attribute>
-      
-        <attribute name="author" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the boot classpath to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bottom" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a reference to a CLASSPATH defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="defaultexcludes" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Set the directory where the Javadoc output will be generated.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="docencoding" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Output file encoding name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="doclet" type="java.lang.String" briefType="String" required="no">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the title of the generated overview page.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Set the encoding name of the source files,
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludepackagenames" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the location of the extensions directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Group specified packages together in overview page.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="header" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Specifies the HTML help file to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="link" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Create links to javadoc output at the given URL.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="linkoffline" type="java.lang.String" briefType="String" required="no">
-        
-        <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">
-        
-          
-        
-          <description>
-          Set the local to use in documentation generation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Set the maximum memory to be used by the javadoc process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeprecated" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, do not include @deprecated information.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeprecatedlist" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, do not generate deprecated list.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nohelp" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, do not generate help link
-        </description>
-      
-        </attribute>
-      
-        <attribute name="noindex" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, do not generate index.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nonavbar" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, do not generate navigation bar.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="notree" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, do not generate class hierarchy.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="old" type="boolean" briefType="boolean" required="no">
-        <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          The name of a file containing the packages to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="packagenames" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Set the package names to be processed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="private" type="boolean" briefType="boolean" required="no">
-        <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">
-          <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">
-        <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">
-        
-          
-        
-          <description>
-          If true, generate warning about @serial tag.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="source" type="java.lang.String" briefType="String" required="no">
-        <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="">
-        
-          
-        
-          <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;">
-        
-          
-        
-          <description>
-          Specify where to find source file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcepathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="">
-        
-          
-        
-          <description>
-          Adds a reference to a CLASSPATH defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="splitindex" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Generate a split index
-        </description>
-      
-        </attribute>
-      
-        <attribute name="stylesheetfile" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          Specifies the CSS stylesheet file to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="use" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Generate the &amp;quot;use&amp;quot page for each package.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="useexternalfile" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <description>
-          Run javadoc in verbose mode
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Include the version tag in the generated documentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="windowtitle" type="java.lang.String" briefType="String" required="no">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a single source file.
-        </description>
-      
-        </element>
-
-      
-        <element name="taglet" type="org.apache.tools.ant.taskdefs.Javadoc.ExtensionInfo" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a taglet
-        </description>
-      
-        </element>
-
-      
-        <element name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          location of bootstrap class files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="class" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          the classpath to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="">
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, output files should always be written (JDK1.2 only).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="old" type="boolean" briefType="boolean" required="no">
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds path to bootstrap class files.
-        </description>
-      
-        </element>
-
-      
-        <element name="class" type="org.apache.tools.ant.taskdefs.optional.Javah.ClassArgument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds class to process.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <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;">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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;">
-        
-          
-        
-          <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;">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          The output file name.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcespath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Runs the JJTree compiler compiler.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="buildnodefiles" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the BUILD_NODE_FILES grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javacchome" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The directory containing the JavaCC distribution.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="multi" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the MULTI grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodedefaultvoid" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the NODE_DEFAULT_VOID grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodefactory" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the NODE_FACTORY grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodepackage" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets the NODE_PACKAGE grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeprefix" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets the NODE_PREFIX grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodescopehook" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the NODE_SCOPE_HOOK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeusesparser" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the NODE_USES_PARSER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputdirectory" type="java.io.File" briefType="File" 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="static" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the STATIC grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The jjtree grammar file to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="visitor" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets the VISITOR grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="visitorexception" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          If true, run an applet.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          classname to run as standalone or runner for filesets.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exitprompt" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Toggles display of the console prompt: always, error, never
-        </description>
-      
-        </attribute>
-      
-        <attribute name="finalsnapshot" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          The directory where JProbe is installed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javaexe" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          "all", "coverage",  or "none".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="seedname" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          the classnames to execute.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a command argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          classpath to run the files.
-        </description>
-      
-        </element>
-
-      
-        <element name="filters" type="org.apache.tools.ant.taskdefs.optional.sitraka.Filters" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a JVM argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="socket" type="org.apache.tools.ant.taskdefs.optional.sitraka.Socket" briefType="" required="NOTDEFINED">
-        <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">
-        <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">
-
-  
-    
-  
-    <description>
-    Runs the snapshot merge utility for JProbe Coverage.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The directory where JProbe is installed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the output snapshot file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          set the format of the report: "html", "text", or "xml"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The directory where JProbe is installed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includesource" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compiler" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Class name of a JSP compiler adapter.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compilerclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        <description>
-          Java Plugin CLASSID for Internet Explorer
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mapped" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Path for source JSP files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="uribase" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <description>
-          Set the verbose level of the compiler
-        </description>
-      
-        </attribute>
-      
-        <attribute name="webinc" type="java.io.File" briefType="File" required="NOTDEFINED">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a single webapp.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="compilerclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <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.">
-        <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.">
-        <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.">
-        
-          
-        
-          <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.">
-        <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.">
-        
-          
-        
-          <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.">
-        <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">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <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.">
-        <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">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a new single testcase.
-        </description>
-      
-        </element>
-
-      
-        <element name="batchtest" type="org.apache.tools.ant.taskdefs.optional.junit.BatchTest" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds path to classpath used for tests.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keys" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <description>
-          Set the source file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="loadfile" category="utility" classname="org.apache.tools.ant.taskdefs.LoadFile">
-
-  
-    
-  
-    <description>
-    Load a file into a property
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        <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;">
-        
-          
-        
-          <description>
-          If true, fail on load error.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Property name to save to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets the file to load.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add the FilterChain element.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="loadproperties" category="utility" classname="org.apache.tools.ant.taskdefs.LoadProperties">
-
-  
-    
-  
-    <description>
-    Load a file's contents as Ant properties.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets the file to load.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a FilterChain.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mail" category="network" classname="org.apache.tools.ant.taskdefs.email.EmailTask">
-
-  
-    
-  
-    <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="">
-        
-          
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cclist" type="java.lang.String" briefType="String" required="">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Allows the build writer to choose the preferred encoding method
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no.">
-        
-          
-        
-          <description>
-          Indicates whether BuildExceptions should be passed back to the core
-        </description>
-      
-        </attribute>
-      
-        <attribute name="files" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Shorthand to set the from address element
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includefilenames" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Sets Includefilenames attribute
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailhost" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets the host
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailport" type="int" briefType="int" required="no">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Shorthand method to set the message
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagefile" type="java.io.File" briefType="File" required="">
-        
-          
-        
-          <description>
-          Shorthand method to set the message from a file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagemimetype" type="java.lang.String" briefType="String" required="no">
-        <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">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Adds "to" address elements
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bcc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </element>
-
-      
-        <element name="cc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds "cc" address element
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a from address element
-        </description>
-      
-        </element>
-
-      
-        <element name="message" type="org.apache.tools.ant.taskdefs.email.Message" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a message elemnt
-        </description>
-      
-        </element>
-
-      
-        <element name="to" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a to address element
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="manifest" category="java" classname="org.apache.tools.ant.taskdefs.ManifestTask">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        <description>
-          Automatically fix certain errors 
- (those marked as fixable in the manual);, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="list" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Creates listing file for each audited file; 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">
-        
-          
-        
-          <description>
-          Set the maximum memory for the JVM; -mx or -Xmx depending on VM version
-        </description>
-      
-        </attribute>
-      
-        <attribute name="metamatahome" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The home directory containing the Metamata distribution; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Finds declarations unused in search paths; 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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <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">
-        <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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="">
-        
-          
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cclist" type="java.lang.String" briefType="String" required="">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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;">
-        
-          
-        
-          <description>
-          Indicates whether BuildExceptions should be passed back to the core
-        </description>
-      
-        </attribute>
-      
-        <attribute name="files" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a list of files to be attached
-        </description>
-      
-        </attribute>
-      
-        <attribute name="from" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Shorthand to set the from address element
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includefilenames" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets Includefilenames attribute
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailhost" type="java.lang.String" briefType="String" required="no, default to &quot;localhost&quot;">
-        
-          
-        
-          <description>
-          Sets the host
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailport" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-        
-          <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.">
-        
-          
-        
-          <description>
-          Shorthand method to set the message
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagefile" type="java.io.File" briefType="File" required="">
-        
-          
-        
-          <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;">
-        <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">
-        <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.">
-        <description>
-          Adds "to" address elements
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bcc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </element>
-
-      
-        <element name="cc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds "cc" address element
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a from address element
-        </description>
-      
-        </element>
-
-      
-        <element name="message" type="org.apache.tools.ant.taskdefs.email.Message" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a message elemnt
-        </description>
-      
-        </element>
-
-      
-        <element name="to" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a to address element
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mkdir" category="filesystem" classname="org.apache.tools.ant.taskdefs.Mkdir">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the maximum memory for the JVM; -mx or -Xmx depending on VM version
-        </description>
-      
-        </attribute>
-      
-        <attribute name="metamatahome" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The home directory containing the Metamata distribution
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="yes">
-        
-          <description>
-          Set the output XML file
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Sets the character encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets a single source file to copy.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          If true, enables filtering.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatten" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <description>
-          Used to copy empty directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Overwrite any existing destination file(s).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservelastmodified" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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="">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a set of files to copy.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a FilterChain.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterset" type="org.apache.tools.ant.types.FilterSet" briefType="Filterset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a filterset.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        <description>
-          Remove the intermediate Sun JavaCC file; default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugparser" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          set parser debug mode; default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugscanner" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          set scanner debug mode; default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Set the maximum memory for the JVM;  -mx or -Xmx depending on VM version
-        </description>
-      
-        </attribute>
-      
-        <attribute name="metamatahome" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The home directory containing the Metamata distribution; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The .jj file to process; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Set verbose mode; default false
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Create a classpath entry
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Converts files from native encodings to ASCII.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Set the destination directory to place converted files into.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the classpath used for NetRexx compilation
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comments" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          Whether variable cross references are generated
-        </description>
-      
-        </attribute>
-      
-        <attribute name="decimal" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        <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">
-        
-          
-        
-          <description>
-          Whether diagnostic information about the compile is generated
-        </description>
-      
-        </attribute>
-      
-        <attribute name="explicit" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          Whether the compiler text logo is displayed when compiling
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="boolean" briefType="boolean" required="no">
-        <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-          Set the source dir to find the source Java files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictargs" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <description>
-          Tells the NetRexx compile that assignments must match exactly on type
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictcase" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Specifies whether the NetRexx compiler should be case sensitive or not
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictimport" type="boolean" briefType="boolean" required="no">
-        <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">
-        <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">
-        <description>
-          Whether the compiler should force catching of exceptions by explicitly
- named types
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suppressdeprecation" type="boolean" briefType="boolean" required="no">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        
-          
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="utf8" type="boolean" briefType="boolean" required="no">
-        <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        <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">
-        <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-         <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commandlength" type="int" briefType="int" required="NOTDEFINED">
-        <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">
-        <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">
-        
-         <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          files to add
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4change" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Change">
-
-  
-    
-  
-    <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">
-        
-        <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-         <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">
-        
-          
-        
-          <description>
-          Description for ChangeList.
- If none is specified, it will default to "AutoSubmit By Ant"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <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">
-         <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4counter" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter">
-
-  
-    
-  
-    <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">
-        <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        <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">
-        
-          
-        
-          <description>
-          The name of the counter; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="int" briefType="int" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The new value for the counter.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4delete" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Delete">
-
-  
-    
-  
-    <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">
-        <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">
-        
-		<description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        <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">
-        <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4edit" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit">
-
-  <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">
-        <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">
-        
-          
-
-        
-          <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4have" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Have">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4label" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Label">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Label Description.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          When set to "locked", Perforce will lock the label once created.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          The name of the label; default "AntLabel"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="no">
-
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4reopen" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen">
-
-  
-    
-  
-    <description>
-    
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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="no">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tochange" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          The changelist to move files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4revert" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Revert">
-
-  
-    
-  
-    <description>
-    Revert Perforce open files or files in a changelist
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="change" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          The changelist to revert.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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="no">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="revertonlyunchanged" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          flag to revert only unchanged files (p4 revert -a); default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="no">
-                  <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="no">
-		<description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4submit" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          The changelist number to submit; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4sync" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <description>
-          The p4 client spec to use; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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="no">
-        
-          
-        
-          <description>
-          Label to sync client to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The p4d server and port to connect to; default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The p4 username; defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          The client, branch or label view to operate upon; default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="parallel" category="control" classname="org.apache.tools.ant.taskdefs.Parallel">
-
-  
-    
-  
-    <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          flag to create backups; default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no, default is the project&apos;s basedir.">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          <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">
-        
-          
-        
-          <description>
-          The file containing the diff output.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Work silently unless an error occurs; default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="reverse" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <description>
-          Assume patch was created with old and new files swapped; default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strip" type="int" briefType="int" required="no">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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.">
-        
-          
-
-        
-          <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;.    ">
-        
-          
-
-
-        
-          <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.      ">
-        
-          
- "windows", "unix", "netware", or "os/2"; required unless
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Create a nested MAP element
-        </description>
-      
-        </element>
-
-      
-        <element name="path" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Create a nested PATH element
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="property" category="other" classname="org.apache.tools.ant.taskdefs.Property">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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="">
-        
-          
-        
-          <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="">
-        
-          
-        
-          <description>
-          the filename of a property file to load.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="location" type="java.io.File" briefType="File" required="">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          sets the name of the property to set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <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="">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          optional header comment for the file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="pvcs" category="other" classname="org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          The format of the folder names.
- 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">
-        
-          
-        
-          <description>
-          Specifies the value of the force argument.
- 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">
-        
-          
-
-        
-          <description>
-          If set to true the return value from executing the pvcs
- commands are ignored; default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Only files marked with this label are extracted.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="linestart" type="java.lang.String" briefType="String" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Specifies the name of the promotiongroup argument
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pvcsbin" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <description>
-          The project within the PVCS repository to extract files from; default &amp;quot;/&amp;quot;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="repository" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          The network name of the PVCS repository; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="updateonly" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <description>
-          If set to &lt;i&gt;true&lt;/i&gt; files are fetched only if 
- newer than existing local files; default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="workspace" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Workspace to use.  
- 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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Sets the action for the associated recorder entry.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Whether or not the logger should append to a previous file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="emacsmode" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Renames a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets the new name of the file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets whether an existing file should be replaced.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="fromextension" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The string that files must end in to be renamed
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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="">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <description>
-          Set the file encoding to use on the files read and written by the task; defaults to default JVM encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="exactly one of the two.">
-        
-          
-        
-          <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.">
-        
-          
- 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
-
-        
-          <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.">
-        
-          
-        
-          <description>
-          Sets the name of a property file containing filters.
- 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">
-        
-          
- produced, detailing how many token occurrences and files were
-
-        
-          <description>
-          Indicates whether a summary of the replace operation should be
- produced, detailing how many token occurrences and files were
- processed; 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.">
-        
-          
- required unless a nested
- &lt;code&gt;replacetoken&lt;/code&gt; element or the &lt;code&gt;replacefilterfile&lt;/code&gt;
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          list files to apply the replacement to
-        </description>
-      
-        </element>
-
-      
-        <element name="regexp" type="org.apache.tools.ant.types.RegularExpression" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-          <description>
-          Sets the location to store the compiled files
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="no">
-          <description>
-          	Sets the the class to run &lt;code&gt;rmic&lt;/code&gt; against
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          <description>
-          Sets the compiler implementation to use;
- 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">
-        
-          
-        
-          <description>
-          Generate debug info (passes -g to rmic); defaults to false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          
-
-        
-          <description>
-          Sets the extension directories that will be used during the
- compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          indicates whether token filtering should take place; default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="idl" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          pass additional arguments for idl compile
-        </description>
-      
-        </attribute>
-      
-        <attribute name="iiop" type="boolean" briefType="boolean" required="no">
-        
-          
- be generated; optional, defaults to false 
-
-        
-          <description>
-          Indicates that IIOP compatible stubs should
- be generated; defaults to false if not set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="iiopopts" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Set additional arguments for iiop
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeantruntime" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <description>
-          Sets whether or not to include ant's own classpath in this task's 
- classpath. Default is &lt;code&gt;true&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includejavaruntime" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <description>
-          Task's classpath.
- Enables or disables including the default run-time
- libraries from the executing VM; defaults to false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcebase" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          Optional directory to save generated source files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="stubversion" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
- found by the directory match are
-
-        
-          <description>
-          Flag to enable verification so that the classes 
- found by the directory match are
- checked to see if they implement java.rmi.Remote. Defaults to false if not set.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Creates a nested classpath element.
-        </description>
-      
-        </element>
-
-      
-        <element name="compilerarg" type="org.apache.tools.ant.taskdefs.Rmic.ImplementationSpecificArgument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds an implementation specific command line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-    <description>
-    Invokes the rpm tool to build a Linux installation file.
-  </description>
-  
-    <structure>
-    
-      <attributes>
-      
-        <attribute name="cleanbuilddir" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <description>
-          Flag (default=false) to remove 
- the generated files in the BUILD directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="command" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          What command to issue to the rpm tool. The default is "-bb".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="error" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Optional file to save stderr to
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Optional file to save stdout to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="removesource" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <description>
-          Flag (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">
-        
-          
-        
-          <description>
-          Flag (default=false) to remove the spec file from SPECS
-        </description>
-      
-        </attribute>
-      
-        <attribute name="specfile" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          The name of the spec File to use; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="topdir" type="java.io.File" briefType="File" required="no">
-        
-          
-
-        
-          <description>
-          The directory which will have the expected
- subdirectories, SPECS, SOURCES, BUILD, SRPMS. 
- 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">
-
-  
-    
-  
-    <description>
-    Executes a script.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="language" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Defines the language (required).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Load the script from an external file.
-        </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">
-
-  
-    
-  
-    <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          the HTTP/ftp proxy port number; default is 80
-        </description>
-      
-        </attribute>
-      
-        <attribute name="socksproxyhost" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          
-        
-          <description>
-          the alias to sign under; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="internalsf" type="boolean" briefType="boolean" required="no; default false">
-        
-          
-
-        
-          <description>
-          Flag to include the .SF file inside the signature; default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jar" type="java.io.File" briefType="File" required="yes.">
-        
-          
-        
-          <description>
-          The jar file to sign.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keypass" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Password for private key (if different).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keystore" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          Keystore location.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lazy" type="boolean" briefType="boolean" required="no; default false">
-        
-          
- file means a JAR is signed;
-
-        
-          <description>
-          Flag to control whether the presence of a signature
- file means a JAR is signed; default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sectionsonly" type="boolean" briefType="boolean" required="no; default false">
-        
-          
-
-        
-          <description>
-          Flag to compute hash of entire manifest; default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sigfile" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          Name of .SF/.DSA file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="signedjar" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <description>
-          name of signed JAR file; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storepass" type="java.lang.String" briefType="String" required="yes.">
-        
-          
-        
-          <description>
-          password for keystore integrity; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storetype" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          keystore type; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no; default false">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          flag controlling whether to break the build on an error.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="hours" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          hours to add to the sleep time.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="milliseconds" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          milliseconds to add to the sleep time
-        </description>
-      
-        </attribute>
-      
-        <attribute name="minutes" type="int" briefType="int" required="no">
-        
-          
-        
-          <description>
-          minutes to add to the sleep time
-        </description>
-      
-        </attribute>
-      
-        <attribute name="seconds" type="int" briefType="int" required="no">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Proxy port; optional, default 80.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="proxy" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          name of proxy; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="showduration" type="int" briefType="int" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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;">
-        
-          
-
-        
-          <description>
-          Auto commit flag for database connection;
- optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="caching" type="boolean" briefType="boolean" required="no (default=true)">
-        
-          
-        
-          <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)">
-        
-          
-        
-          <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)">
-        
-          
-
-        
-          <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;">
-        
-          
- optional, default &amp;quot;;&amp;quot;
-
- &lt;p&gt;For example, set this to "go" and delimitertype to "ROW" for
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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;">
-        
-          
-
-        
-          <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)">
-        
-          
-
-        
-          <description>
-          Set the output file; 
- optional, defaults to the Ant log.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Sets the password; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="print" type="boolean" briefType="boolean" required="no, default &quot;false&quot;">
-        
-          
-
-        
-          <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)">
-        
-          
-
-        
-          <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;">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the database connection URL; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="userid" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Set the user name for the connection; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="no (no restriction)">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          If true, append output to existing file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="book" type="java.io.File" briefType="File" required="yes">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets the Java class to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Classpath to use, by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The working directory of the process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          If true, execute in a new VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmversion" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Sets the JVM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jar" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The location of the JAR file to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvm" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the command line arguments for the JVM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="loaderconfig" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          A loader configuration to send to stylebook; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Corresponds to -mx or -Xmx depending on VM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="skindirectory" type="java.io.File" briefType="File" required="yes">
-        
-          
-
-        
-          <description>
-          the directory that contains the stylebook skin;
- required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targetdirectory" type="java.io.File" briefType="File" required="yes">
-        
-          
-
-        
-          <description>
-          the destination directory where the documentation is generated;
- required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Long" briefType="long" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a system property.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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>
-
-  
-    
-  
-    <description>
-    Creates a tar archive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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.">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Automates the telnet protocol.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="initialcr" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the tcp port to connect to; default is 23.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="server" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Set the hostname or address of the remote server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Integer" briefType="int" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          destination directory. If null, 
-the parent directory is used instead
-        </description>
-      
-        </attribute>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          optional prefix string
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The property you wish to assign the temporary file to
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suffix" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
- in the format MM/DD/YYYY HH:MM AM &lt;i&gt;or&lt;/i&gt; PM;
-
-        
-          <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.">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Translates text embedded in files using Resource Bundle files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="bundle" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Sets Family name of resource bundle; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundlecountry" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets locale specific country of resource bundle; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundleencoding" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets locale specific language of resource bundle; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundlevariant" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <description>
-          Sets locale specific variant of resource bundle; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destencoding" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets ending token to identify keys; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          
- whether it is newer than the source file as well as the
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets starting token to identify keys; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="todir" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Sets Destination directory; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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.">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the destination directory. File will be unzipped into the
- destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a fileset
-        </description>
-      
-        </element>
-
-      
-        <element name="patternset" type="org.apache.tools.ant.types.PatternSet" briefType="Patternset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a patternset
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="unzip" category="packaging" classname="org.apache.tools.ant.taskdefs.Expand">
-
-  
-    
-  
-    <description>
-    Unzip a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Set the destination directory. File will be unzipped into the
- destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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.">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a fileset
-        </description>
-      
-        </element>
-
-      
-        <element name="patternset" type="org.apache.tools.ant.types.PatternSet" briefType="Patternset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Add a patternset
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="uptodate" category="control" classname="org.apache.tools.ant.taskdefs.UpToDate">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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.">
-        
-          
-
-        
-          <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.">
-        
-          
-
-        
-          <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.">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Nested &amp;lt;srcfiles&amp;gt; element.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          optional flag to export the class files; default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportdebuginfo" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          optional flag to export the debug info; default false.
- debug info
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportresources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          optional flag to export the resource file; default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportsources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          optional flag to export the Java files; default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includes" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          if Overwrite is set, files will be overwritten during export
-        </description>
-      
-        </attribute>
-      
-        <attribute name="remote" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="importclasses" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Flag to import .class files; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="importresources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Import .java files; optional, default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="project" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          The VisualAge for Java Project name to import into.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="remote" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the local path.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set behaviour recursive or non-recursive
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Performs CheckIn commands to Microsoft Visual SourceSafe.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the local path.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
- 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;
-
-        
-          <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">
-        
-          
- 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;
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the local path.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
- 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;
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Sets/clears quiet mode; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
- 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;
-
-        
-          <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">
-        
-          
- 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;
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Flag to suppress output when true ; false by default.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
- 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;
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <description>
-    Performs History commands to Microsoft Visual SourceSafe.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dateformat" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the Start Label; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the output file name for the history; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Specify the output style; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="todate" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the End Label ; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the check every time unit
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxwait" type="long" briefType="long" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the max wait time unit
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeoutproperty" type="java.lang.String" briefType="String" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add an &amp;lt;available&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="checksum" type="org.apache.tools.ant.taskdefs.Checksum" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Add a &amp;lt;socket&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="uptodate" type="org.apache.tools.ant.taskdefs.UpToDate" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Directory from which to archive files; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          add files under WEB-INF/classes
-        </description>
-      
-        </element>
-
-      
-        <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest" briefType="" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="lib" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          add files under WEB-INF/lib/
-        </description>
-      
-        </element>
-
-      
-        <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          files to add under WEB-INF;
-        </description>
-      
-        </element>
-
-      
-        <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          Set the directory containing the source jsp's
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="java.lang.String" briefType="String" required="yes">
-        
-          
-        
-          <description>
-          Set the package under which the compiled classes go
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <description>
-          Additional argument string passed to the Weblogic instance;
- optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="beahome" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the Domain to run in; required for WL6.0
-        </description>
-      
-        </attribute>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Set the additional arguments to pass to the weblogic JVM
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
- used to control the weblogic instance;
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
- optional, and only applicable to WL4.5.1
-
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Add the classpath for the user classes
-        </description>
-      
-        </element>
-
-      
-        <element name="wlclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <description>
-          Name of the file to generate. Required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extraoptions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Should failure halt the build? optional, default=true
-        </description>
-      
-        </attribute>
-      
-        <attribute name="language" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <description>
-          namespace to place  the source in.
- optional; default ""
-        </description>
-      
-        </attribute>
-      
-        <attribute name="server" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          
-
-        
-          <description>
-          flag to enable server side code generation;
- optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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.">
-        
-          
-
-        
-          <description>
-          flag to treat attributes as nested elements;
- optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="yes">
-        
-          
-        
-          <description>
-          The XML file to parse; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keeproot" type="boolean" briefType="boolean" required="no, default is true.">
-        
-          
- first value in the property name; optional, 
-
-        
-          <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">
-        
-          
-        
-          <description>
-          the prefix to prepend to each property
-        </description>
-      
-        </attribute>
-      
-        <attribute name="validate" type="boolean" briefType="boolean" required="no, default is false.">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Where to find the parser class; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          
- optional, default=true
- &lt;p&gt;
-
-        
-          <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">
-        
-          
-        
-          <description>
-          specify the file to be checked; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lenient" type="boolean" briefType="boolean" required="no">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          
-        </description>
-      
-        </element>
-
-      
-        <element name="dtd" type="org.apache.tools.ant.types.DTDLocation" briefType="" required="NOTDEFINED">
-        
-          
-        
-          <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">
-
-  
-    
-  
-    <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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.">
-        
-          
- files should be copied to; 
- required, unless &lt;tt&gt;in&lt;/tt&gt; and &lt;tt&gt;out&lt;/tt&gt; are
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <description>
-          Add the catalog to our internal catalog
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <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">
-    
-    <description>
-    Create a Zip file.
-  </description>
-    <structure>
-      <attributes>
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-          
-          <description>
-          Directory from which to archive files; optional.
-        </description>
-        </attribute>
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <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">
-        
-          
-        
-          <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">
-        
-          
-
-        
-          <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">
-        
-          
-
-        
-          <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">
-		<description>
-          If true, emulate Sun's jar utility by not adding parent directories; defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="update" type="boolean" briefType="boolean" required="no">
-        
-          
-
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; 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">
-        
-          
-        
-          <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">
-        
-          
-        
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        <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">
-    
-    <description>
-		Ant target that is executable and may depend on other targets. 
-	</description>
-	<structure>
-		<attributes>
-			<attribute name="name" required="yes">
-				
-				<description>the name of the target.</description>
-			</attribute>
-			<attribute name="depends" required="no">
-				
-				<description>a comma-separated list of names of targets on which this target depends.</description>
-			</attribute>
-			<attribute name="if" required="no">
-				
-				<description>the name of the property that must be set in order for this target to execute.</description>
-			</attribute>
-			<attribute name="unless" required="no">
-				
-				<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">
-				
-				<description>a short description of this target's function.</description>
-			</attribute>
-		</attributes>
-	</structure>
-  </task>
-  
-  <task name="macrodef">
-    
-    <description>
-		This defines a new task using a sequential nested task as a template. Nested elements attribute and element are used to specify attributes and elements of the new task. These get substituted into the sequential task when the new task is run. 
-		Since Ant 1.6.0.
-	</description>
-	<structure>
-		<attributes>
-			<attribute name="name" required="yes">
-				
-				<description>The name of the new definition.</description>
-			</attribute>
-			<attribute name="uri" required="no">
-				
-				<description>The uri that this definition should live in.</description>
-			</attribute>
-		</attributes>
-		
-		<elements>
-      
-        <element name="attribute" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <description>
-          This is used to specify attributes of the new task. The values of the attributes get substituted into the templated task. The attributes will be required attributes unless a default value has been set. 
-
-This attribute is placed in the body of the templated task using a notation similar to the ant property notation - @{attribute name}. (May be remembered as "put the substitution AT this location"). The escape sequence @@{x} is used to allow @{x} to be placed in the text without substitution of x. This corresponds to the $${x} escape sequence for properties 
-
-
-        </description>
-      
-        </element>
-
-        <element name="element" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <description>
-          This is used to specify nested elements of the new task. The contents of the nested elements of the task instance are placed in the templated task at the tag name.
-        </description>
-      
-        </element>
-		</elements>
-	</structure>
-  </task>
-  
-  <task name="import">  
-    <description>
-		Imports another build file into the current project. 
-		Since Ant 1.6.0.
-	</description>
-	<structure>
-		<attributes>
-			<attribute name="file" required="yes">
-				<description>The file to import.</description>
-			</attribute>
-			<attribute name="optional" required="no">
-				<description>If true, do not issue stop the build if the file does not exist. Default is false.</description>
-			</attribute>
-		</attributes>
-	</structure>
-  </task>
-  
-   <task name="presetdef">  
-    <description>
-	The preset definition generates a new definition based on a current definition with some attributes or elements preset. 
-		Since Ant 1.6.0.
-	</description>
-	<structure>
-		<attributes>
-			<attribute name="name" required="yes">
-				<description>The name of the new definition.</description>
-			</attribute>
-			<attribute name="uri" required="no">
-				<description>The uri that this definition should live in.</description>
-			</attribute>
-		</attributes>
-	</structure>
-  </task>
- 
-</tasks>
-

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/AntDTDMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/AntDTDMessages.java
deleted file mode 100644
index eaea1b6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntDTDMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/dtd/AntDTDMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/AntDTDMessages.properties
deleted file mode 100644
index 0e5cf69..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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/internal/ui/dtd/IAtom.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IAtom.java
deleted file mode 100644
index f199401..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/IAttribute.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IAttribute.java
deleted file mode 100644
index f1cf4dc..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/IDfm.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IDfm.java
deleted file mode 100644
index ee79243..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/IElement.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IElement.java
deleted file mode 100644
index f42ce66..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IElement.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
- *		IBM Corporation - fix for Bug 40951
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.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 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/internal/ui/dtd/IModel.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/IModel.java
deleted file mode 100644
index 7ed0911..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd;
-
-import org.eclipse.ant.internal.ui.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/internal/ui/dtd/ISchema.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/ISchema.java
deleted file mode 100644
index 787b166..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/ParseError.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/ParseError.java
deleted file mode 100644
index ef0f209..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/Parser.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/Parser.java
deleted file mode 100644
index 3ff2ef8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/Parser.java
+++ /dev/null

@@ -1,200 +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.internal.ui.dtd;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.ant.internal.ui.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 = getXMLReader();
-			DeclHandler handler = factory;
-			parser.setProperty("http://xml.org/sax/properties/declaration-handler", handler); //$NON-NLS-1$
-			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();
-	}
-	
-	private XMLReader getXMLReader() throws ParseError {
-		SAXParser parser = null;
-		try {
-			parser = SAXParserFactory.newInstance().newSAXParser();
-			return parser.getXMLReader();
-		} catch (ParserConfigurationException e) {
-			throw new ParseError(e.getMessage());
-		} catch (SAXException e) {
-			throw new ParseError(e.getMessage());
-		}
-	}
-	
-	/**
-	 * 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 ISchema 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();
-		}
-
-		/* (non-Javadoc)
-		 * @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) {
-			if (publicId.equals(INTERNAL) && systemId.equals(INTERNAL))
-				return new InputSource(reader);
-			return null;
-		}
-	}	
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/AntDTDSchemaMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/AntDTDSchemaMessages.java
deleted file mode 100644
index 71bed9f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.schema;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntDTDSchemaMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/dtd/schema/AntDTDSchemaMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/AntDTDSchemaMessages.properties
deleted file mode 100644
index 2d0c0b7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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/internal/ui/dtd/schema/Atom.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Atom.java
deleted file mode 100644
index dbd5aba..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.schema;
-
-import org.eclipse.ant.internal.ui.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/internal/ui/dtd/schema/Attribute.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Attribute.java
deleted file mode 100644
index c582846..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.schema;
-
-import org.eclipse.ant.internal.ui.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.internal.ui.dtd.IAttribute#getType()
-	 */
-	public String getType() {
-		return fType;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IAttribute#getEnum()
-	 */
-	public String[] getEnum() {
-		return fEnum;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IAttribute#getElement()
-	 */
-	public IElement getElement() {
-		return fElement;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IAttribute#getDefault()
-	 */
-	public String getDefault() {
-		return fDefault;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IAttribute#isFixed()
-	 */
-	public boolean isFixed() {
-		return fFixed;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.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 enumeration.
-	 * @param enumeration The enumeration to set
-	 */
-	public void setEnum(String[] enumeration) {
-		fEnum = enumeration;
-	}
-
-	/**
-	 * 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/internal/ui/dtd/schema/Dfm.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Dfm.java
deleted file mode 100644
index cdd20ed..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Dfm.java
+++ /dev/null

@@ -1,170 +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.internal.ui.dtd.schema;
-
-import org.eclipse.ant.internal.ui.dtd.IAtom;
-import org.eclipse.ant.internal.ui.dtd.IDfm;
-import org.eclipse.ant.internal.ui.dtd.util.Factory;
-import org.eclipse.ant.internal.ui.dtd.util.FactoryObject;
-import org.eclipse.ant.internal.ui.dtd.util.MapHolder;
-import org.eclipse.ant.internal.ui.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 org.eclipse.ant.internal.ui.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);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.FactoryObject#next()
-	 */
-	public FactoryObject next() {
-		return fNext;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.FactoryObject#next(org.eclipse.ant.internal.ui.dtd.util.FactoryObject)
-	 */
-	public void next(FactoryObject obj) {
-		fNext = (Dfm) obj;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IDfm#isAny()
-	 */
-	public boolean isAny() {
-		return any;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IDfm#isEmpty()
-	 */
-	public boolean isEmpty() {
-		return empty;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IDfm#getAtom(java.lang.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];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IDfm#advance(java.lang.String, java.lang.String)
-	 */
-	public IDfm advance(String namespace, String localname) {
-		// no namespace support here
-		return advance(localname);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Element.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Element.java
deleted file mode 100644
index 3e66d05..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Element.java
+++ /dev/null

@@ -1,179 +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
- *		IBM Corporation - fix for Bug 40951
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.dtd.schema;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.internal.ui.dtd.IAttribute;
-import org.eclipse.ant.internal.ui.dtd.IDfm;
-import org.eclipse.ant.internal.ui.dtd.IElement;
-import org.eclipse.ant.internal.ui.dtd.IModel;
-import org.eclipse.ant.internal.ui.dtd.ParseError;
-
-public class Element extends Atom implements IElement {
-	private boolean fUndefined = true;
-	private boolean fText;
-	private IModel fModel;
-	private Map 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 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.internal.ui.dtd.IElement#getAttributes()
-	 */
-	public Map getAttributes() {
-		return fMap;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.IElement#isMixed()
-	 */
-	public IModel getContentModel() {
-		return fModel;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.dtd.IElement#isText()
-	 */
-	public boolean isText() {
-		return fText;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.dtd.IElement#isUndefined()
-	 */
-	public boolean isUndefined() {
-		return fUndefined;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.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);
-			} 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.internal.ui.dtd.IElement#isAny()
-	 */
-	public boolean isAny() {
-		return fAny;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.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/internal/ui/dtd/schema/Model.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java
deleted file mode 100644
index a8d056b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Model.java
+++ /dev/null

@@ -1,247 +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.internal.ui.dtd.schema;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.dtd.IAtom;
-import org.eclipse.ant.internal.ui.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);
-		}
-		
-		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.internal.ui.dtd.IModel#getKind()
-	 */
-	public int getKind() {
-		return 0;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.dtd.IModel#getMinOccurs()
-	 */
-	public int getMinOccurs() {
-		return fMin;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.dtd.IModel#getMaxOccurs()
-	 */
-	public int getMaxOccurs() {
-		return fMax;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.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.internal.ui.dtd.IModel#getLeaf()
-	 */
-	public IAtom getLeaf() {
-		return fLeaf;
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.dtd.IModel#getOperator()
-	 */
-	public String getOperator() {
-		return fOps[fKind];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.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.internal.ui.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.internal.ui.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/internal/ui/dtd/schema/Nfm.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Nfm.java
deleted file mode 100644
index f90588c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.schema;
-
-import org.eclipse.ant.internal.ui.dtd.IAtom;
-import org.eclipse.ant.internal.ui.dtd.util.Factory;
-import org.eclipse.ant.internal.ui.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
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.FactoryObject#next()
-	 */
-	public FactoryObject next() {
-		return fNext;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.FactoryObject#next(org.eclipse.ant.internal.ui.dtd.util.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/internal/ui/dtd/schema/NfmNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmNode.java
deleted file mode 100644
index 9fe7ab6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.schema;
-
-import org.eclipse.ant.internal.ui.dtd.IAtom;
-import org.eclipse.ant.internal.ui.dtd.util.Factory;
-import org.eclipse.ant.internal.ui.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
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.FactoryObject#next()
-	 */
-	public FactoryObject next() {
-		return next;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.FactoryObject#next(org.eclipse.ant.internal.ui.dtd.util.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/internal/ui/dtd/schema/NfmParser.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java
deleted file mode 100644
index 3d8ef46..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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.internal.ui.dtd.ParseError;
-import org.eclipse.ant.internal.ui.dtd.util.SortedMap;
-import org.eclipse.ant.internal.ui.dtd.util.SortedMapFactory;
-
-/**
- * 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) 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();
-					}
-					SortedMapFactory.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(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/internal/ui/dtd/schema/Schema.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/Schema.java
deleted file mode 100644
index e9e5770..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.schema;
-
-import java.util.HashMap;
-
-import org.eclipse.ant.internal.ui.dtd.IElement;
-import org.eclipse.ant.internal.ui.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.internal.ui.dtd.ISchema#getElement(java.lang.String)
-	 */
-	public IElement getElement(String qname) {
-		return (IElement) fElementMap.get(qname);
-	}
-
-	/**
-	 * @see org.eclipse.ant.internal.ui.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 e the Exception
-	 */
-	public void setErrorException(Exception e) {
-		fErrorException = e;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.ISchema#getErrorException()
-	 */
-	public Exception getErrorException() {
-		return fErrorException;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java
deleted file mode 100644
index 253e4a1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java
+++ /dev/null

@@ -1,285 +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
- *      IBM Corporation - Fix for bug 40951
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.dtd.schema;
-
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import org.eclipse.ant.internal.ui.dtd.IModel;
-import org.eclipse.ant.internal.ui.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) {
-		Element element = getElement(eName);
-		Attribute attr = (Attribute) element.getAttributes().get(aName);
-		if (attr == null) {
-			attr = new Attribute(aName, element);
-			element.addAttribute(attr);
-			
-			String[] enumeration = null;
-			if (fTypes.contains(type))
-				attr.setType(type);
-			else if (type.startsWith("NOTATION")) //$NON-NLS-1$
-				enumeration = parseValues(type.substring("NOTATION".length()+1), ','); //$NON-NLS-1$
-			else {
-			    type = stripSurroundingParentheses(type);
-				enumeration = parseValues(type, '|');
-			}
-			attr.setEnum(enumeration);
-			
-			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 {
-			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$
-		}
-
-		boolean ortext = model.startsWith("(#PCDATA|"); //$NON-NLS-1$
-		if (ortext) {
-			fPos = 8; //"(#PCDATA".length()			
-		} else {
-			fPos = 0;
-		}
-		IModel 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) {
-	}
-
-	/**
-	 * @see org.xml.sax.ext.DeclHandler#internalEntityDecl(java.lang.String, java.lang.String)
-	 */
-	public void internalEntityDecl(String name, String value) {
-	}
-
-	public void setErrorException(Exception e) {
-		fErrorException = e;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.java
deleted file mode 100644
index 09b032a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.util;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntDTDUtilMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/dtd/util/AntDTDUtilMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/AntDTDUtilMessages.properties
deleted file mode 100644
index 9f6b4ac..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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/internal/ui/dtd/util/Factory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/Factory.java
deleted file mode 100644
index a1de9c9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/util/FactoryObject.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/FactoryObject.java
deleted file mode 100644
index b04c20b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/util/IKeyHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IKeyHolder.java
deleted file mode 100644
index f029984..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/util/IMapHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IMapHolder.java
deleted file mode 100644
index 14c51a8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.dtd.util;
-
-/**
- * @author Bob Foster
- */
-public interface IMapHolder extends IKeyHolder, IValueHolder {
-
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IValueHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/IValueHolder.java
deleted file mode 100644
index 9ab42d8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/util/MapHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/MapHolder.java
deleted file mode 100644
index 8093b8b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/MapHolder.java
+++ /dev/null

@@ -1,48 +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.internal.ui.dtd.util;
-
-/**
- * @author Bob Foster
- */
-public class MapHolder extends SortedMapFactory implements IMapHolder {
-
-	public Object[] keys;
-	public Object[] values;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.IKeyHolder#getKeys()
-	 */
-	public Object[] getKeys() {
-		return keys;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.IKeyHolder#setKeys(java.lang.Object[])
-	 */
-	public void setKeys(Object[] keys) {
-		this.keys = keys;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.IValueHolder#getValues()
-	 */
-	public Object[] getValues() {
-		return values;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.dtd.util.IValueHolder#setValues(java.lang.Object[])
-	 */
-	public void setValues(Object[] values) {
-		this.values = values;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java
deleted file mode 100644
index 7dbc060..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/util/SortedMapFactory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMapFactory.java
deleted file mode 100644
index b887566..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/dtd/util/SortedSet.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedSet.java
deleted file mode 100644
index c1dfebe..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedSet.java
+++ /dev/null

@@ -1,260 +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.internal.ui.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;
-		}
-		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/internal/ui/editor/AbstractAntSourceViewerConfiguration.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AbstractAntSourceViewerConfiguration.java
deleted file mode 100644
index e29765d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AbstractAntSourceViewerConfiguration.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor;
-
-import org.eclipse.ant.internal.ui.editor.text.AntEditorPartitionScanner;
-import org.eclipse.ant.internal.ui.editor.text.AntEditorProcInstrScanner;
-import org.eclipse.ant.internal.ui.editor.text.AntEditorTagScanner;
-import org.eclipse.ant.internal.ui.editor.text.IAntEditorColorConstants;
-import org.eclipse.ant.internal.ui.editor.text.MultilineDamagerRepairer;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-
-public abstract class AbstractAntSourceViewerConfiguration extends SourceViewerConfiguration {
-
-	private AntEditorTagScanner tagScanner;
-    private AntEditorProcInstrScanner instructionScanner;
-	private MultilineDamagerRepairer damageRepairer;
-	
-	private AntEditorProcInstrScanner getDefaultScanner() {
-	    if (instructionScanner == null) {
-	        instructionScanner = new AntEditorProcInstrScanner();
-	    }
-	    return instructionScanner;
-	}
-
-	private AntEditorTagScanner getTagScanner() {
-	    if (tagScanner == null) {
-	        tagScanner = new AntEditorTagScanner();
-	    }
-	    return tagScanner;
-	}
-
-	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-	    PresentationReconciler reconciler = new PresentationReconciler();
-	
-		MultilineDamagerRepairer dr = new MultilineDamagerRepairer(getDefaultScanner(), null);
-	    reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-	    reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-	
-	    dr = new MultilineDamagerRepairer(getTagScanner(), null);
-	    reconciler.setDamager(dr, AntEditorPartitionScanner.XML_TAG);
-	    reconciler.setRepairer(dr, AntEditorPartitionScanner.XML_TAG);
-	
-		damageRepairer= new MultilineDamagerRepairer(null,
-	            new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.XML_COMMENT_COLOR)));
-	    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() {
-		if (tagScanner == null) {
-			return; //property change before the editor is fully created
-		}
-		tagScanner.adaptToColorChange();
-		instructionScanner.adaptToColorChange();
-				   
-		damageRepairer.setDefaultTextAttribute(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.XML_COMMENT_COLOR)));				  
-	}
-
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-	    return new String[] {
-	        IDocument.DEFAULT_CONTENT_TYPE,
-	        AntEditorPartitionScanner.XML_COMMENT,
-	        AntEditorPartitionScanner.XML_TAG };
-	}
-
-	public int getTabWidth(ISourceViewer sourceViewer) {
-		return AntUIPlugin.getDefault().getPreferenceStore().getInt(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntAutoIndentStrategy.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntAutoIndentStrategy.java
deleted file mode 100644
index 61cfdfd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntAutoIndentStrategy.java
+++ /dev/null

@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor;
-import org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultAutoIndentStrategy;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-
-/**
- * Auto indent strategy for Ant build files
- */
-public class AntAutoIndentStrategy extends DefaultAutoIndentStrategy {
-	
-	private AntModel fModel;
-	private int fAccumulatedChange= 0;
-	
-	public AntAutoIndentStrategy(AntModel model) {
-		fModel= model;
-	}
-	
-	/**
-	 * Sets the indentation based on the Ant element node that contains the offset
-	 * of the document command.
-	 *
-	 * @param d the document to work on
-	 * @param c the command to deal with
-	 */
-	private synchronized void autoIndentAfterNewLine(IDocument d, DocumentCommand c) {
-		
-		if (c.offset == -1 || d.getLength() == 0 || fModel.getProjectNode(false) == null) {
-			return;
-		}
-		
-		int position= (c.offset == d.getLength() ? c.offset  - 1 : c.offset);
-		AntElementNode node= fModel.getProjectNode(false).getNode(position - fAccumulatedChange);
-		if (node == null) {
-			return;
-		}
-		StringBuffer buf= new StringBuffer(c.text);
-		buf.append(XmlDocumentFormatter.getLeadingWhitespace(node.getOffset(), d));
-		if (!nextNodeIsEndTag(c.offset, d)) {
-			buf.append(XmlDocumentFormatter.createIndent());
-		}
-		
-		fAccumulatedChange+= buf.length();
-		c.text= buf.toString();
-	}
-	
-	private boolean nextNodeIsEndTag(int offset, IDocument document) {
-		if (offset + 1 > document.getLength()) {
-			return false;
-		}
-		try {
-			String nextChars= document.get(offset, 2).trim();
-			if ("</".equals(nextChars) || "/>".equals(nextChars)) { //$NON-NLS-1$ //$NON-NLS-2$
-				return true;
-			}
-		} catch (BadLocationException e) {
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.DocumentCommand)
-	 */
-	public void customizeDocumentCommand(IDocument d, DocumentCommand c) {
-		
-		if (c.length == 0 && c.text != null && isLineDelimiter(d, c.text)) {
-			autoIndentAfterNewLine(d, c);
-		} else if (c.text.length() > 1) {
-			smartPaste(d, c);
-		}
-	}
-	
-	 private boolean isLineDelimiter(IDocument document, String text) {
-		String[] delimiters= document.getLegalLineDelimiters();
-		if (delimiters != null)
-			return TextUtilities.equals(delimiters, text) > -1;
-		return false;
-	}
-	
-	public synchronized void reconciled() {
-		fAccumulatedChange= 0;
-	}
-	
-	private void smartPaste(IDocument document, DocumentCommand command) {
-		try {
-			if (command.offset == -1 || document.getLength() == 0 || fModel.getProjectNode(false) == null) {
-				return;
-			}
-			String origChange= command.text;
-			int position= (command.offset == document.getLength() ? command.offset  - 1 : command.offset);
-			AntElementNode node= fModel.getProjectNode(false).getNode(position - fAccumulatedChange);
-			if (node == null) {
-				return;
-			}
-			
-			// eat any WS before the insertion to the beginning of the line
-			int firstLine= 1; // don't format the first line if it has other content before it
-			IRegion line= document.getLineInformationOfOffset(command.offset);
-			String notSelected= document.get(line.getOffset(), command.offset - line.getOffset());
-			if (notSelected.trim().length() == 0) {
-				command.length += notSelected.length();
-				command.offset= line.getOffset();
-				firstLine= 0;
-			}
-			
-			// handle the indentation computation inside a temporary document
-			Document temp= new Document(command.text);
-			
-			// indent the first and second line
-			// compute the relative indentation difference from the second line
-			// (as the first might be partially selected) and use the value to
-			// indent all other lines.
-			boolean isIndentDetected= false;
-			StringBuffer addition= new StringBuffer();
-			int insertLength= 0;
-			int lines= temp.getNumberOfLines();
-			for (int l= firstLine; l < lines; l++) { // we don't change the number of lines while adding indents
-				
-				IRegion r= temp.getLineInformation(l);
-				int lineOffset= r.getOffset();
-				int lineLength= r.getLength();
-				
-				if (lineLength == 0) { // don't modify empty lines
-					continue;
-				}
-				
-				if (!isIndentDetected){
-					
-					// indent the first pasted line
-					StringBuffer current= XmlDocumentFormatter.getLeadingWhitespace(lineOffset, temp);
-					StringBuffer correct= XmlDocumentFormatter.getLeadingWhitespace(node.getOffset(), document);
-					correct.append(XmlDocumentFormatter.createIndent());
-					
-					insertLength= subtractIndent(correct, current, addition);
-					isIndentDetected= true;
-				}
-				
-				// relatively indent all pasted lines 
-				if (insertLength > 0) {
-					addIndent(temp, l, addition);
-				} else if (insertLength < 0) {
-					cutIndent(temp, l, -insertLength);
-				}	
-			}
-			
-			// modify the command
-			if (!origChange.equals(temp.get())) {
-				fAccumulatedChange+=  temp.getLength() - command.text.length();
-				command.text= temp.get();
-			}
-			
-		} catch (BadLocationException e) {
-			AntUIPlugin.log(e);
-		}
-	}
-	
-	/**
-	 * Indents line <code>line</code> in <code>document</code> with <code>indent</code>.
-	 * Leaves leading comment signs alone.
-	 * 
-	 * @param document the document
-	 * @param line the line
-	 * @param indent the indentation to insert
-	 * @throws BadLocationException on concurrent document modification
-	 */
-	private void addIndent(Document document, int line, CharSequence indent) throws BadLocationException {
-		IRegion region= document.getLineInformation(line);
-		int insert= region.getOffset();
-		
-		// insert indent
-		document.replace(insert, 0, indent.toString());
-	}
-	
-	/**
-	 * Cuts the visual equivalent of <code>toDelete</code> characters out of the
-	 * indentation of line <code>line</code> in <code>document</code>. Leaves
-	 * leading comment signs alone.
-	 * 
-	 * @param document the document
-	 * @param line the line
-	 * @param toDelete the number of space equivalents to delete.
-	 * @throws BadLocationException on concurrent document modification
-	 */
-	private void cutIndent(Document document, int line, int toDelete) throws BadLocationException {
-		IRegion region= document.getLineInformation(line);
-		int from= region.getOffset();
-		int endOffset= region.getOffset() + region.getLength();
-		
-		int to= from;
-		while (toDelete > 0 && to < endOffset) {
-			char ch= document.getChar(to);
-			if (!Character.isWhitespace(ch))
-				break;
-			toDelete -= computeVisualLength(ch);
-			if (toDelete >= 0) {
-				to++;
-			} else {
-				break;
-			}
-		}
-		
-		document.replace(from, to - from, null);
-	}
-	
-	/**
-	 * Returns the visual length of a given character taking into
-	 * account the visual tabulator length.
-	 * 
-	 * @param ch the character to measure
-	 * @return the visual length of <code>ch</code>
-	 */
-	private int computeVisualLength(char ch) {
-		if (ch == '\t') {
-			return getVisualTabLengthPreference();
-		} 
-			
-		return 1;
-	}
-	
-	/**
-	 * Returns the visual length of a given <code>CharSequence</code> taking into
-	 * account the visual tabulator length.
-	 * 
-	 * @param seq the string to measure
-	 * @return the visual length of <code>seq</code>
-	 */
-	private int computeVisualLength(CharSequence seq) {
-		int size= 0;
-		int tablen= getVisualTabLengthPreference();
-		
-		for (int i= 0; i < seq.length(); i++) {
-			char ch= seq.charAt(i);
-			if (ch == '\t') {
-				size += tablen - size % tablen;
-			} else {
-				size++;
-			}
-		}
-		return size;
-	}
-	
-	/**
-	 * Computes the difference of two indentations and returns the difference in
-	 * length of current and correct. If the return value is positive, <code>addition</code>
-	 * is initialized with a substring of that length of <code>correct</code>.
-	 * 
-	 * @param correct the correct indentation
-	 * @param current the current indentation (migth contain non-whitespace)
-	 * @param difference a string buffer - if the return value is positive, it will be cleared and set to the substring of <code>current</code> of that length
-	 * @return the difference in lenght of <code>correct</code> and <code>current</code> 
-	 */
-	private int subtractIndent(CharSequence correct, CharSequence current, StringBuffer difference) {
-		int c1= computeVisualLength(correct);
-		int c2= computeVisualLength(current);
-		int diff= c1 - c2;
-		if (diff <= 0) {
-			return diff;
-		}
-		
-		difference.setLength(0);
-		int len= 0, i= 0;
-		while (len < diff) {
-			char c= correct.charAt(i++);
-			difference.append(c);
-			len += computeVisualLength(c);
-		}
-		
-		return diff;
-	}
-	
-	/**
-	 * The preference setting for the visual tabulator display.
-	 *  
-	 * @return the number of spaces displayed for a tabulator in the editor
-	 */
-	private static int getVisualTabLengthPreference() {
-		return AntUIPlugin.getDefault().getPreferenceStore().getInt(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java
deleted file mode 100644
index 22286e3..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntCompletionProposal.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-public class AntCompletionProposal implements ICompletionProposal, ICompletionProposalExtension2 {
-
-	public static final int TAG_CLOSING_PROPOSAL= 0;
-	public static final int TASK_PROPOSAL= 1;
-	public static final int PROPERTY_PROPOSAL= 2;
-	
-	/** The string to be displayed in the completion proposal popup */
-	private String fDisplayString;
-	/** The replacement string */
-	private String fReplacementString;
-	/** The replacement offset */
-	private int fReplacementOffset;
-	/** The replacement length */
-	private int fReplacementLength;
-	/** The cursor position after this proposal has been applied */
-	private int fCursorPosition;
-	/** The image to be displayed in the completion proposal popup */
-	private Image fImage;
-	/** The additional info of this proposal */
-	private String fAdditionalProposalInfo;
-	
-	private int fType;
-	
-	/**
-	 * Creates a new Ant completion proposal. All fields are initialized based on the provided information.
-	 *
-	 * @param replacementString the actual string to be inserted into the document
-	 * @param replacementOffset the offset of the text to be replaced
-	 * @param replacementLength the length of the text to be replaced
-	 * @param cursorPosition the position of the cursor following the insert relative to replacementOffset
-	 * @param image the image to display for this proposal
-	 * @param displayString the string to be displayed for the proposal
-	 * @param additionalProposalInfo the additional information associated with this proposal
-	 * @param type the type of this proposal
-	 */
-	public AntCompletionProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image, String displayString, String additionalProposalInfo, int type) {
-		fReplacementString= replacementString;
-		fReplacementOffset= replacementOffset;
-		fReplacementLength= replacementLength;
-		fCursorPosition= cursorPosition;
-		fImage= image;
-		fDisplayString= displayString;
-		fAdditionalProposalInfo= additionalProposalInfo;
-		fType= type;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer, char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		apply(viewer.getDocument());
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer, boolean)
-	 */
-	public void selected(ITextViewer viewer, boolean smartToggle) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
-	public void unselected(ITextViewer viewer) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
-	 */
-	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-		String enteredText= ""; //$NON-NLS-1$
-		try {
-			enteredText = document.get(fReplacementOffset, offset-fReplacementOffset);
-		} catch (BadLocationException e) {
-		}
-		int enteredLength= enteredText.length(); 
-		if (fType == TASK_PROPOSAL && enteredText.startsWith("<")) { //$NON-NLS-1$
-			enteredText= enteredText.substring(1);
-		} else if (fType == PROPERTY_PROPOSAL) {
-			if(enteredText.startsWith("${")) { //$NON-NLS-1$
-				enteredText= enteredText.substring(2);
-			}
-			if(enteredText.startsWith("$")) { //$NON-NLS-1$
-				enteredText= enteredText.substring(1);
-			}	
-		} else if (fType == TAG_CLOSING_PROPOSAL) {
-			if (enteredText.startsWith("</")) { //$NON-NLS-1$
-				enteredText= enteredText.substring(2);
-			} else if (enteredText.startsWith("/")) {  //$NON-NLS-1$
-				try {
-					if (document.getChar(fReplacementOffset - 1) == '<') {
-						enteredText= enteredText.substring(1);
-					}
-				} catch (BadLocationException e) {
-				}
-			} else if (enteredText.startsWith("<")) { //$NON-NLS-1$
-				enteredText= enteredText.substring(1);
-			}
-		}
-		boolean valid= fDisplayString.toLowerCase().startsWith(enteredText.toLowerCase());
-		if (valid) {
-			fReplacementLength= enteredLength;
-		}
-		return valid;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
-	 */
-	public void apply(IDocument document) {
-		try {
-			document.replace(fReplacementOffset, fReplacementLength, fReplacementString);
-		} catch (BadLocationException x) {
-			// ignore
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		return new Point(fReplacementOffset + fCursorPosition, 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return fAdditionalProposalInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		if (fDisplayString != null){
-			return fDisplayString;
-		}
-		return fReplacementString;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getDisplayString();
-	}
-
-	/**
-	 * @return Returns the type of the completion proposal
-	 */
-	public int getType() {
-		return fType;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java
deleted file mode 100644
index ec44c23..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java
+++ /dev/null

@@ -1,850 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- * 	   John-Mason P. Shackelford - bug 40255
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor;
-
-import java.util.ResourceBundle;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntEditorContentOutlinePage;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.outline.XMLCore;
-import org.eclipse.ant.internal.ui.editor.text.AnnotationAccess;
-import org.eclipse.ant.internal.ui.editor.text.AntEditorDocumentProvider;
-import org.eclipse.ant.internal.ui.editor.text.IAntEditorColorConstants;
-import org.eclipse.ant.internal.ui.editor.text.IReconcilingParticipant;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultLineTracker;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoIndentStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ILineTracker;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.source.IAnnotationAccess;
-import org.eclipse.jface.text.source.IOverviewRuler;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.ui.texteditor.ChainedPreferenceStore;
-import org.eclipse.ui.texteditor.ContentAssistAction;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.IEditorStatusLine;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.TextOperationAction;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * The actual editor implementation for Eclipse's Ant integration.
- */
-public class AntEditor extends TextEditor implements IReconcilingParticipant {
-
-	//TODO the framework does not currently support/listen to the color registry
-	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=54554
-	private IPropertyChangeListener fColorChangeListener= new IPropertyChangeListener() {
-		public void propertyChange(PropertyChangeEvent event) {
-			handlePreferenceStoreChanged(event);
-		}
-	};
-	
-	/**
-	 * Updates the Ant outline page selection and this editor's range indicator.
-	 * 
-	 * @since 3.0
-	 */
-	private class EditorSelectionChangedListener implements ISelectionChangedListener  {
-		
-		/**
-		 * Installs this selection changed listener with the given selection provider. If
-		 * the selection provider is a post selection provider, post selection changed
-		 * events are the preferred choice, otherwise normal selection changed events
-		 * are requested.
-		 * 
-		 * @param selectionProvider
-		 */
-		public void install(ISelectionProvider selectionProvider) {
-			if (selectionProvider == null) {
-				return;
-			}
-				
-			if (selectionProvider instanceof IPostSelectionProvider)  {
-				IPostSelectionProvider provider= (IPostSelectionProvider) selectionProvider;
-				provider.addPostSelectionChangedListener(this);
-			} else  {
-				selectionProvider.addSelectionChangedListener(this);
-			}
-		}
-
-		/**
-		 * Removes this selection changed listener from the given selection provider.
-		 * 
-		 * @param selectionProviderstyle
-		 */
-		public void uninstall(ISelectionProvider selectionProvider) {
-			if (selectionProvider == null) {
-				return;
-			}
-			
-			if (selectionProvider instanceof IPostSelectionProvider)  {
-				IPostSelectionProvider provider= (IPostSelectionProvider) selectionProvider;
-				provider.removePostSelectionChangedListener(this);
-			} else  {
-				selectionProvider.removeSelectionChangedListener(this);
-			}			
-		}
-		
-		/*
-		 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			AntModel model= getAntModel();
-			if (model == null) { //external file
-				return;
-			}
-			ISelection selection= event.getSelection();
-			AntElementNode node= null;
-			if (selection instanceof ITextSelection) {
-				ITextSelection textSelection= (ITextSelection)selection;
-				int offset= textSelection.getOffset();
-				node= model.getNode(offset, false);
-			}
-		
-			if (AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.OUTLINE_LINK_WITH_EDITOR)) {
-				synchronizeOutlinePage(node, true);
-			}
-			setSelection(node, false);
-		}
-	}
-	
-	static class TabConverter {
-		
-		private int fTabRatio;
-		private ILineTracker fLineTracker;
-		
-		public void setNumberOfSpacesPerTab(int ratio) {
-			fTabRatio= ratio;
-		}
-		
-		public void setLineTracker(ILineTracker lineTracker) {
-			fLineTracker= lineTracker;
-		}
-		
-		private int insertTabString(StringBuffer buffer, int offsetInLine) {
-			
-			if (fTabRatio == 0) {
-				return 0;
-			}
-				
-			int remainder= offsetInLine % fTabRatio;
-			remainder= fTabRatio - remainder;
-			for (int i= 0; i < remainder; i++) {
-				buffer.append(' ');
-			}
-			return remainder;
-		}
-		
-		public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-			String text= command.text;
-			if (text == null) {
-				return;
-			}
-				
-			int index= text.indexOf('\t');
-			if (index > -1) {
-				
-				StringBuffer buffer= new StringBuffer();
-				
-				fLineTracker.set(command.text);
-				int lines= fLineTracker.getNumberOfLines();
-				
-				try {
-						
-					for (int i= 0; i < lines; i++) {
-						
-						int offset= fLineTracker.getLineOffset(i);
-						int endOffset= offset + fLineTracker.getLineLength(i);
-						String line= text.substring(offset, endOffset);
-						
-						int position= 0;
-						if (i == 0) {
-							IRegion firstLine= document.getLineInformationOfOffset(command.offset);
-							position= command.offset - firstLine.getOffset();	
-						}
-						
-						int length= line.length();
-						for (int j= 0; j < length; j++) {
-							char c= line.charAt(j);
-							if (c == '\t') {
-								position += insertTabString(buffer, position);
-							} else {
-								buffer.append(c);
-								++ position;
-							}
-						}
-						
-					}
-						
-					command.text= buffer.toString();
-						
-				} catch (BadLocationException x) {
-				}
-			}
-		}
-	}
-	
-	class StatusLineSourceViewer extends SourceViewer{
-		
-		private boolean fIgnoreTextConverters= false;
-		
-		public StatusLineSourceViewer(Composite composite, IVerticalRuler verticalRuler, IOverviewRuler overviewRuler, int styles) {
-			super(composite, verticalRuler, overviewRuler, isOverviewRulerVisible(), styles);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.ITextOperationTarget#doOperation(int)
-		 */
-		public void doOperation(int operation) {
-			if (getTextWidget() == null || !redraws()) {
-				return;
-			}
-
-			switch (operation) {
-				case CONTENTASSIST_PROPOSALS:
-					String msg= fContentAssistant.showPossibleCompletions();
-					setStatusLineErrorMessage(msg);
-					return;
-				case UNDO:
-					fIgnoreTextConverters= true;
-					break;
-				case REDO:
-					fIgnoreTextConverters= true;
-					break;
-			}
-			
-			super.doOperation(operation);
-		}
-		
-		public void setTextConverter(TabConverter tabConverter) {
-			fTabConverter= tabConverter;
-		}
-		
-		public void updateIndentationPrefixes() {
-			SourceViewerConfiguration configuration= getSourceViewerConfiguration();
-			String[] types= configuration.getConfiguredContentTypes(this);
-			for (int i= 0; i < types.length; i++) {
-				String[] prefixes= configuration.getIndentPrefixes(this, types[i]);
-				if (prefixes != null && prefixes.length > 0) {
-					setIndentPrefixes(prefixes, types[i]);
-				}
-			}
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.TextViewer#customizeDocumentCommand(org.eclipse.jface.text.DocumentCommand)
-		 */
-		protected void customizeDocumentCommand(DocumentCommand command) {
-			super.customizeDocumentCommand(command);
-			if (!fIgnoreTextConverters && fTabConverter != null) {
-				fTabConverter.customizeDocumentCommand(getDocument(), command);
-			}
-			fIgnoreTextConverters= false;
-		}
-	}
-
-	/**
-	 * Selection changed listener for the outline view.
-	 */
-    protected ISelectionChangedListener fSelectionChangedListener = new ISelectionChangedListener(){
-        public void selectionChanged(SelectionChangedEvent event) {
-            doSelectionChanged(event);
-        }
-    };
-    
-    /**
-     * The page that shows the outline.
-     */
-    protected AntEditorContentOutlinePage fOutlinePage;
-    
-    /** The editor's tab to spaces converter */
-	private TabConverter fTabConverter;
-	
-	private boolean fInitialReconcile= true;
-	
-	/**
-	 * The editor selection changed listener.
-	 * 
-	 * @since 3.0
-	 */
-	private EditorSelectionChangedListener fEditorSelectionChangedListener;
-  
-    public AntEditor() {
-        super();
-		setSourceViewerConfiguration(new AntEditorSourceViewerConfiguration(this));
-		setDocumentProvider(new AntEditorDocumentProvider(XMLCore.getDefault()));
-		JFaceResources.getColorRegistry().addListener(fColorChangeListener);
-		
-		//TODO the framework does not currently support/listen to the color registry
-		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=54554
-	//	PreferenceConverter.setValue(getPreferenceStore(), ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, JFaceResources.getColorRegistry().getRGB(AntEditorPreferenceConstants.CURRENT_LINE_COLOR));
-	//	PreferenceConverter.setValue(getPreferenceStore(), ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, JFaceResources.getColorRegistry().getRGB(AntEditorPreferenceConstants.LINE_NUMBER_RULER_COLOR));
-	//	PreferenceConverter.setValue(getPreferenceStore(), ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, JFaceResources.getColorRegistry().getRGB(AntEditorPreferenceConstants.PRINT_MARGIN_COLOR));
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
-     */
-    protected void createActions() {
-        super.createActions();
-
-        ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ant.internal.ui.editor.AntEditorMessages"); //$NON-NLS-1$
-        IAction action = new ContentAssistAction(bundle, "ContentAssistProposal.", this); //$NON-NLS-1$
-        
-        // This action definition is associated with the accelerator Ctrl+Space
-        action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-        setAction("ContentAssistProposal", action); //$NON-NLS-1$
-        
-		action = new TextOperationAction(bundle, "ContentFormat.", this, ISourceViewer.FORMAT); //$NON-NLS-1$
-		action.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);
-        setAction("ContentFormat", action); //$NON-NLS-1$
-        
-		//TODO set help
-		//WorkbenchHelp.setHelp(action, IJavaHelpContextIds.FORMAT_ACTION);
-    }
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.ui.editors.text.TextEditor#initializeEditor()
-	 * Called from TextEditor.<init>
-	 */
-    protected void initializeEditor() {
-		super.initializeEditor();
-		setPreferenceStore(createCombinedPreferenceStore());
-		setCompatibilityMode(false);
-		setHelpContextId(IAntUIHelpContextIds.ANT_EDITOR);	
-    }
-   
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-    public Object getAdapter(Class key) {
-        if (key.equals(IContentOutlinePage.class)) {
-			return getOutlinePage();
-        }
-        return super.getAdapter(key);
-    }
-
-	private AntEditorContentOutlinePage getOutlinePage() {
-		if (fOutlinePage == null) {
-			fOutlinePage= new AntEditorContentOutlinePage(XMLCore.getDefault(), this);
-			fOutlinePage.addPostSelectionChangedListener(fSelectionChangedListener);
-			setOutlinePageInput(getEditorInput());
-		}
-		return fOutlinePage;
-	}
-
-    private void doSelectionChanged(SelectionChangedEvent selectionChangedEvent) {
-        IStructuredSelection selection= (IStructuredSelection)selectionChangedEvent.getSelection();
-
-        if (!isActivePart() && AntUIPlugin.getActivePage() != null) {
-			AntUIPlugin.getActivePage().bringToTop(this);
-        }
-        
-        AntElementNode selectedXmlElement = (AntElementNode)selection.getFirstElement(); 
-        if(selectedXmlElement != null) {
-			setSelection(selectedXmlElement, !isActivePart());
-        }
-    }
-
-    private boolean isActivePart() {
-        IWorkbenchPart part= getActivePart();
-        return part != null && part.equals(this);
-    }
-    
-    private void setSelection(AntElementNode reference, boolean moveCursor) {
-        if (reference != null) {
-        	while (reference.getImportNode() != null) {
-        		reference= reference.getImportNode();
-        	}
-        	if (reference.isExternal()) {
-        		return;
-        	}
-            
-            StyledText textWidget= null;
-            ISourceViewer sourceViewer= getSourceViewer();
-            if (sourceViewer != null) {
-                textWidget= sourceViewer.getTextWidget();
-            }
-            
-            if (textWidget == null) {
-                return;
-            }
-                
-            try {
-                
-                int offset= reference.getOffset();
-                int length= reference.getSelectionLength();
-                int highLightLength= reference.getLength();
-                if (offset < 0) {
-                    return;
-                }
-                    
-                textWidget.setRedraw(false);
-                
-                if (highLightLength > 0) {
-	                setHighlightRange(offset, highLightLength, moveCursor);
-                }
-                
-                if (!moveCursor) {
-                    return;
-                }
-                                            
-                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.TEXT_COLOR) ||
-		property.equals(IAntEditorColorConstants.PROCESSING_INSTRUCTIONS_COLOR) ||
-		property.equals(IAntEditorColorConstants.STRING_COLOR) ||
-		property.equals(IAntEditorColorConstants.TAG_COLOR) ||
-		property.equals(IAntEditorColorConstants.XML_COMMENT_COLOR);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
-		String property= event.getProperty();
-		
-		if (AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH.equals(property)) {
-			Object value= event.getNewValue();
-			StatusLineSourceViewer viewer= (StatusLineSourceViewer) getSourceViewer();
-			if (value instanceof Integer) {
-				viewer.getTextWidget().setTabs(((Integer) value).intValue());
-			} else if (value instanceof String) {
-				viewer.getTextWidget().setTabs(Integer.parseInt((String) value));
-			}
-			return;
-		}
-		
-		if (AntEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS.equals(property)) {
-			if (isTabConversionEnabled()) {
-				startTabConversion();
-			} else {
-				stopTabConversion();
-			}
-			return;
-		}
-		
-		AntEditorSourceViewerConfiguration sourceViewerConfiguration= (AntEditorSourceViewerConfiguration)getSourceViewerConfiguration();
-		if (affectsTextPresentation(event)) {
-			sourceViewerConfiguration.updateScanners();
-		}
-		
-		sourceViewerConfiguration.changeConfiguration(event);
-		
-		//TODO the framework does not currently support/listen to the color registry
-		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=54554
-		if (property.equals(AntEditorPreferenceConstants.CURRENT_LINE_COLOR)) {
-			PreferenceConverter.setValue(getPreferenceStore(), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, JFaceResources.getColorRegistry().getRGB(AntEditorPreferenceConstants.CURRENT_LINE_COLOR));
-			return;
-		} else if (property.equals(AntEditorPreferenceConstants.LINE_NUMBER_RULER_COLOR)) {
-			PreferenceConverter.setValue(getPreferenceStore(), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, JFaceResources.getColorRegistry().getRGB(AntEditorPreferenceConstants.LINE_NUMBER_RULER_COLOR));
-			return;
-		} else if (property.equals(AntEditorPreferenceConstants.PRINT_MARGIN_COLOR)) {
-			PreferenceConverter.setValue(getPreferenceStore(), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, JFaceResources.getColorRegistry().getRGB(AntEditorPreferenceConstants.PRINT_MARGIN_COLOR));
-			return;
-		}
-							
-		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 (fOutlinePage != null) {
-			IDocumentProvider provider= getDocumentProvider();
-			if (provider instanceof AntEditorDocumentProvider) {
-				AntEditorDocumentProvider documentProvider= (AntEditorDocumentProvider) provider;
-				AntModel model= documentProvider.getAntModel(input);
-				fOutlinePage.setPageInput(model);
-			}
-		}
-	}
-	
-	/**
-	 * Returns the Ant model for the current editor input of this editor.
-	 * @return the Ant model for this editor or <code>null</code>
-	 */
-	public AntModel getAntModel() {
-		IDocumentProvider provider= getDocumentProvider();
-		if (provider instanceof AntEditorDocumentProvider) {
-			AntEditorDocumentProvider documentProvider= (AntEditorDocumentProvider) provider;
-			return documentProvider.getAntModel(getEditorInput());
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.ExtendedTextEditor#createAnnotationAccess()
-	 */
-	protected IAnnotationAccess createAnnotationAccess() {
-		return new AnnotationAccess();
-	}
-	
-	/* (non-Javadoc)
-	 * @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) {
-		fOverviewRuler= createOverviewRuler(getSharedColors());
-		ISourceViewer viewer= new StatusLineSourceViewer(parent, ruler, getOverviewRuler(), styles);
-		//ensure decoration support has been created and configured.
-		getSourceViewerDecorationSupport(viewer);
-		return viewer;
-	}
-	
-	/**
-	 * Ses the given message as error message to this editor's status line.
-	 * @param msg message to be set
-	 */
-	protected void setStatusLineErrorMessage(String msg) {
-		IEditorStatusLine statusLine= (IEditorStatusLine) getAdapter(IEditorStatusLine.class);
-		if (statusLine != null)
-			statusLine.setMessage(true, msg, null);	
-	}
-
-	public void openReferenceElement() {
-		ISelection selection= getSelectionProvider().getSelection();
-		String errorMessage= null;
-		if (selection instanceof ITextSelection) {
-			ITextSelection textSelection= (ITextSelection)selection;
-			String text= textSelection.getText();
-			AntElementNode node= getAntModel().getReferenceNode(text);
-			if (node != null) {
-				setSelection(node, true);
-				return;
-			} 
-			String path= getAntModel().getEntityPath(text);
-			if (path != null) {
-				IFile file= AntUtil.getFileForLocation(path, null);
-				if (file.exists()) {
-					try {
-						openInEditor(file, isActivePart());
-						return;
-					} catch (PartInitException e) {
-						errorMessage= e.getLocalizedMessage();
-					}
-				}
-			}
-		}
-		if (errorMessage == null) {
-			errorMessage= AntEditorMessages.getString("AntEditor.3"); //$NON-NLS-1$
-		}
-		setStatusLineErrorMessage(errorMessage);
-		getSite().getShell().getDisplay().beep();
-	}
-	
-	private void openInEditor(IFile file, boolean activate) throws PartInitException {
-		if (file != null) {
-			IWorkbenchPage p= getEditorSite().getPage();
-			if (p != null) {
-				IDE.openEditor(p, file, activate);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void editorContextMenuAboutToShow(IMenuManager menu) {
-		super.editorContextMenuAboutToShow(menu);
-		
-		IAction formatAction= getAction("ContentFormat"); //$NON-NLS-1$
-		if (formatAction == null) {
-			return;
-		}
-		
-		if (formatAction.isEnabled()) {
-			menu.add(formatAction);
-		}
-	}
-	
-	private void startTabConversion() {
-		if (fTabConverter == null) {
-			fTabConverter= new TabConverter();
-			fTabConverter.setLineTracker(new DefaultLineTracker());
-			fTabConverter.setNumberOfSpacesPerTab(getTabSize());
-			StatusLineSourceViewer viewer= (StatusLineSourceViewer) getSourceViewer();
-			viewer.setTextConverter(fTabConverter);
-			// http://dev.eclipse.org/bugs/show_bug.cgi?id=19270
-			viewer.updateIndentationPrefixes();
-		}
-	}
-	
-	private void stopTabConversion() {
-		if (fTabConverter != null) {
-			StatusLineSourceViewer viewer= (StatusLineSourceViewer) getSourceViewer();
-			viewer.setTextConverter(null);
-			// http://dev.eclipse.org/bugs/show_bug.cgi?id=19270
-			viewer.updateIndentationPrefixes();
-			fTabConverter= null;
-		}
-	}
-	
-	private int getTabSize() {
-		IPreferenceStore preferences= getPreferenceStore();
-		return preferences.getInt(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH);	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-		if (isTabConversionEnabled()) {
-			startTabConversion();		
-		}
-		fEditorSelectionChangedListener= new EditorSelectionChangedListener();
-		fEditorSelectionChangedListener.install(getSelectionProvider());
-	}
-	
-	private boolean isTabConversionEnabled() {
-		IPreferenceStore store= getPreferenceStore();
-		return store.getBoolean(AntEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		JFaceResources.getColorRegistry().removeListener(fColorChangeListener);
-		if (fEditorSelectionChangedListener != null)  {
-			fEditorSelectionChangedListener.uninstall(getSelectionProvider());
-			fEditorSelectionChangedListener= null;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		super.doSave(monitor);
-		getAntModel().updateMarkers();
-		updateEditorImage();
-	}
-	
-	private void updateEditorImage() {
-		Image titleImage= getTitleImage();
-		if (titleImage == null) {
-			return;
-		}
-		AntProjectNode node= getAntModel().getProjectNode();
-		if (node != null) {
-			postImageChange(node);
-		}
-	}
-	
-	private void updateForInitialReconcile() {
-		if (getAntModel() == null) {
-			return;
-		}
-		fInitialReconcile= false;
-		updateEditorImage();
-		getAntModel().updateForInitialReconcile();
-	}
-	
-	private void postImageChange(final AntElementNode node) {
-		Shell shell= getSite().getShell();
-		if (shell != null && !shell.isDisposed()) {
-			shell.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					if (getSite().getShell() == null || getSite().getShell().isDisposed()) {
-						return;
-					}
-					Image titleImage= getTitleImage();
-					Image newImage= node.getImage();
-					if (titleImage != newImage) {
-						setTitleImage(newImage);
-					}
-				}
-			});
-		}
-	}
-
-	public void synchronizeOutlinePage(boolean checkIfOutlinePageActive) {
-		if (getSelectionProvider() == null) {
-			return;
-		}
-		AntElementNode node= getNode();
-		synchronizeOutlinePage(node, checkIfOutlinePageActive);
-		
-	}
-	
-	protected void synchronize(boolean checkIfOutlinePageActive) {
-		if (getSelectionProvider() == null) {
-			return;
-		}
-		AntElementNode node= getNode();
-		if (AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.OUTLINE_LINK_WITH_EDITOR)) {
-			synchronizeOutlinePage(node, checkIfOutlinePageActive);
-		}
-		setSelection(node, false);
-		
-	}
-	
-	private AntElementNode getNode() {
-		AntModel model= getAntModel();
-		if (model == null) {
-			return null;
-		}
-		AntElementNode node= null;
-		ISelection selection= getSelectionProvider().getSelection();
-		if (selection instanceof ITextSelection) {
-			ITextSelection textSelection= (ITextSelection)selection;
-			int offset= textSelection.getOffset();
-			node= model.getNode(offset, false);
-		}
-		return node;
-	}
-	
-	protected void synchronizeOutlinePage(AntElementNode node, boolean checkIfOutlinePageActive) {
-		if (fOutlinePage != null && !(checkIfOutlinePageActive && isAntOutlinePageAction())) {
-			fOutlinePage.removePostSelectionChangedListener(fSelectionChangedListener);
-			fOutlinePage.select(node);
-			fOutlinePage.addPostSelectionChangedListener(fSelectionChangedListener);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IReconcilingParticipant#reconciled()
-	 */
-	public void reconciled() {
-		if (getSourceViewerConfiguration() == null) {
-			return; //editor has been disposed.
-		}
-		if (fInitialReconcile) {
-			updateForInitialReconcile();
-		}
-		IAutoIndentStrategy strategy= getSourceViewerConfiguration().getAutoIndentStrategy(null, null);
-		if (strategy instanceof AntAutoIndentStrategy) {
-			((AntAutoIndentStrategy)strategy).reconciled();
-		}
-		
-		Shell shell= getSite().getShell();
-		if (shell != null && !shell.isDisposed()) {
-			shell.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					if (getSite().getShell() == null || getSite().getShell().isDisposed()) {
-						return;
-					}
-					synchronize(true);
-				}
-			});
-		}
-	}
-	
-	private boolean isAntOutlinePageAction() {
-		IWorkbenchPart part= getActivePart();
-		return part instanceof ContentOutline && ((ContentOutline)part).getCurrentPage() == fOutlinePage;
-	}
-
-	private IWorkbenchPart getActivePart() {
-		IWorkbenchWindow window= getSite().getWorkbenchWindow();
-		IPartService service= window.getPartService();
-		return service.getActivePart();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#doSetSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	protected void doSetSelection(ISelection selection) {
-		super.doSetSelection(selection);
-		synchronizeOutlinePage(true);
-	}
-
-	/**
-	 * Creates a combined preference store, this store is read-only.
-	 * 
-	 * @return the combined preference store
-	 * @since 3.0
-	 */
-	private IPreferenceStore createCombinedPreferenceStore() {
-		IPreferenceStore antStore= AntUIPlugin.getDefault().getPreferenceStore();
-		IPreferenceStore generalTextStore= EditorsUI.getPreferenceStore(); 
-		return new ChainedPreferenceStore(new IPreferenceStore[] { antStore, generalTextStore });
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java
deleted file mode 100644
index b5b0c1c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *     John-Mason P. Shackelford - bug 40255
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-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 Ant Editor actions to the desktop's Edit menu and the toolbar.
- * 
- */
-public class AntEditorActionContributor extends TextEditorActionContributor {
-
-	protected RetargetTextEditorAction fContentAssistProposal;
-	protected RetargetTextEditorAction fContentFormat;
-	private OpenDeclarationAction fOpenDeclarationAction;
-
-	public AntEditorActionContributor() {
-		super();
-		ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ant.internal.ui.editor.AntEditorMessages"); //$NON-NLS-1$
-		fContentAssistProposal = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); //$NON-NLS-1$
-		fContentFormat = new RetargetTextEditorAction(bundle, "ContentFormat."); //$NON-NLS-1$
-	}
-	
-	protected void initializeActions(AntEditor editor) {	 
-		fOpenDeclarationAction= new OpenDeclarationAction(editor);
-	}
-	
-	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$
-		fContentFormat.setAction(getAction(editor, "ContentFormat")); //$NON-NLS-1$
-		
-		if (part instanceof AntEditor) {
-			if (fOpenDeclarationAction == null) {
-				initializeActions((AntEditor) part);
-				contributeToMenu(getActionBars().getMenuManager());
-			}
-		}
-
-		if (fOpenDeclarationAction != null) {
-			fOpenDeclarationAction.setEditor((AntEditor) part);		
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void contributeToMenu(IMenuManager menu) {
-		if (fOpenDeclarationAction == null) {
-			return;
-		}
-		super.contributeToMenu(menu);
-		
-		IMenuManager navigateMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE);
-		if (navigateMenu != null) {
-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fOpenDeclarationAction);
-			navigateMenu.setVisible(true);
-		}
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.part.EditorActionBarContributor#init(org.eclipse.ui.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 Separator());
-            editMenu.add(fContentAssistProposal);
-            editMenu.add(fContentFormat);
-        }
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToToolBar(org.eclipse.jface.action.IToolBarManager)
-     */
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		super.contributeToToolBar(toolBarManager);
-		//TODO the validate action is still in development
-		//toolBarManager.add(fValidateAction);
-		//toolBarManager.update(false);
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(org.eclipse.ui.IEditorPart)
-	 */
-	public void setActiveEditor(IEditorPart part) {
-		doSetActiveEditor(part);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionBarContributor#dispose()
-	 */
-	public void dispose() {
-		doSetActiveEditor(null);
-		super.dispose();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java
deleted file mode 100644
index ea2c584..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java
+++ /dev/null

@@ -1,1549 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49383, 58299, 59024
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ComponentHelper;
-import org.apache.tools.ant.IntrospectionHelper;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.UnknownElement;
-import org.apache.tools.ant.taskdefs.MacroDef;
-import org.apache.tools.ant.taskdefs.MacroInstance;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Reference;
-import org.eclipse.ant.internal.ui.dtd.IAttribute;
-import org.eclipse.ant.internal.ui.dtd.IDfm;
-import org.eclipse.ant.internal.ui.dtd.IElement;
-import org.eclipse.ant.internal.ui.dtd.ISchema;
-import org.eclipse.ant.internal.ui.dtd.ParseError;
-import org.eclipse.ant.internal.ui.dtd.Parser;
-import org.eclipse.ant.internal.ui.editor.model.AntDefiningTaskNode;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTargetNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTaskNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.templates.AntContext;
-import org.eclipse.ant.internal.ui.editor.templates.AntTemplateAccess;
-import org.eclipse.ant.internal.ui.editor.templates.AntTemplateProposal;
-import org.eclipse.ant.internal.ui.editor.templates.BuildFileContextType;
-import org.eclipse.ant.internal.ui.editor.templates.TaskContextType;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-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.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-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;
-
-/**
- * The completion processor for the Ant Editor.
- */
-public class AntEditorCompletionProcessor  extends TemplateCompletionProcessor implements IContentAssistProcessor  {       
- 
- 	private Comparator proposalComparator= new Comparator() {
-		public int compare(Object o1, Object o2) {
-		    
-			int type1= getProposalType(o1);
-			int type2= getProposalType(o2);
-			if (type1 != type2) {
-				if (type1 > type2) {
-					return 1;
-				}  
-				return -1;
-			}
-			String string1 = ((ICompletionProposal)o1).getDisplayString();
-			String string2 = ((ICompletionProposal)o2).getDisplayString();
-			return string1.compareToIgnoreCase(string2);
-		}
-		private int getProposalType(Object o){
-		    if(o instanceof AntCompletionProposal){
-		        return ((AntCompletionProposal) o).getType();
-		    } 
-		    return AntCompletionProposal.TASK_PROPOSAL;    
-		}
- 	};
-	
-	protected final static int PROPOSAL_MODE_NONE = 0;
-	protected final static int PROPOSAL_MODE_BUILDFILE = 1;
-	protected final static int PROPOSAL_MODE_TASK_PROPOSAL = 2;
-	protected final static int PROPOSAL_MODE_PROPERTY_PROPOSAL = 3;
-	protected final static int PROPOSAL_MODE_ATTRIBUTE_PROPOSAL = 4;
-	protected final static int PROPOSAL_MODE_TASK_PROPOSAL_CLOSING = 5;
-	protected final static int PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL = 6;
-	
-	private final static ICompletionProposal[] NO_PROPOSALS= new ICompletionProposal[0];
-	
-    /**
-     * 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_DTD_FILENAME = "/ant1.6.0.dtd"; //$NON-NLS-1$
-
-    /**
-     * The dtd.
-     */
-	protected 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 = TaskDescriptionProvider.getDefault();
-	
-	private String errorMessage;
-	
-	protected AntModel antModel;
-	
-	/**
-	 * The proposal mode for the current content assist
-     * @see determineProposalMode(IDocument, int, String)
-     */
-	private int currentProposalMode= -1;
-	
-	/**
-	 * The prefix for the current content assist
-     */
-	protected String currentPrefix= null;
-	
-	public AntEditorCompletionProcessor(AntModel model) {
-		super();
-		if(dtd == null) {
-	        try {
-	     	  	dtd = parseDtd();
-	        } catch (IOException e) {
-	        	AntUIPlugin.log(e);
-	        } catch (ParseError e) {
-				AntUIPlugin.log(e);
-			}
-		}
-		antModel= model;
-	}
-
-    /**
-     * Parses the dtd.
-     */
-    private ISchema parseDtd() throws ParseError, IOException {
-        InputStream stream = getClass().getResourceAsStream(ANT_DTD_FILENAME);
-        InputStreamReader reader = new InputStreamReader(stream, "UTF-8"); //$NON-NLS-1$
-        Parser parser = new Parser();
-        ISchema schema= parser.parseDTD(reader, "project"); //$NON-NLS-1$
-        reader.close();
-        return schema;
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer refViewer, int documentOffset) {
-        this.viewer = refViewer;   
-        ICompletionProposal[] matchingProposals= determineProposals();
-        ICompletionProposal[] matchingTemplateProposals = determineTemplateProposals(refViewer, documentOffset);
-        currentPrefix= null;
-        currentProposalMode= -1;
-        return mergeProposals(matchingProposals, matchingTemplateProposals);
-    }
-	
-	private ICompletionProposal[] determineTemplateProposals(ITextViewer refViewer, int documentOffset) {
-        String prefix = getCurrentPrefix();
-        ICompletionProposal[] matchingTemplateProposals;
-        if (prefix.length() == 0) {
-            matchingTemplateProposals = super.computeCompletionProposals(refViewer, documentOffset);
-        } else {
-            ICompletionProposal[] templateProposals = super.computeCompletionProposals(refViewer, documentOffset);
-            List templateProposalList = new ArrayList(templateProposals.length);
-            for (int i = 0; i < templateProposals.length; i++) {
-                if (templateProposals[i].getDisplayString().toLowerCase().startsWith(prefix)) {
-                    templateProposalList.add(templateProposals[i]);
-                }
-            }
-            matchingTemplateProposals = 
-                (ICompletionProposal[]) templateProposalList.toArray(new ICompletionProposal[templateProposalList.size()]);
-        }
-		return matchingTemplateProposals;
-	}
-
-	private ICompletionProposal[] mergeProposals(ICompletionProposal[] proposals1, ICompletionProposal[] proposals2) {
-
-        ICompletionProposal[] combinedProposals = new ICompletionProposal[proposals1.length + proposals2.length];
-                
-		System.arraycopy(proposals1, 0, combinedProposals, 0, proposals1.length);
-		System.arraycopy(proposals2, 0, combinedProposals, proposals1.length, proposals2.length);		                
-
-		Arrays.sort(combinedProposals, proposalComparator);
-        return combinedProposals;
-    }
-
-    /**
-	 * @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 errorMessage;
-	}
-	
-    /**
-     * Returns the new determined proposals.
-     */ 
-	private ICompletionProposal[] determineProposals() {
-		ITextSelection selection= (ITextSelection)viewer.getSelectionProvider().getSelection();
-		cursorPosition = selection.getOffset() + selection.getLength();
-        
-        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 NO_PROPOSALS;
-		}
-	
-		ICompletionProposal[] proposals = getProposalsFromDocument(doc, prefix);
-		return proposals;
-		
-	}
-
-    /**
-     * Returns the proposals for the specified document.
-     */
-    protected ICompletionProposal[] getProposalsFromDocument(IDocument document, String prefix) {
-        String taskString = null;
-		ICompletionProposal[] proposals= null;
-		currentProposalMode= determineProposalMode(document, cursorPosition, prefix);
-        switch (currentProposalMode) {
-            case PROPOSAL_MODE_ATTRIBUTE_PROPOSAL:
-                taskString = getTaskStringFromDocumentStringToPrefix(document.get().substring(0, cursorPosition-prefix.length()));
-                proposals= getAttributeProposals(taskString, prefix);
-                if (proposals.length == 0) {
-                	errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.28"); //$NON-NLS-1$
-                }
-                break;
-            case PROPOSAL_MODE_TASK_PROPOSAL:
-            	String parentName= getParentName(document, lineNumber, columnNumber);
-            	if (parentName == null || parentName.length() == 0) { //outside of any parent element
-            		 proposals= NO_PROPOSALS;
-            		 currentProposalMode= PROPOSAL_MODE_NONE;
-            	} else {
-            		proposals= getTaskProposals(document, parentName, prefix);
-            	}
-            	if (proposals.length == 0) {
-        			errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.29"); //$NON-NLS-1$
-        		}
-				break;
-            case PROPOSAL_MODE_BUILDFILE:
-				proposals= getBuildFileProposals(document, prefix);
-            	if (proposals.length == 0) {
-				   errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.29"); //$NON-NLS-1$
-            	}
-				break;
-            case PROPOSAL_MODE_TASK_PROPOSAL_CLOSING:
-                ICompletionProposal proposal= getClosingTaskProposal(getOpenElementName(), prefix, true);
-            	if (proposal == null) {
-				   errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.30"); //$NON-NLS-1$
-				   proposals= NO_PROPOSALS;
-            	} else {
-	            	proposals= new ICompletionProposal[]{proposal};
-            	}
-                break;
-            case PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL:
-            	String textToSearch= document.get().substring(0, cursorPosition-prefix.length());
-                taskString = getTaskStringFromDocumentStringToPrefix(textToSearch);
-                String attributeString = getAttributeStringFromDocumentStringToPrefix(textToSearch);
-                if ("target".equalsIgnoreCase(taskString)) { //$NON-NLS-1$
-                	proposals= getTargetAttributeValueProposals(document, textToSearch, prefix, attributeString);
-                } else if ("refid".equalsIgnoreCase(attributeString)) { //$NON-NLS-1$
-                	proposals= getReferencesValueProposals(prefix);
-
-                } else {
-                	proposals=getAttributeValueProposals(taskString, attributeString, prefix);
-                }
-				if (proposals.length == 0) {
-				   errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.31"); //$NON-NLS-1$
-				}
-				break;
-            case PROPOSAL_MODE_PROPERTY_PROPOSAL:
-				proposals= getPropertyProposals(document, prefix, cursorPosition);
-            	if (proposals.length == 0) {
-				   errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.32"); //$NON-NLS-1$
-            	}
-				break;
-			case PROPOSAL_MODE_NONE :
-            default :
-                proposals= NO_PROPOSALS;
-				errorMessage= AntEditorMessages.getString("AntEditorCompletionProcessor.33"); //$NON-NLS-1$
-        }
-        
-        if (proposals.length > 0) {
-        	errorMessage= ""; //$NON-NLS-1$
-        }
-        return proposals;
-
-    }
-    
-	private ICompletionProposal[] getReferencesValueProposals(String prefix) {
-		Project project= antModel.getProjectNode().getProject();
-		Map references= project.getReferences();
-		if (references.isEmpty()) {
-			return NO_PROPOSALS;
-		}
-		Set refIds= references.keySet();
-		AntElementNode node= antModel.getNode(cursorPosition, false);
-		while (node.getParentNode() instanceof AntTaskNode) {
-			node= node.getParentNode();
-		}
-		String id= null;
-		if (node instanceof AntTaskNode) {
-			id= ((AntTaskNode)node).getId();
-		}
-		List proposals= new ArrayList(refIds.size());
-		int i= 0;
-		String refId;
-		ICompletionProposal proposal;
-		for (Iterator iter = refIds.iterator(); iter.hasNext(); i++) {
-			refId= (String) iter.next();
-			if (!refId.equals(id) && (prefix.length() == 0 || refId.toLowerCase().startsWith(prefix))) {
-				proposal= new AntCompletionProposal(refId, cursorPosition - prefix.length(), prefix.length(), refId.length(), null, refId, null, AntCompletionProposal.TASK_PROPOSAL);
-				proposals.add(proposal);
-			}
-		}
-		return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);      
-	}
-
-	protected ICompletionProposal[] getTargetAttributeValueProposals(IDocument document, String textToSearch, String prefix, String attributeName) {
-		if (attributeName.equalsIgnoreCase("depends")) { //$NON-NLS-1$
-			return getDependsValueProposals(document, prefix);
-		} else if (attributeName.equalsIgnoreCase("if") || attributeName.equalsIgnoreCase("unless")) { //$NON-NLS-1$ //$NON-NLS-2$
-			if (!textToSearch.trim().endsWith(",")) { //$NON-NLS-1$
-				return getPropertyProposals(document, prefix, cursorPosition);
-			}
-		}
-		
-		return NO_PROPOSALS;
-	}
-
-	private ICompletionProposal[] getDependsValueProposals(IDocument document, String prefix) {
-		List possibleDependencies = new ArrayList();
-		String currentTargetName= getEnclosingTargetName(document, lineNumber, columnNumber);
-		if(currentTargetName == null) {
-			return NO_PROPOSALS;
-		}
-			
-		Map targets= getTargets();
-		Set targetNames= targets.keySet();
-		Iterator itr= targetNames.iterator();
-		Enumeration dependencies= null;
-		while (itr.hasNext()) {
-			String targetName = (String) itr.next();
-			if (targetName.equals(currentTargetName)) {
-				Target currentTarget= (Target)targets.get(targetName);
-				dependencies= currentTarget.getDependencies();
-				continue;
-			}
-			if (targetName.toLowerCase().startsWith(prefix) && targetName.length() > 0){
-				possibleDependencies.add(targetName);
-			}
-		}
-		
-		if (dependencies != null) {
-			while (dependencies.hasMoreElements()) {
-				possibleDependencies.remove(dependencies.nextElement());
-			}
-		}
-		
-		ICompletionProposal[] proposals= new ICompletionProposal[possibleDependencies.size()];
-		int i= 0;
-		for (Iterator iter = possibleDependencies.iterator(); iter.hasNext(); i++) {
-			String targetName = (String) iter.next();
-			ICompletionProposal proposal = new AntCompletionProposal(targetName, cursorPosition - prefix.length(), prefix.length(), targetName.length(), null, targetName, null, AntCompletionProposal.TASK_PROPOSAL);
-			proposals[i]= proposal;
-		}
-		return proposals;
-	}
-
-	/**
-     * Returns all possible attributes for the specified task.
-     * 
-     * @param taskName the name of the task for that the attribute shall be 
-     * completed
-     * @param prefix prefix, that all proposals should start with. The prefix
-     * may be an empty string.
-     */
-    protected ICompletionProposal[] getAttributeProposals(String taskName, String prefix) {
-        List proposals = new ArrayList();
-        IElement element = dtd.getElement(taskName);
-        if (element != null) {
-        	Iterator keys = element.getAttributes().keySet().iterator();
-        	while (keys.hasNext()) {
-        		String attrName = (String) keys.next();
-        		if (prefix.length() == 0 || attrName.toLowerCase().startsWith(prefix)) {
-        			IAttribute dtdAttributes = (IAttribute) element.getAttributes().get(attrName);
-					String replacementString = attrName+"=\"\""; //$NON-NLS-1$
-					String displayString = attrName;
-					String[] items = dtdAttributes.getEnum();
-					if (items != null) {					        			
-                        if(items.length > 1) {
-                            displayString += " - ("; //$NON-NLS-1$
-                        }
-                        for (int i = 0; i < items.length; i++) {
-                            displayString += items[i];
-                            if(i+1 < items.length) {
-                                displayString += " | "; //$NON-NLS-1$
-                            } else {
-                                displayString += ")"; //$NON-NLS-1$
-                            }
-                        }
-                    }
-                    
-                    addAttributeProposal(taskName, prefix, proposals, attrName, replacementString, displayString, true);
-                }       
-            }
-        } else { //possibly a user defined task or type
-        	Class taskClass= getTaskClass(taskName);
-        	if (taskClass != null) {
-        		if (taskClass == MacroInstance.class) {
-        			addMacroDefAttributeProposals(taskName, prefix, proposals);
-        		} else {
-	        		IntrospectionHelper helper= getIntrospectionHelper(taskClass);
-	        		if (helper != null) {
-		        		Enumeration attributes= helper.getAttributes();
-			        	while (attributes.hasMoreElements()) {
-							String attribute = (String) attributes.nextElement();
-							if (prefix.length() == 0 || attribute.toLowerCase().startsWith(prefix)) {
-								String replacementString = attribute + "=\"\""; //$NON-NLS-1$
-								addAttributeProposal(taskName, prefix, proposals, attribute, replacementString, attribute, false);
-							}
-						}
-	        		}
-        		}
-        	}
-        }
-        return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
-    }
-    
-    private IntrospectionHelper getIntrospectionHelper(Class taskClass) {
-    	IntrospectionHelper helper= null;
-    	try {
-    		helper= IntrospectionHelper.getHelper(antModel.getProjectNode().getProject(), taskClass);
-    	} catch (NoClassDefFoundError e) {
-			AntUIPlugin.log(MessageFormat.format(AntEditorMessages.getString("AntEditorCompletionProcessor.0"), new String[]{taskClass.getName()}), e); //$NON-NLS-1$
-		}
-    	return helper;
-    }
-
-    private void addMacroDefAttributeProposals(String taskName, String prefix, List proposals) {
-    	currentProposalMode= PROPOSAL_MODE_ATTRIBUTE_PROPOSAL;
-		AntProjectNode projectNode= antModel.getProjectNode();
-		AntDefiningTaskNode node= projectNode.getDefininingTaskNode(taskName);
-		Object task= node.getRealTask();
-		if (!(task instanceof MacroDef)) {
-			return;
-		}
-		List attributes= ((MacroDef)task).getAttributes();
-		Iterator itr= attributes.iterator();
-		while (itr.hasNext()) {
-			MacroDef.Attribute attribute = (MacroDef.Attribute) itr.next();
-			String attributeName= attribute.getName();
-			if (!(prefix.length() == 0 || attributeName.toLowerCase().startsWith(prefix))) {
-				continue;
-			}
-			String replacementString = attributeName + "=\"\""; //$NON-NLS-1$
-			String proposalInfo = null;
-			
-			String description = attribute.getDescription();
-			if(description != null) {
-			    proposalInfo= description;
-			}
-			String deflt = attribute.getDefault();
-			if(deflt != null && deflt.length() > 0) {
-				proposalInfo= (proposalInfo == null ?  "<BR><BR>" : (proposalInfo += "<BR><BR>")); //$NON-NLS-1$ //$NON-NLS-2$
-				proposalInfo+= MessageFormat.format(AntEditorMessages.getString("AntEditorCompletionProcessor.59"), new String[]{deflt}); //$NON-NLS-1$
-			}
-			
-			ICompletionProposal proposal = new AntCompletionProposal(replacementString, cursorPosition - prefix.length(), prefix.length(), attributeName.length() + 2, null, attributeName, proposalInfo, AntCompletionProposal.TASK_PROPOSAL);
-			proposals.add(proposal);
-		}
-	}
-    
-    private void addMacroDefElementProposals(String taskName, String prefix, List proposals) {
-    	currentProposalMode= PROPOSAL_MODE_ATTRIBUTE_PROPOSAL;
-		AntProjectNode projectNode= antModel.getProjectNode();
-		AntDefiningTaskNode node= projectNode.getDefininingTaskNode(taskName);
-		Object task= node.getRealTask();
-		if (!(task instanceof MacroDef)) {
-			return;
-		}
-		Map elements= ((MacroDef)task).getElements();
-		Iterator itr= elements.keySet().iterator();
-		while (itr.hasNext()) {
-			String elementName = (String) itr.next();
-			if (!(prefix.length() == 0 || elementName.toLowerCase().startsWith(prefix))) {
-				continue;
-			}
-			MacroDef.TemplateElement element = (MacroDef.TemplateElement) elements.get(elementName);
-			String replacementString = MessageFormat.format("<{0}>\n</{1}>", new String[]{elementName, elementName}); //$NON-NLS-1$
-			String proposalInfo = null;
-			
-			String description = element.getDescription();
-			if(description != null) {
-			    proposalInfo= description;
-			}
-			proposalInfo= (proposalInfo == null ?  "<BR><BR>" : (proposalInfo += "<BR><BR>")); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			if(element.isOptional()) {
-				proposalInfo+= AntEditorMessages.getString("AntEditorCompletionProcessor.1"); //$NON-NLS-1$
-			} else {
-				proposalInfo+= AntEditorMessages.getString("AntEditorCompletionProcessor.2"); //$NON-NLS-1$
-			}
-			
-			ICompletionProposal proposal = new AntCompletionProposal(replacementString, cursorPosition - prefix.length(), prefix.length(), elementName.length() + 2, null, elementName, proposalInfo, AntCompletionProposal.TASK_PROPOSAL);
-			proposals.add(proposal);
-		}
-	}
-
-	private void addAttributeProposal(String taskName, String prefix, List proposals, String attrName, String replacementString, String displayString, boolean lookupDescription) {
-    	
-		String proposalInfo = null;
-		if (lookupDescription) {
-			String required = descriptionProvider.getRequiredAttributeForTaskAttribute(taskName, attrName);
-			if(required != null && required.length() > 0) {
-			    proposalInfo = AntEditorMessages.getString("AntEditorCompletionProcessor.Required___4") + required; //$NON-NLS-1$
-			    proposalInfo += "<BR><BR>"; //$NON-NLS-1$
-			}
-			String description = descriptionProvider.getDescriptionForTaskAttribute(taskName, attrName);
-			if(description != null) {
-			    proposalInfo = (proposalInfo == null ? "" : proposalInfo); //$NON-NLS-1$
-			    proposalInfo += description;
-			}
-		}
-		
-		ICompletionProposal proposal = new AntCompletionProposal(replacementString, cursorPosition - prefix.length(), prefix.length(), attrName.length()+2, null, displayString, proposalInfo, AntCompletionProposal.TASK_PROPOSAL);
-		proposals.add(proposal);
-	}
-
-	/**
-     * 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 prefix the prefix that all proposals should start with. The prefix
-     * may be an empty string.
-     */
-    private ICompletionProposal[] getAttributeValueProposals(String taskName, String attributeName, String prefix) {
-        List proposals = new ArrayList();
-        IElement taskElement = dtd.getElement(taskName);
-        if (taskElement != null) {
-        	IAttribute attribute = (IAttribute) taskElement.getAttributes().get(attributeName);
-        	if (attribute != null) {
-        		String[] items = attribute.getEnum();
-        		if (items != null) {
-					String item;
-                    for (int i = 0; i < items.length; i++) {
-                        item= items[i];
-                        if(prefix.length() ==0 || item.toLowerCase().startsWith(prefix)) { 
-                            proposals.add(
-                            	new AntCompletionProposal(item, cursorPosition - prefix.length(), prefix.length(), item.length(), null, item, null, AntCompletionProposal.TASK_PROPOSAL));
-                        }
-                    }
-        		}
-            }
-        } else { //possibly a user defined task or type
-        	Class taskClass= getTaskClass(taskName);
-        	if (taskClass != null) {
-        		IntrospectionHelper helper= getIntrospectionHelper(taskClass);
-        		if (helper != null) {
-	        		Enumeration attributes= helper.getAttributes();
-		        	while (attributes.hasMoreElements()) {
-						String attribute= (String) attributes.nextElement();
-						if (attribute.equals(attributeName)) {
-							Class attributeType= helper.getAttributeType(attribute);
-							addAttributeValueProposalsForAttributeType(attributeType, prefix, proposals);
-							break;
-						}
-					}
-        		}
-        	}
-        }
-        return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
-    }
-
-	private void addAttributeValueProposalsForAttributeType(Class attributeType, String prefix, List proposals) {
-		if (attributeType == Boolean.TYPE && prefix.length() <= 5) {
-			addBooleanAttributeValueProposals(prefix, proposals);
-		} else if (EnumeratedAttribute.class.isAssignableFrom(attributeType)) {
-			try {
-				addEnumeratedAttributeValueProposals(attributeType, prefix, proposals);
-			} catch (InstantiationException e) {
-			} catch (IllegalAccessException e) {
-			}
-		} else if (Reference.class == attributeType) {
-			proposals.addAll(Arrays.asList(getReferencesValueProposals(prefix)));
-		}
-	}
-	
-	private void addEnumeratedAttributeValueProposals(Class type, String prefix, List proposals) throws InstantiationException, IllegalAccessException { 
-		EnumeratedAttribute ea= (EnumeratedAttribute) type.newInstance();
-		String[] values = ea.getValues();
-		String enumerated;
-		for (int i = 0; i < values.length; i++) {
-			enumerated= values[i].toLowerCase();
-			if (prefix.length() == 0 || enumerated.startsWith(prefix)) {
-				proposals.add(new AntCompletionProposal(enumerated, cursorPosition - prefix.length(), prefix.length(), enumerated.length(), null, enumerated, null, AntCompletionProposal.TASK_PROPOSAL));
-			}
-		}
-	}
-
-	private void addBooleanAttributeValueProposals(String prefix, List proposals) {
-		String[] booleanValues = new String[]{"true","false","on","off","yes","no"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		String booleanAssist;
-		for (int i = 0; i < booleanValues.length; i++) {
-			booleanAssist= booleanValues[i].toLowerCase();
-			if (prefix.length() == 0 || booleanAssist.startsWith(prefix)) {
-				proposals.add(new AntCompletionProposal(booleanAssist, cursorPosition -prefix.length(),
-						prefix.length(), booleanAssist.length(), null, booleanAssist,
-						null, AntCompletionProposal.TASK_PROPOSAL));
-			}
-		}	    
-	}
-
-	/**
-     * 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(IDocument document, String prefix, int aCursorPosition) {
-        List proposals = new ArrayList();
-        Map displayStringToProposals= new HashMap();
-        Map properties = findPropertiesFromDocument(document);
-		String propertyName;
-		Image image = AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY);
-		// Determine replacement length and offset
-	    // String from beginning to the beginning of the prefix
-	   int replacementLength = prefix.length();
-	   int replacementOffset = 0;
-	   String text= document.get();
-	   String stringToPrefix = text.substring(0, aCursorPosition - prefix.length());
-	   // Property proposal
-	   String lastTwoCharacters = stringToPrefix.substring(stringToPrefix.length()-2, stringToPrefix.length());
-	   boolean appendBraces= true;
-	   if(lastTwoCharacters.equals("${")) { //$NON-NLS-1$
-		   replacementLength += 2;
-		   replacementOffset = aCursorPosition - prefix.length() - 2;
-	   } else if(lastTwoCharacters.endsWith("$")) { //$NON-NLS-1$
-		   replacementLength += 1;
-		   replacementOffset = aCursorPosition - prefix.length() - 1;                
-	   } else {
-			//support for property proposals for the if/unless attributes of targets
-	   		replacementOffset= aCursorPosition - prefix.length();
-	   		appendBraces= false;
-	   }
-	   
-	   if(text.length() > aCursorPosition && text.charAt(aCursorPosition) == '}') {
-		   replacementLength += 1;
-	   }
-        for(Iterator i=properties.keySet().iterator(); i.hasNext(); ) {
-            propertyName= (String)i.next();
-            if(prefix.length() == 0 || propertyName.toLowerCase().startsWith(prefix)) {
-                String additionalPropertyInfo = (String)properties.get(propertyName);
-                
-                StringBuffer replacementString = new StringBuffer();
-                if (appendBraces) {
-                	replacementString.append("${"); //$NON-NLS-1$
-                }
-                replacementString.append(propertyName);
-                if (appendBraces) {
-                	replacementString.append('}');
-                }
-                
-				if (displayStringToProposals.get(propertyName) == null) {
-                	ICompletionProposal proposal = 
-		                new AntCompletionProposal(
-		                    replacementString.toString(), replacementOffset, replacementLength, 
-		                    replacementString.length(), image, propertyName,
-		                    additionalPropertyInfo, AntCompletionProposal.PROPERTY_PROPOSAL);
-					proposals.add(proposal);
-					displayStringToProposals.put(propertyName, proposal);
-				}
-            }
-        }      
-		return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);          
-    }
-
-
-    /**
-     * Returns all possible proposals for the specified parent name.
-     * <P>
-     * No completions will be returned if <code>parentName</code> is 
-     * not known.
-     * 
-     * @param document the entire document 
-     * @param parentName name of the parent (surrounding) element.
-     * @param prefix the prefix that all proposals should start with. The prefix
-     * may be an empty string.
-     */
-    protected ICompletionProposal[] getTaskProposals(IDocument document, String parentName, String prefix) {
-       List proposals = new ArrayList(250);
-       ICompletionProposal proposal;
-       if (areTasksOrTypesValidChildren(parentName)) {
-        	//use the definitions in the project as that includes more than what is defined in the DTD
-			Project project= antModel.getProjectNode().getProject();
-			Map tasksAndTypes= ComponentHelper.getComponentHelper(project).getAntTypeTable();
-			createProposals(document, prefix, proposals, tasksAndTypes);
-			if (parentName.equals("project") && "target".startsWith(prefix)) { //$NON-NLS-1$ //$NON-NLS-2$
-				proposals.add(newCompletionProposal(document, prefix, "target")); //$NON-NLS-1$
-			}
-		} else {
-			IElement parent = dtd.getElement(parentName);
-			if (parent != null) {
-				IDfm dfm = parent.getDfm();
-				String[] accepts = dfm.getAccepts();
-				String elementName;
-				for (int i = 0; i < accepts.length; i++) {
-					elementName = accepts[i];
-					if(prefix.length() == 0 || elementName.toLowerCase().startsWith(prefix)) {
-						proposal = newCompletionProposal(document, prefix, elementName);
-						proposals.add(proposal);
-					}
-				}
-			} else {
-				//a nested element of a user defined task/type?
-				Class taskClass= getTaskClass(parentName);
-	        	if (taskClass != null) {
-	        		if (taskClass == MacroInstance.class) {
-	        			addMacroDefElementProposals(parentName, prefix, proposals);
-	        		} else {
-		        		IntrospectionHelper helper= getIntrospectionHelper(taskClass);
-		        		if (helper != null) {
-			        		Enumeration nested= helper.getNestedElements();
-			        		String nestedElement;
-				        	while (nested.hasMoreElements()) {
-								nestedElement = (String) nested.nextElement();
-								if (prefix.length() == 0 || nestedElement.toLowerCase().startsWith(prefix)) {
-									proposal = newCompletionProposal(document, prefix, nestedElement);
-									proposals.add(proposal);
-								}
-					        }
-		        		}
-	        		}
-	        	}
-			}
-        }
-        
-        proposal= getClosingTaskProposal(getOpenElementName(), prefix, false);
-        if (proposal != null) {
-        	proposals.add(proposal);
-        }
-        
-        return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
-   }
-    
-    private boolean areTasksOrTypesValidChildren(String parentName) {
-		return parentName == "project" || parentName == "target" || parentName == "sequential" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			|| parentName == "presetdef" || parentName == "parallel" || parentName == "daemons"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	/** 
-    * Returns proposals that define the structure of a buildfile.
-    * 
-    * Note that template proposals which define the structure of a buildfile 
-    * are handled by {@link #determineTemplateProposals(ITextViewer, int)} 
-    * which limits proposals by context type.
-
-    * @param document the entire document 
-    * @param prefix the prefix that all proposals should start with. The prefix
-    * may be an empty string.
-    */
-   protected ICompletionProposal[] getBuildFileProposals(IDocument document, String prefix) {
-       String rootElementName= "project"; //$NON-NLS-1$
-       IElement rootElement = dtd.getElement(rootElementName);
-       if (rootElement != null && rootElementName.toLowerCase().startsWith(prefix)) {
-       		ICompletionProposal proposal = newCompletionProposal(document, prefix, rootElementName);
-			return new ICompletionProposal[] {proposal};
-		}
-       
-       return NO_PROPOSALS;
-   } 
-
-    private void createProposals(IDocument document, String prefix, List proposals, Map tasks) {
-		Iterator keys= tasks.keySet().iterator();
-		ICompletionProposal proposal;
-		String key;
-		while (keys.hasNext()) {
-			key= (String) keys.next();
-			if (prefix.length() == 0 || key.toLowerCase().startsWith(prefix)) {
-				proposal = newCompletionProposal(document, prefix, key);
-				proposals.add(proposal);
-			}
-		}
-	}
-    
-    private ICompletionProposal newCompletionProposal(IDocument document, String aPrefix, String elementName) {
-		additionalProposalOffset= 0;
-		Image proposalImage = AntUIImages.getImage(IAntUIConstants.IMG_TASK_PROPOSAL);
-		String proposalInfo = descriptionProvider.getDescriptionForTask(elementName);
-		boolean hasNestedElements= hasNestedElements(elementName);
-		String replacementString = getTaskProposalReplacementString(elementName, hasNestedElements);
-		int replacementOffset = cursorPosition - aPrefix.length();
-		int replacementLength = aPrefix.length();
-		if (replacementOffset > 0 && document.get().charAt(replacementOffset - 1) == '<') {
-			replacementOffset--;
-			replacementLength++;
-		}
-		int proposalCursorPosition;
-		if (hasNestedElements) {
-			proposalCursorPosition= elementName.length() + 2 + additionalProposalOffset;
-		} else {
-			if (additionalProposalOffset > 0) {
-				additionalProposalOffset+=2; //<antstructure output="|"/>
-			} else {
-				additionalProposalOffset+=1; //<arg|/>
-			}
-			proposalCursorPosition= elementName.length() + additionalProposalOffset;
-		}
-		return new AntCompletionProposal(replacementString, replacementOffset, 
-			replacementLength, proposalCursorPosition, proposalImage, elementName, proposalInfo, AntCompletionProposal.TASK_PROPOSAL);
-	}
-
-	/**
-     * Returns the one possible completion for the specified unclosed task .
-     * 
-     * @param openElementName the task that hasn't been closed 
-     * last
-     * @param prefix The prefix that the one possible proposal should start 
-     * with. The prefix may be an empty string.
-     * @return the proposal or <code>null</code> if no closing proposal available
-     */
-    private ICompletionProposal getClosingTaskProposal(String openElementName, String prefix, boolean closingMode) {
-    	char previousChar = getPreviousChar();
-		ICompletionProposal proposal= null;
-        if(openElementName != null) {
-            if(prefix.length() == 0 || openElementName.toLowerCase().startsWith(prefix)) {
-                StringBuffer replaceString = new StringBuffer();
-                if (!closingMode) {
-                	if (previousChar != '/') {
-	                	if (previousChar != '<') {
-	                		replaceString.append('<');
-	                	}
-	                	replaceString.append('/');
-                	}
-                }
-                replaceString.append(openElementName);
-                replaceString.append('>');
-                StringBuffer displayString= new StringBuffer("</"); //$NON-NLS-1$
-                displayString.append(openElementName);
-                displayString.append('>');
-                proposal= new AntCompletionProposal(replaceString.toString(), cursorPosition - prefix.length(), prefix.length(), replaceString.length(), null, displayString.toString(), AntEditorMessages.getString("AntEditorCompletionProcessor.39"), AntCompletionProposal.TAG_CLOSING_PROPOSAL); //$NON-NLS-1$
-    		}
-        }
-
-        return proposal;
-    }
-
-	protected char getPreviousChar() {
-		ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
-    	int offset= selection.getOffset();
-    	char previousChar= '?';
-    	try {
-			previousChar= viewer.getDocument().getChar(offset-1);
-		} catch (BadLocationException e) {
-			
-		}
-		return previousChar;
-	}
-
-    /**
-     * Returns the replacement string for the specified task name.
-     */
-    private String getTaskProposalReplacementString(String aTaskName, boolean hasNested) {
-        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 (hasNested) {
-        	replacement.append("></"); //$NON-NLS-1$
-            replacement.append(aTaskName);
-            replacement.append('>');
-        } else {
-        	replacement.append("/>"); //$NON-NLS-1$
-        }
-        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 supports nested elements.
-     */
-    private boolean hasNestedElements(String elementName) {
-        IElement element = dtd.getElement(elementName);
-        if (element != null) {
-        	return !element.isEmpty();
-        } 
-        Class taskClass= getTaskClass(elementName);
-    	if (taskClass != null) {
-    		IntrospectionHelper helper= getIntrospectionHelper(taskClass);
-    		if (helper != null) {
-    			Enumeration nested= helper.getNestedElements();
-    			return nested.hasMoreElements();
-    		}
-		}
-        return false;
-    }
-    
-    /**
-     * 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 nodeList = anElement.getChildNodes();
-        for (int i = 0; i < nodeList.getLength(); i++) {
-            Node childNode = nodeList.item(i);
-            if(childNode.getNodeType() == Node.ELEMENT_NODE) {
-                if(childNode.getNodeName().equals(aChildElementName)) {
-                    return (Element)childNode;
-                }
-            }   
-        }
-        return null;
-    }
-
-	/**
-     * Determines the current prefix that should be used for completion.
-     */
-	private String getCurrentPrefix() {
-		if (currentPrefix != null) {
-        	return currentPrefix;
-        }
-		ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
-		IDocument doc = viewer.getDocument();
-        return getPrefixFromDocument(doc.get(), selection.getOffset() + selection.getLength()).toLowerCase();
-	}
-
-
-    /**
-     * Returns the prefix in the specified document text with respect to the 
-     * specified offset.
-     * 
-     * @param aDocumentText the whole content of the edited file as String
-     * @param anOffset the cursor position
-     */
-    protected String getPrefixFromDocument(String aDocumentText, int anOffset) {
-        if (currentPrefix != null) {
-        	return currentPrefix;
-        }
-        int startOfWordToken = anOffset;
-        
-        char token= 'a';
-        if (startOfWordToken > 0) {
-			token= aDocumentText.charAt(startOfWordToken - 1);
-        }
-        
-        while (startOfWordToken > 0 
-                && (Character.isJavaIdentifierPart(token) 
-                    || '.' == token
-					|| '-' == token
-        			|| ';' == token)
-                && !('$' == token)) {
-            startOfWordToken--;
-            if (startOfWordToken == 0) {
-            	break; //word goes right to the beginning of the doc
-            }
-			token= aDocumentText.charAt(startOfWordToken - 1);
-        }
-        
-        if (startOfWordToken != anOffset) {
-            currentPrefix= aDocumentText.substring(startOfWordToken, anOffset).toLowerCase();
-        } else {
-            currentPrefix= ""; //$NON-NLS-1$
-        }
-        return currentPrefix;
-    }
- 
- 
-    /**
-     * Returns the current proposal mode.
-     */
-    protected int determineProposalMode(IDocument document, int aCursorPosition, String aPrefix) {
-    	if (currentProposalMode != -1) {
-    		return currentProposalMode;
-    	}
-    	if (document.getLength() == 0 || (document.getLength() == 1 && document.get().equals("<"))) { //$NON-NLS-1$
-    		return PROPOSAL_MODE_BUILDFILE;
-    	}
-    	
-        // String from beginning of document to the beginning of the prefix
-    	String text= document.get();
-        String stringToPrefix = text.substring(0, aCursorPosition - aPrefix.length());
-        if (stringToPrefix.length() == 0) {
-        	return PROPOSAL_MODE_BUILDFILE;
-        }
-        
-        // 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 != '>' && 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 && isKnownElement(taskString)) {
-                    return PROPOSAL_MODE_ATTRIBUTE_PROPOSAL;
-                }
-            }                
-        } else if(stringToPrefix.charAt(stringToPrefix.length()-1) == '"' || trimmedString.charAt(trimmedString.length()-1) == ',') {
-			// Attribute value proposal
-            String taskString= getTaskStringFromDocumentStringToPrefix(trimmedString);
-            if (taskString != null && isKnownElement(taskString)) {
-                return PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL;
-            }
-        } else {  // Possibly a Task proposal
-            int spaceIndex = stringToPrefix.lastIndexOf(' ');
-            int lessThanIndex = stringToPrefix.lastIndexOf('<');
-            int greaterThanIndex = stringToPrefix.lastIndexOf('>');
-            
-            // Task proposal
-            if(lessThanIndex > spaceIndex && greaterThanIndex < lessThanIndex) {
-                int slashIndex = stringToPrefix.lastIndexOf('/');
-                if(slashIndex == lessThanIndex +1) {
-                    return PROPOSAL_MODE_TASK_PROPOSAL_CLOSING; // ... </
-                }
-                return PROPOSAL_MODE_TASK_PROPOSAL;
-            }
-            if(lessThanIndex < greaterThanIndex) {
-            	if (isPropertyProposalMode(stringToPrefix)) {
-				   return PROPOSAL_MODE_PROPERTY_PROPOSAL;
-			   }
-               return PROPOSAL_MODE_TASK_PROPOSAL;
-            }
-        }
-
-        // Property proposal
-		if (isPropertyProposalMode(stringToPrefix)) {
-			return PROPOSAL_MODE_PROPERTY_PROPOSAL;
-        }
-        	            
-        return PROPOSAL_MODE_NONE;
-    }
-
-
-	private boolean isPropertyProposalMode(String stringToPrefix) {
-		if(stringToPrefix.length() >= 2) {
-			String lastTwoChars = stringToPrefix.substring(stringToPrefix.length()-2, stringToPrefix.length());
-			if(lastTwoChars.equals("${") || //$NON-NLS-1$
-				stringToPrefix.charAt(stringToPrefix.length()-1) == '$') {
-					return true;
-			}
-		}
-		return false;
-	}
-    /**
-     * 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 index = taskString.indexOf(' ');
-            if(index > 0) {
-                taskString = taskString.substring(0, index);
-            }
-            index = taskString.indexOf('\n');
-            if(index > 0) {
-                taskString = taskString.substring(0, index);
-            }
-            index = taskString.indexOf('\r');
-            if(index > 0) {
-                taskString = taskString.substring(0, index);
-            }
-            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 docStringToPrefix) {
-        int index = docStringToPrefix.lastIndexOf('=');
-        String subString = docStringToPrefix.substring(0, index);
-        subString = subString.trim();
-        
-        index = subString.lastIndexOf(' ');
-        if(index > 0) {
-            subString = subString.substring(index+1, subString.length());
-        }
-        index = subString.lastIndexOf('\n');
-        if(index > 0) {
-            subString = subString.substring(index+1, subString.length());
-        }
-        index = subString.lastIndexOf('\r');
-        if(index > 0) {
-            subString = subString.substring(index+1, subString.length());
-        }
-        return subString;
-    }
-
-
-    /**
-     * Returns whether the specified element name is known
-     */
-    protected boolean isKnownElement(String elementName) {
-    	if (elementName.equals("target") || elementName.equals("project")) { //$NON-NLS-1$ //$NON-NLS-2$
-    		return true;
-    	} 
-		AntProjectNode node= antModel.getProjectNode();
-    	if (node != null) {
-    		Project antProject= node.getProject();
-    		if (ComponentHelper.getComponentHelper(antProject).getDefinition(elementName) != null) {
-    			return true;
-    		}
-    		//not everything is a task or type (nested elements)
-    		if (dtd.getElement(elementName) != null) {
-    			return true;
-    		}
-    	}
-    	
-        return false;
-    }
-
-    private Class getTaskClass(String taskName) {
-    	AntProjectNode node= antModel.getProjectNode();
-    	if (node != null) {
-    		Project antProject= node.getProject();
-    		Map tasksAndTypes= ComponentHelper.getComponentHelper(antProject).getAntTypeTable();
-    		return (Class)tasksAndTypes.get(taskName);
-    	}
-    	return 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 String getParentName(IDocument document, int aLineNumber, int aColumnNumber) {
-    	if (document.getLength() == 0) {
-    		return null;
-    	}
-    	AntProjectNode project= antModel.getProjectNode();
-    	if (project == null) {
-    		return null;
-    	}
-    	int offset= getOffset(document, aLineNumber, aColumnNumber);
-    	if (offset == -1) {
-    		return null;
-    	}
-    	AntElementNode node= project.getNode(offset);
-    	if (node == null) {
-    		node= antModel.getOpenElement();
-    	}
-    	if (node == null) {
-    		return ""; //$NON-NLS-1$
-    	} else if (node instanceof AntTaskNode) {
-    		String name= node.getName();
-    		if (offset <= node.getOffset() + name.length() - 1) {
-    			//not really the enclosing node as the offset is within the name of the node
-    			node= node.getParentNode();
-    		} else {
-    			return name;
-    		}
-    	}
-    	if (node instanceof AntTaskNode) {
-    		return node.getName();
-    	} else if (node instanceof AntTargetNode) {
-    		return "target"; //$NON-NLS-1$
-    	} else {
-    		return "project"; //$NON-NLS-1$
-    	}
-    }
-
-    /**
-     * 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(IDocument document) {
-		/*
-		 * What is implemented here:
-		 * - Retrieve the project from the Ant model
-		 * - Determine the enclosing target
-		 * - Determine the dependency Vector for the target
-		 * - Work through the dependency Vector and execute the
-		 *   Property relevant tasks.
-		 */
-
-    	Project project= antModel.getProjectNode().getProject();
-        
-        // Determine the parent
-    	String targetName = getEnclosingTargetName(document, lineNumber, columnNumber);
-         
-        if(targetName == null) {
-        	return project.getProperties();
-        }
-        List sortedTargets = null;
-        try {
-        	sortedTargets= project.topoSort(targetName, project.getTargets());
-        } catch (BuildException be) {
-			return project.getProperties();
-        }
-
-        int curidx = 0;
-        Target curtarget;
-
-        do {
-            curtarget = (Target) sortedTargets.get(curidx++);
-			Task[] tasks = curtarget.getTasks();
-			Task task;
-			for (int i = 0; i < tasks.length; i++) {
-				task= tasks[i];                
-				if (task instanceof UnknownElement) {
-					try {
-						task.maybeConfigure();
-					} catch (BuildException be) {
-						continue;
-					}
-					task= ((UnknownElement)task).getTask();
-				}
-				
-				if(AntModel.isPropertySettingTask(task.getTaskName())) { 
-					try {
-						task.perform();
-					} catch (BuildException be) {
-						
-					}
-				}
-            }
-        } while (!curtarget.getName().equals(targetName));
-
-        return project.getProperties();
-    }
-    
-    private Map getTargets() {
-    	Project project = antModel.getProjectNode().getProject();  
-    	return project.getTargets();
-    }
-
-    protected File getEditedFile() {
-    	IWorkbenchPage page= AntUIPlugin.getActivePage();
-    	if (page == null) {
-    		return null;
-    	}
-		IEditorPart editor= page.getActiveEditor();
-		if (editor == null) {
-			return null;
-		}
-        FileEditorInput input = (FileEditorInput) editor.getEditorInput();
-        String projectPath = input.getFile().getProject().getLocation().toFile().getAbsolutePath();
-        String  projectRelativeFilePath = input.getFile().getFullPath().removeFirstSegments(1).makeRelative().toString();
-        return new File(projectPath + File.separator + projectRelativeFilePath);
-    }
-    
-    private String getOpenElementName() {
-    	AntElementNode node= antModel.getOpenElement();
-    	if (node == null) {
-    		return null;
-    	}
-    	return node.getName();
-    }
-
-    /**
-     * Finds the enclosing target in respect to the cursor position and returns its name  
-     * 
-     * @return the name of the enclosing target or <code>null</code> if not found 
-	 * or the element is not contained in a target.
-     */
- 	private String getEnclosingTargetName(IDocument document, int aLineNumber, int aColumnNumber) {
-
-       AntProjectNode project= antModel.getProjectNode();
-       int offset= getOffset(document, aLineNumber, aColumnNumber);
-       if(offset == -1) {
-       		return null;
-       }
-       AntElementNode node= project.getNode(offset);
-       if (node instanceof AntTaskNode) {
-       		node= node.getParentNode();
-       		if (!(node instanceof AntTargetNode)) {
-       			//top level task
-       			node= null;
-       		}
-       } else if (node instanceof AntProjectNode) {
-       		node= null;
-       }
-       String targetName = null;
-       if(node == null 
-       		|| (targetName = ((AntTargetNode)node).getTarget().getName()) == null
-			|| targetName.length() == 0) {
-       		return null;
-       }
-       return targetName;
- 	}
- 	
- 	private int getOffset(IDocument document, int line, int column) {
- 		try {
-			return document.getLineOffset(line ) + column - 1;
-		} catch (BadLocationException e) {
-			return -1;
-		}
- 	}
-	
-	/**
-	 * 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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#extractPrefix(org.eclipse.jface.text.ITextViewer, int)
-	 */
-	protected String extractPrefix(ITextViewer textViewer, int offset) {
-		return getPrefixFromDocument(textViewer.getDocument().get(), offset);
-	}
-
-	/**
-	 * Cut out angular brackets for relevance sorting, since the template name
-	 * does not contain the brackets.
-	 */
-	protected int getRelevance(Template template, String prefix) {
-		if (prefix.startsWith("<")) //$NON-NLS-1$
-			prefix= prefix.substring(1);
-		if (template.getName().startsWith(prefix))
-			return 90; 
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#getTemplates(java.lang.String)
-	 */
-	protected Template[] getTemplates(String contextTypeId) {
-		return AntTemplateAccess.getDefault().getTemplateStore().getTemplates();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#getContextType(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
-	 */
-	protected TemplateContextType getContextType(ITextViewer textViewer, IRegion region) {
-		 switch (determineProposalMode(textViewer.getDocument(), cursorPosition, getCurrentPrefix())) {
-            case PROPOSAL_MODE_TASK_PROPOSAL:
-            	return AntTemplateAccess.getDefault().getContextTypeRegistry().getContextType(TaskContextType.TASK_CONTEXT_TYPE);
-            case PROPOSAL_MODE_BUILDFILE:
-            	return AntTemplateAccess.getDefault().getContextTypeRegistry().getContextType(BuildFileContextType.BUILDFILE_CONTEXT_TYPE);
-			case PROPOSAL_MODE_NONE :
-            case PROPOSAL_MODE_ATTRIBUTE_PROPOSAL:
-            case PROPOSAL_MODE_TASK_PROPOSAL_CLOSING:
-            case PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL:
-            case PROPOSAL_MODE_PROPERTY_PROPOSAL:
-            default :
-            	return null;
-        }
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#getImage(org.eclipse.jface.text.templates.Template)
-     */
-    protected Image getImage(Template template) {
-        return AntUIImages.getImage(IAntUIConstants.IMG_TEMPLATE_PROPOSAL);
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#createContext(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
-	 */
-	protected TemplateContext createContext(ITextViewer contextViewer, IRegion region) {
-		TemplateContextType contextType= getContextType(contextViewer, region);
-		if (contextType != null) {
-			IDocument document= contextViewer.getDocument();
-			return new AntContext(contextType, document, antModel, region.getOffset(), region.getLength());
-		}
-		return null;
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#createProposal(org.eclipse.jface.text.templates.Template, org.eclipse.jface.text.templates.TemplateContext, org.eclipse.jface.text.Region, int)
-	 */
-	protected ICompletionProposal createProposal(Template template,TemplateContext context, Region region, int relevance) {
-		return new AntTemplateProposal(template, context, region, getImage(template), relevance);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorMessages.java
deleted file mode 100644
index 2066f4d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.editor;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntEditorMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/editor/AntEditorMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorMessages.properties
deleted file mode 100644
index 4148d44..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorMessages.properties
+++ /dev/null

@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     John-Mason P. Shackelford - bug 40255
-###############################################################################
-
-ContentAssistProposal.label=Content &Assist@Ctrl+Space
-ContentAssistProposal.tooltip=Content Assist
-ContentAssistProposal.image=
-ContentAssistProposal.description=Content Assist
-
-ContentFormat.label=F&ormat@Ctrl+Shift+F
-ContentFormat.tooltip=Format build file source
-ContentFormat.image=
-ContentFormat.description=Format build file source
-
-AntEditorCompletionProcessor.Required___4=Required:
-AntEditorCompletionProcessor.28=No attribute completions available
-AntEditorCompletionProcessor.29=No task completions available
-AntEditorCompletionProcessor.30=No task closing completions available
-AntEditorCompletionProcessor.31=No attribute value completions available
-AntEditorCompletionProcessor.32=No property completions available
-AntEditorCompletionProcessor.33=No completions available
-AntEditorCompletionProcessor.39=Closing tag
-AntEditorCompletionProcessor.59=Default: {0}
-AntEditorCompletionProcessor.0=Custom task code completion for {0} is not available due to classpath problems
-AntEditorCompletionProcessor.1=Not required
-AntEditorCompletionProcessor.2=Required
-
-AntAnnotationHover.multipleMarkersAtThisLine=Multiple markers at this line
-
-OpenDeclarationAction.0=&Open Declaration@F3
-OpenDeclarationAction.1=Open an editor on the referenced element
-
-AntEditor.3=Current text selection does not resolve to an Ant reference
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java
deleted file mode 100644
index 1798dac..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorSourceViewerConfiguration.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *     John-Mason P. Shackelford - bug 40255
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor;
-
-import org.eclipse.ant.internal.ui.editor.derived.HTMLTextPresenter;
-import org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormattingStrategy;
-import org.eclipse.ant.internal.ui.editor.formatter.XmlElementFormattingStrategy;
-import org.eclipse.ant.internal.ui.editor.text.AntEditorPartitionScanner;
-import org.eclipse.ant.internal.ui.editor.text.NotifyingReconciler;
-import org.eclipse.ant.internal.ui.editor.text.XMLAnnotationHover;
-import org.eclipse.ant.internal.ui.editor.text.XMLReconcilingStrategy;
-import org.eclipse.ant.internal.ui.editor.text.XMLTextHover;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.IAutoIndentStrategy;
-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.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The source viewer configuration for the Ant Editor.
- */
-public class AntEditorSourceViewerConfiguration extends AbstractAntSourceViewerConfiguration {
-    
-    private AntEditor fEditor;
-
-    private XMLTextHover fTextHover;
-    
-    private ContentAssistant contentAssistant;
-    
-    private AntAutoIndentStrategy autoIndentStrategy;
-    
-    /**
-     * 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(fEditor.getAntModel()); 
-		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(IContentAssistant.PROPOSAL_OVERLAY);
-		contentAssistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
-		contentAssistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));
-	
-		Color background= JFaceResources.getColorRegistry().get(AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND);			
-		contentAssistant.setContextInformationPopupBackground(background);
-		contentAssistant.setContextSelectorBackground(background);
-		contentAssistant.setProposalSelectorBackground(background);
-
-		Color foreground= JFaceResources.getColorRegistry().get(AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND);
-		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)
-     * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer)
-     */
-    public IReconciler getReconciler(ISourceViewer sourceViewer) {
-	    NotifyingReconciler reconciler= new NotifyingReconciler(new XMLReconcilingStrategy(fEditor), true);
-	    reconciler.setDelay(XMLReconcilingStrategy.DELAY);
-	    reconciler.addReconcilingParticipant(fEditor);
-	    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(fEditor);
-		}
-		return fTextHover;
-	}
-	
-	protected void changeConfiguration(PropertyChangeEvent event) {
-		IPreferenceStore store= AntUIPlugin.getDefault().getPreferenceStore();
-		String p= event.getProperty();
-
-		if (AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION.equals(p) && contentAssistant != null) {
-			boolean enabled= store.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION);
-			contentAssistant.enableAutoActivation(enabled);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY.equals(p) && contentAssistant != null) {
-			int delay= store.getInt(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY);
-			contentAssistant.setAutoActivationDelay(delay);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND.equals(p) && contentAssistant != null) {
-			Color c= JFaceResources.getColorRegistry().get(AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND);
-			contentAssistant.setProposalSelectorForeground(c);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND.equals(p) && contentAssistant != null) {
-			Color c= JFaceResources.getColorRegistry().get(AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND);
-			contentAssistant.setProposalSelectorBackground(c);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT.equals(p) && contentAssistant != null) {
-			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());
-			}
-		}		
-	}
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentFormatter(org.eclipse.jface.text.source.ISourceViewer)
-     */
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		 
-		MultiPassContentFormatter formatter = new MultiPassContentFormatter(
-				getConfiguredDocumentPartitioning(sourceViewer),
-		         IDocument.DEFAULT_CONTENT_TYPE);
-		 
-		
-		formatter.setMasterStrategy(new XmlDocumentFormattingStrategy());
-		
-		formatter.setSlaveStrategy(new XmlElementFormattingStrategy(), AntEditorPartitionScanner.XML_TAG);
-		
-		//formatter.setSlaveStrategy(new XmlCommentFormattingStrategy(), AntEditorPartitionScanner.XML_COMMENT);
-		 
-		return formatter;
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAutoIndentStrategy(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
-	 */
-	public IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) {
-		if (AntEditorPartitionScanner.XML_COMMENT.equals(contentType)) {
-			return super.getAutoIndentStrategy(sourceViewer, contentType);
-		} 
-		if (autoIndentStrategy == null) {
-			autoIndentStrategy= new AntAutoIndentStrategy(fEditor.getAntModel());
-		}
-		return autoIndentStrategy;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/OpenDeclarationAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/OpenDeclarationAction.java
deleted file mode 100644
index 213c350..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/OpenDeclarationAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor;
-
-import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
-import org.eclipse.jdt.ui.actions.OpenAction;
-import org.eclipse.jface.text.ITextSelection;
-
-public class OpenDeclarationAction extends OpenAction {
-	
-	private AntEditor fEditor;
-	
-	public OpenDeclarationAction(AntEditor antEditor) {
-		super(antEditor.getSite());
-		fEditor= antEditor;
-		setActionDefinitionId(IJavaEditorActionDefinitionIds.OPEN_EDITOR);
-		antEditor.getSite().getKeyBindingService().registerAction(this);
-
-		setText(AntEditorMessages.getString("OpenDeclarationAction.0"));  //$NON-NLS-1$
-		setDescription(AntEditorMessages.getString("OpenDeclarationAction.1")); //$NON-NLS-1$
-		setToolTipText(AntEditorMessages.getString("OpenDeclarationAction.1")); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (fEditor == null) {
-			return;
-		}
-		
-		fEditor.openReferenceElement();		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.actions.SelectionDispatchAction#selectionChanged(org.eclipse.jface.text.ITextSelection)
-	 */
-	public void selectionChanged(ITextSelection selection) {
-		setEnabled(fEditor != null);
-	}
-	
-	public void setEditor(AntEditor editor) {
-		fEditor= editor;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java
deleted file mode 100644
index f59d282..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/TaskDescriptionProvider.java
+++ /dev/null

@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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.internal.ui.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.internal.ui.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. 
- * 
- */
-public class TaskDescriptionProvider {
-
-    /**
-     * The file that contains all task descriptions.
-     */
-    public static String TASKS_DESCRIPTION_XML_FILE_NAME = "/anttasks_1.6.0.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 = "description"; //$NON-NLS-1$
-    public static String XML_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
-    public static String XML_ATTRIBUTE_REQUIRED = "required"; //$NON-NLS-1$
-    
-    private static TaskDescriptionProvider fgDefault;
-
-    protected Map taskNodes = new HashMap();
-    
-    /**
-     * Meant to be a singleton
-     */
-    private TaskDescriptionProvider() {
-        initialize();
-    }
-    
-    public static TaskDescriptionProvider getDefault() {
-    	if (fgDefault == null) {
-    		fgDefault= new TaskDescriptionProvider();
-    	}
-    	return fgDefault;
-    }
-
-    /**
-     * 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 taskElement = (Element)taskNodes.get(aTaskName);
-        if(taskElement != null) {
-            return getDescriptionOfNode(taskElement);
-        }
-        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 = 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 
-     * 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
-     * @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);
-    	}
-    	return null;
-    }
-    
-    /**
-     * Returns the Attributes Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @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);
-    	} 
-        return null;
-    }
-
-    /**
-     * Returns the Structure Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @return The Structure Node of the Task.
-     */        
-    protected Node getStructureNode(String aTaskName) {	
-    	Element taskElement = (Element)taskNodes.get(aTaskName);
-        if(taskElement != null) {
-        	//Dig us down to the Structure node
-        	Node structureNode = getChildNodeNamedOfTypeFromNode(XML_TAG_STRUCTURE, Node.ELEMENT_NODE,
-        	                                                     taskElement);
-        	return structureNode;
-        }
-        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 = 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 = 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;																 	
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTML2TextReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTML2TextReader.java
deleted file mode 100644
index 0ac1e02..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/derived/HTMLPrinter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTMLPrinter.java
deleted file mode 100644
index fcf0d09..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/derived/HTMLTextPresenter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/HTMLTextPresenter.java
deleted file mode 100644
index 63276da..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.editor.derived;
-
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-
-import org.eclipse.ant.internal.ui.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$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.DefaultInformationControl.IInformationPresenter#updatePresentation(org.eclipse.swt.widgets.Display, java.lang.String, org.eclipse.jface.text.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/internal/ui/editor/derived/LineBreakingReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/LineBreakingReader.java
deleted file mode 100644
index 207373b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/LineBreakingReader.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.internal.ui.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;
-				} 
-				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/internal/ui/editor/derived/SingleCharReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/SingleCharReader.java
deleted file mode 100644
index 5a82425..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/SingleCharReader.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.ant.internal.ui.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;
-				} 
-				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/internal/ui/editor/derived/SubstitutionTextReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/SubstitutionTextReader.java
deleted file mode 100644
index c908f89..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/derived/SubstitutionTextReader.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.internal.ui.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;
-		} 
-		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/internal/ui/editor/formatter/FormattingPreferences.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java
deleted file mode 100644
index bb95c52..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/FormattingPreferences.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- * 	   IBM Corporation - bug 52076
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.editor.formatter;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-public class FormattingPreferences {
-	
-	IPreferenceStore fPrefs= AntUIPlugin.getDefault().getPreferenceStore();
-   
-    public String getCanonicalIndent() {
-       String canonicalIndent;
-       if (!useSpacesInsteadOfTabs()) {
-            canonicalIndent = "\t"; //$NON-NLS-1$
-        } else {
-            String tab = ""; //$NON-NLS-1$
-            for (int i = 0; i < getTabWidth(); i++) {
-                tab = tab.concat(" "); //$NON-NLS-1$
-            }
-            canonicalIndent = tab;
-        }
-        
-        return canonicalIndent;
-    }
-    
-    public int getMaximumLineWidth() {
-        return fPrefs.getInt(AntEditorPreferenceConstants.FORMATTER_MAX_LINE_LENGTH);
-    }  
-    
-    public boolean wrapLongTags() {
-        return fPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_WRAP_LONG);
-    }
-    
-    public boolean alignElementCloseChar() {
-        return fPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_ALIGN);        
-    }
-
-    public boolean formatComments() {
-        return fPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_COMMENTS);
-    }
-    
-    public boolean stripBlankLines() {
-        return fPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_DELETE_BLANK_LINES);
-    }
-
-	public int getTabWidth() {
-		return fPrefs.getInt(AntEditorPreferenceConstants.FORMATTER_TAB_SIZE);
-	}
-	
-	public boolean useSpacesInsteadOfTabs() {
-    	return ! fPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_TAB_CHAR);
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java
deleted file mode 100644
index 87b55c9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java
+++ /dev/null

@@ -1,697 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.formatter;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.templates.AntContext;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.DefaultPositionUpdater;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateVariable;
-
-public class XmlDocumentFormatter {
-
-    private static class CommentReader extends TagReader {
-
-        private boolean complete = false;
-
-        protected void clear() {
-            this.complete = false;
-        }
-
-        public String getStartOfTag() {
-            return "<!--"; //$NON-NLS-1$
-        }
-
-        protected String readTag() throws IOException {
-            int intChar;
-            char c;
-            StringBuffer node = new StringBuffer();
-
-            while (!complete && (intChar = reader.read()) != -1) {
-                c = (char) intChar;
-
-                node.append(c);
-
-                if (c == '>' && node.toString().endsWith("-->")) { //$NON-NLS-1$
-                    complete = true;
-                }
-            }
-            return node.toString();
-        }
-    }
-
-    private static class DoctypeDeclarationReader extends TagReader {
-
-        private boolean complete = false;
-
-        protected void clear() {
-            this.complete = false;
-        }
-
-        public String getStartOfTag() {
-            return "<!"; //$NON-NLS-1$
-        }
-
-        protected String readTag() throws IOException {
-            int intChar;
-            char c;
-            StringBuffer node = new StringBuffer();
-
-            while (!complete && (intChar = reader.read()) != -1) {
-                c = (char) intChar;
-
-                node.append(c);
-
-                if (c == '>') {
-                    complete = true;
-                }
-            }
-            return node.toString();
-        }
-
-    }
-
-    private static class ProcessingInstructionReader extends TagReader {
-
-        private boolean complete = false;
-
-        protected void clear() {
-            this.complete = false;
-        }
-
-        public String getStartOfTag() {
-            return "<?"; //$NON-NLS-1$
-        }
-
-        protected String readTag() throws IOException {
-            int intChar;
-            char c;
-            StringBuffer node = new StringBuffer();
-
-            while (!complete && (intChar = reader.read()) != -1) {
-                c = (char) intChar;
-
-                node.append(c);
-
-                if (c == '>' && node.toString().endsWith("?>")) { //$NON-NLS-1$
-                    complete = true;
-                }
-            }
-            return node.toString();
-        }
-    }
-
-    private static abstract class TagReader {
-
-        protected Reader reader;
-
-        private String tagText;
-
-        protected abstract void clear();
-
-        public int getPostTagDepthModifier() {
-            return 0;
-        }
-
-        public int getPreTagDepthModifier() {
-            return 0;
-        }
-
-        abstract public String getStartOfTag();
-
-        public String getTagText() {
-            return this.tagText;
-        }
-
-        public boolean isTextNode() {
-            return false;
-        }
-
-        protected abstract String readTag() throws IOException;
-
-        public boolean requiresInitialIndent() {
-            return true;
-        }
-
-        public void setReader(Reader reader) throws IOException {
-            this.reader = reader;
-            this.clear();
-            this.tagText = readTag();
-        }
-
-        public boolean startsOnNewline() {
-            return true;
-        }
-    }
-
-    private static class TagReaderFactory {
-
-        // Warning: the order of the Array is important!
-        private static TagReader[] tagReaders = new TagReader[]{new CommentReader(),
-                                                                new DoctypeDeclarationReader(),
-                                                                new ProcessingInstructionReader(),
-                                                                new XmlElementReader()};
-
-        private static TagReader textNodeReader = new TextReader();
-
-        public static TagReader createTagReaderFor(Reader reader)
-                                                                 throws IOException {
-
-            char[] buf = new char[10];
-            reader.mark(10);
-            reader.read(buf, 0, 10);
-            reader.reset();
-
-            String startOfTag = String.valueOf(buf);
-
-            for (int i = 0; i < tagReaders.length; i++) {
-                if (startOfTag.startsWith(tagReaders[i].getStartOfTag())) {
-                    tagReaders[i].setReader(reader);
-                    return tagReaders[i];
-                }
-            }
-            // else
-            textNodeReader.setReader(reader);
-            return textNodeReader;
-        }
-    }
-
-    private static class TextReader extends TagReader {
-
-        private boolean complete;
-
-        private boolean isTextNode;
-
-        protected void clear() {
-            this.complete = false;
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter.TagReader#getStartOfTag()
-         */
-        public String getStartOfTag() {
-            return ""; //$NON-NLS-1$
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter.TagReader#isTextNode()
-         */
-        public boolean isTextNode() {
-            return this.isTextNode;
-        }
-
-        protected String readTag() throws IOException {
-
-            StringBuffer node = new StringBuffer();
-
-            while (!complete) {
-
-                reader.mark(1);
-                int intChar = reader.read();
-                if (intChar == -1) break;
-
-                char c = (char) intChar;
-                if (c == '<') {
-                    reader.reset();
-                    complete = true;
-                } else {
-                    node.append(c);
-                }
-            }
-
-            // if this text node is just whitespace
-            // remove it, except for the newlines.
-            if (node.length() < 1) {
-                this.isTextNode = false;
-
-            } else if (node.toString().trim().length() == 0) {
-                String whitespace = node.toString();
-                node = new StringBuffer();
-                for (int i = 0; i < whitespace.length(); i++) {
-                    char whitespaceCharacter = whitespace.charAt(i);
-                    if (whitespaceCharacter == '\n')
-                            node.append(whitespaceCharacter);
-                }
-                this.isTextNode = false;
-
-            } else {
-                this.isTextNode = true;
-            }
-            return node.toString();
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter.TagReader#requiresInitialIndent()
-         */
-        public boolean requiresInitialIndent() {
-            return false;
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter.TagReader#startsOnNewline()
-         */
-        public boolean startsOnNewline() {
-            return false;
-        }
-    }
-
-    private static class XmlElementReader extends TagReader {
-
-        private boolean complete = false;
-
-        protected void clear() {
-            this.complete = false;
-        }
-
-        public int getPostTagDepthModifier() {
-            if (getTagText().endsWith("/>") || getTagText().endsWith("/ >")) { //$NON-NLS-1$ //$NON-NLS-2$
-                return 0;
-            } else if (getTagText().startsWith("</")) { //$NON-NLS-1$
-                return 0;
-            } else {
-                return +1;
-            }
-        }
-
-        public int getPreTagDepthModifier() {
-            if (getTagText().startsWith("</")) { //$NON-NLS-1$
-                return -1;
-            } 
-            return 0;
-        }
-
-        public String getStartOfTag() {
-            return "<"; //$NON-NLS-1$
-        }
-
-        protected String readTag() throws IOException {
-
-            StringBuffer node = new StringBuffer();
-
-            boolean insideQuote = false;
-            int intChar;
-
-            while (!complete && (intChar = reader.read()) != -1) {
-                char c = (char) intChar;
-
-                node.append(c);
-                // TODO logic incorrectly assumes that " is quote character
-                // when it could also be '
-                if (c == '"') {
-                    insideQuote = !insideQuote;
-                }
-                if (c == '>' && !insideQuote) {
-                    complete = true;
-                }
-            }
-            return node.toString();
-        }
-    }
-
-    private int depth;
-
-    private StringBuffer formattedXml;
-
-    private boolean lastNodeWasText;
-
-    public XmlDocumentFormatter() {
-		super();
-		depth= -1;
-	}
-
-    private void copyNode(Reader reader, StringBuffer out, FormattingPreferences prefs) throws IOException {
-
-        TagReader tag = TagReaderFactory.createTagReaderFor(reader);
-
-        depth = depth + tag.getPreTagDepthModifier();
-
-        if (!lastNodeWasText) {
-
-            if (tag.startsOnNewline() && !hasNewlineAlready(out)) {
-                out.append("\n"); //$NON-NLS-1$
-            }
-
-            if (tag.requiresInitialIndent()) {
-                out.append(indent(prefs.getCanonicalIndent()));
-            }
-        }
-
-        out.append(tag.getTagText());
-
-        depth = depth + tag.getPostTagDepthModifier();
-
-        lastNodeWasText = tag.isTextNode();
-
-    }
-
-    public void format(TemplateBuffer templateBuffer, AntContext antContext, FormattingPreferences prefs) {	
-    	String templateString= templateBuffer.getString();
-    	IDocument fullDocument= antContext.getDocument();
-    	
-    	int completionOffset= antContext.getCompletionOffset();
-    	try {
-    		//trim any starting whitespace
-			IRegion lineRegion= fullDocument.getLineInformationOfOffset(completionOffset);
-			String lineString= fullDocument.get(lineRegion.getOffset(), lineRegion.getLength());
-			lineString.trim();
-			fullDocument.replace(lineRegion.getOffset(), lineRegion.getLength(), lineString);
-		} catch (BadLocationException e1) {
-			return;
-		}
-    	TemplateVariable[] variables= templateBuffer.getVariables();
-		int[] offsets= variablesToOffsets(variables, completionOffset);
-		
-		IDocument origTemplateDoc= new Document(fullDocument.get());
-		try {
-			origTemplateDoc.replace(completionOffset, antContext.getCompletionLength(), templateString);
-		} catch (BadLocationException e) {
-			return; // don't format if the document has changed
-		}
-		
-    	IDocument templateDocument= createDocument(origTemplateDoc.get(), createPositions(offsets));
-    	
-    	String leadingText= getLeadingText(fullDocument, antContext.getAntModel(), completionOffset);
-    	String newTemplateString= leadingText + templateString;
-    	int indent= computeIndent(leadingText, prefs.getTabWidth());
-    	setInitialIndent(indent);
-    	
-    	newTemplateString= format(newTemplateString, prefs);
-    	
-    	try {
-    		templateDocument.replace(completionOffset, templateString.length(), newTemplateString);
-		} catch (BadLocationException e) {
-			return;
-		}
-		
-    	offsetsToVariables(offsets, variables, completionOffset);
-    	templateBuffer.setContent(newTemplateString, variables);
-    }
-    
-    /**
-	 * Returns the indent of the given string.
-	 * 
-	 * @param line the text line
-	 * @param tabWidth the width of the '\t' character.
-	 */
-	public static int computeIndent(String line, int tabWidth) {
-		int result= 0;
-		int blanks= 0;
-		int size= line.length();
-		for (int i= 0; i < size; i++) {
-			char c= line.charAt(i);
-			if (c == '\t') {
-				result++;
-				blanks= 0;
-			} else if (isIndentChar(c)) {
-				blanks++;
-				if (blanks == tabWidth) {
-					result++;
-					blanks= 0;
-				}
-			} else {
-				return result;
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Indent char is a space char but not a line delimiters.
-	 * <code>== Character.isWhitespace(ch) && ch != '\n' && ch != '\r'</code>
-	 */
-	public static boolean isIndentChar(char ch) {
-		return Character.isWhitespace(ch) && !isLineDelimiterChar(ch);
-	}
-	
-	/**
-	 * Line delimiter chars are  '\n' and '\r'.
-	 */
-	public static boolean isLineDelimiterChar(char ch) {
-		return ch == '\n' || ch == '\r';
-	}	
-	
-    /**
-     * @return
-     */
-    public String format(String documentText, FormattingPreferences prefs) {
-
-        Assert.isNotNull(documentText);
-        Assert.isNotNull(prefs);
-
-        Reader reader = new StringReader(documentText);
-        formattedXml = new StringBuffer();
-
-        if (depth == -1) {
-        	depth = 0;
-        }
-        lastNodeWasText = false;
-        try {
-            while (true) {
-                reader.mark(1);
-                int intChar = reader.read();
-                reader.reset();
-
-                if (intChar != -1) {
-                    copyNode(reader, formattedXml, prefs);
-                } else {
-                    break;
-                }
-            }
-            reader.close();
-        } catch (IOException e) {
-           AntUIPlugin.log(e);
-        }
-        return formattedXml.toString();
-    }
-
-    private boolean hasNewlineAlready(StringBuffer out) {
-        return out.lastIndexOf("\n") == formattedXml.length() - 1 //$NON-NLS-1$
-               || out.lastIndexOf("\r") == formattedXml.length() - 1; //$NON-NLS-1$
-    }
-
-    private String indent(String canonicalIndent) {
-        StringBuffer indent = new StringBuffer(30);
-        for (int i = 0; i < depth; i++) {
-            indent.append(canonicalIndent);
-        }
-        return indent.toString();
-    }
-    
-    public void setInitialIndent(int indent) {
-        depth= indent;
-    }
-    
-    private Position[] createPositions(int[] positions) {
-    	Position[] p= null;
-		
-		if (positions != null) {
-			p= new Position[positions.length];
-			for (int i= 0; i < positions.length; i++) {
-				p[i]= new Position(positions[i], 0);
-			}
-		}
-		return p;
-    }
-    private Document createDocument(String string, Position[] positions) throws IllegalArgumentException {
-		Document doc= new Document(string);
-		try {
-			if (positions != null) {
-				final String POS_CATEGORY= "tempAntFormatterCategory"; //$NON-NLS-1$
-				
-				doc.addPositionCategory(POS_CATEGORY);
-				doc.addPositionUpdater(new DefaultPositionUpdater(POS_CATEGORY) {
-					protected boolean notDeleted() {
-						if (fOffset < fPosition.offset && (fPosition.offset + fPosition.length < fOffset + fLength)) {
-							fPosition.offset= fOffset + fLength; // deleted positions: set to end of remove
-							return false;
-						}
-						return true;
-					}
-				});
-				for (int i= 0; i < positions.length; i++) {
-					try {
-						doc.addPosition(POS_CATEGORY, positions[i]);
-					} catch (BadLocationException e) {
-						throw new IllegalArgumentException("Position outside of string. offset: " + positions[i].offset + ", length: " + positions[i].length + ", string size: " + string.length());   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-					}
-				}
-			}
-		} catch (BadPositionCategoryException cannotHappen) {
-			// can not happen: category is correctly set up
-		}
-		return doc;
-	}
-    
-    private int[] variablesToOffsets(TemplateVariable[] variables, int start) {
-		List list= new ArrayList();
-		for (int i= 0; i != variables.length; i++) {
-		    int[] offsets= variables[i].getOffsets();
-		    for (int j= 0; j != offsets.length; j++) {
-				list.add(new Integer(offsets[j]));
-		    }
-		}
-		
-		int[] offsets= new int[list.size()];
-		for (int i= 0; i != offsets.length; i++) {
-			offsets[i]= ((Integer) list.get(i)).intValue() + start;
-		}
-
-		Arrays.sort(offsets);
-
-		return offsets;	    
-	}
-	
-	private void offsetsToVariables(int[] allOffsets, TemplateVariable[] variables, int start) {
-		int[] currentIndices= new int[variables.length];
-		for (int i= 0; i != currentIndices.length; i++) {
-			currentIndices[i]= 0;
-		}
-
-		int[][] offsets= new int[variables.length][];
-		for (int i= 0; i != variables.length; i++) {
-			offsets[i]= variables[i].getOffsets();
-		}
-		
-		for (int i= 0; i != allOffsets.length; i++) {
-
-			int min= Integer.MAX_VALUE;
-			int minVariableIndex= -1;
-			for (int j= 0; j != variables.length; j++) {
-			    int currentIndex= currentIndices[j];
-			    
-			    // determine minimum
-				if (currentIndex == offsets[j].length)
-					continue;
-					
-				int offset= offsets[j][currentIndex];
-
-				if (offset < min) {
-				    min= offset;
-					minVariableIndex= j;
-				}		
-			}
-
-			offsets[minVariableIndex][currentIndices[minVariableIndex]]= allOffsets[i] - start + 3;
-			currentIndices[minVariableIndex]++;
-		}
-
-		for (int i= 0; i != variables.length; i++) {
-			variables[i].setOffsets(offsets[i]);	
-		}
-	}
-	
-	/**
-	 * Returns the indentation level at the position of code completion.
-	 */
-	private String getLeadingText(IDocument document, AntModel model, int completionOffset) {
-		AntProjectNode project= model.getProjectNode(false);
-		if (project == null) {
-			return ""; //$NON-NLS-1$
-		}
-		AntElementNode node= project.getNode(completionOffset);// - fAccumulatedChange);
-		if (node == null) {
-			return ""; //$NON-NLS-1$
-		}
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append(getLeadingWhitespace(node.getOffset(), document));
-		buf.append(createIndent());
-		return buf.toString();
-	}
-	
-	/**
-	 * Returns the indentation of the line at <code>offset</code> as a
-	 * <code>StringBuffer</code>. If the offset is not valid, the empty string
-	 * is returned.
-	 * 
-	 * @param offset the offset in the document
-	 * @return the indentation (leading whitespace) of the line in which
-	 * 		   <code>offset</code> is located
-	 */
-	public static StringBuffer getLeadingWhitespace(int offset, IDocument document) {
-		StringBuffer indent= new StringBuffer();
-		try {
-			IRegion line= document.getLineInformationOfOffset(offset);
-			int lineOffset= line.getOffset();
-			int nonWS= findEndOfWhiteSpace(document, lineOffset, lineOffset + line.getLength());
-			indent.append(document.get(lineOffset, nonWS - lineOffset));
-			return indent;
-		} catch (BadLocationException e) {
-			return indent;
-		}
-	}
-	
-	/**
-	 * Returns the first offset greater than <code>offset</code> and smaller than 
-	 * <code>end</code> whose character is not a space or tab character. If no such
-	 * offset is found, <code>end</code> is returned.
-	 *
-	 * @param document the document to search in
-	 * @param offset the offset at which searching start
-	 * @param end the offset at which searching stops
-	 * @return the offset in the specifed range whose character is not a space or tab
-	 * @exception BadLocationException if position is an invalid range in the given document
-	 */
-	private static int findEndOfWhiteSpace(IDocument document, int offset, int end) throws BadLocationException {
-		while (offset < end) {
-			char c= document.getChar(offset);
-			if (c != ' ' && c != '\t') {
-				return offset;
-			}
-			offset++;
-		}
-		return end;
-	}
-	
-	/**
-	 * Creates a string that represents one indent (can be
-	 * spaces or tabs..)
-	 * 
-	 * @return one indentation
-	 */
-	public static StringBuffer createIndent() {
-		StringBuffer oneIndent= new StringBuffer();
-		IPreferenceStore pluginPrefs= AntUIPlugin.getDefault().getPreferenceStore();
-		pluginPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_TAB_CHAR);
-		
-		if (!pluginPrefs.getBoolean(AntEditorPreferenceConstants.FORMATTER_TAB_CHAR)) {
-			int tabLen= pluginPrefs.getInt(AntEditorPreferenceConstants.FORMATTER_TAB_SIZE);
-			for (int i= 0; i < tabLen; i++) {
-				oneIndent.append(' ');
-			}
-		} else {
-			oneIndent.append('\t'); // default
-		}
-		
-		return oneIndent;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormattingStrategy.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormattingStrategy.java
deleted file mode 100644
index 70b8b47..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormattingStrategy.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- * 	   IBM Corporation - bug 52076
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.formatter;
-
-import java.util.LinkedList;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-
-public class XmlDocumentFormattingStrategy extends ContextBasedFormattingStrategy {
- 
-	/** Documents to be formatted by this strategy */
-	private final LinkedList fDocuments= new LinkedList();
-	
-	public XmlDocumentFormattingStrategy() {
-     }
- 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#format()
-	 */
-	public void format() {
- 
-        super.format();
-     	final IDocument document= (IDocument)fDocuments.removeFirst();
-		if (document != null) {
-	        // TODO allow formatting of regions, not just the entire document
-	        String documentText = document.get();
-	        XmlDocumentFormatter formatter = new XmlDocumentFormatter();
-	        String formattedText = formatter.format(documentText,
-	                new FormattingPreferences());
-	        if (formattedText != null && !formattedText.equals(documentText)) {
-	        	document.set(formattedText);
-	        }
-		}
-     }
-     
-     /*
- 	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
- 	 */
- 	public void formatterStarts(final IFormattingContext context) {
- 		super.formatterStarts(context);
- 		
- 		fDocuments.addLast(context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM));
- 	}
-
- 	/*
- 	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops()
- 	 */
- 	public void formatterStops() {
- 		super.formatterStops();
-
- 		fDocuments.clear();
- 	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlElementFormattingStrategy.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlElementFormattingStrategy.java
deleted file mode 100644
index d87df24..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlElementFormattingStrategy.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- * 	   IBM Corporation - bug 52076
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.formatter;
-
-import java.util.LinkedList;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TypedPosition;
-import org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-
-public class XmlElementFormattingStrategy extends ContextBasedFormattingStrategy {
-
-    /** access to the preferences store * */
-    private final FormattingPreferences prefs = new FormattingPreferences();
-    
-    /** Documents to be formatted by this strategy */
-	private final LinkedList fDocuments= new LinkedList();
-	/** Partitions to be formatted by this strategy */
-	private final LinkedList fPartitions= new LinkedList();
-
-    public XmlElementFormattingStrategy() {        
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#format()
-     */
-    public void format() {
-
-        super.format();
-                
-    	final IDocument document= (IDocument)fDocuments.removeFirst();
-		final TypedPosition partition= (TypedPosition)fPartitions.removeFirst();
-		
-		if (document == null || partition == null) {
-			return;
-		}
-
-        try {
-            String formatted = formatElement(document, partition);
-            String partitionText = document.get(partition.getOffset(),
-                    partition.getLength());
-
-            if (formatted != null && !formatted.equals(partitionText)) {
-                document.replace(partition.getOffset(), partition.getLength(),
-                        formatted);
-            }
-
-        } catch (BadLocationException e) {
-        }
-    }
-
-    private String formatElement(IDocument document, TypedPosition partition)
-            throws BadLocationException {
-
-        String partitionText = document.get(partition.getOffset(), partition
-                .getLength());
-
-        IRegion line = document.getLineInformationOfOffset(partition
-                .getOffset());
-
-        int indentLength = partition.getOffset() - line.getOffset();
-
-        return XmlTagFormatter.format(partitionText, prefs, document.get(
-                line.getOffset(), indentLength));
-
-    }
-
-    /*
- 	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
- 	 */
- 	public void formatterStarts(final IFormattingContext context) {
- 		super.formatterStarts(context);
- 		
- 		fPartitions.addLast(context.getProperty(FormattingContextProperties.CONTEXT_PARTITION));
- 		fDocuments.addLast(context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM));
- 	}
-
- 	/*
- 	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops()
- 	 */
- 	public void formatterStops() {
- 		super.formatterStops();
-
- 		fPartitions.clear();
- 		fDocuments.clear();
- 	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlTagFormatter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlTagFormatter.java
deleted file mode 100644
index b6d95e9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlTagFormatter.java
+++ /dev/null

@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.editor.formatter;
-
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- *  
- */
-public class XmlTagFormatter {
-
-    protected static class AttributePair {
-
-        private String attribute;
-
-        private String value;
-
-        public AttributePair(String attribute, String value) {
-            this.attribute = attribute;
-            this.value = value;
-        }
-
-        public String getAttribute() {
-            return attribute;
-        }
-
-        public String getValue() {
-            return value;
-        }
-    }
-
-    protected static class ParseException extends Exception {
-
-        public ParseException(String message) {
-            super(message);
-        }
-    }
-
-    protected static class Tag {
-
-        private List attributes = new ArrayList();
-
-        private boolean closed;
-
-        private String elementName;
-
-        public void addAttribute(String attribute, String value) {
-            attributes.add(new AttributePair(attribute, value));
-        }
-
-        public int attributeCount() {
-            return attributes.size();
-        }
-
-        public AttributePair getAttributePair(int i) {
-            return (AttributePair) attributes.get(i);
-        }
-
-        public String getElementName() {
-            return this.elementName;
-        }
-
-        public boolean isClosed() {
-            return closed;
-        }
-
-        public int minimumLength() {
-            int length = 2; // for the < >
-            if (this.isClosed()) length++; // if we need to add an />
-            length += this.getElementName().length();
-            if (this.attributeCount() > 0 || this.isClosed()) length++;
-            for (int i = 0; i < this.attributeCount(); i++) {
-                AttributePair attributePair = this.getAttributePair(i);
-                length += attributePair.getAttribute().length();
-                length += attributePair.getValue().length();
-                length += 4; // equals sign, quote characters & trailing space
-            }
-            if (this.attributeCount() > 0 && !this.isClosed()) length--;
-            return length;
-        }
-
-        public void setAttributes(List attributePair) {
-            attributes.clear();
-            attributes.addAll(attributePair);
-        }
-
-        public void setClosed(boolean closed) {
-            this.closed = closed;
-        }
-
-        public void setElementName(String elementName) {
-            this.elementName = elementName;
-        }
-
-        public String toString() {
-            StringBuffer sb = new StringBuffer(500);
-            sb.append("<"); //$NON-NLS-1$
-            sb.append(this.getElementName());
-            if (this.attributeCount() > 0 || this.isClosed()) sb.append(' ');
-
-            for (int i = 0; i < this.attributeCount(); i++) {
-                AttributePair attributePair = this.getAttributePair(i);
-                sb.append(attributePair.getAttribute());
-                sb.append("=\""); //$NON-NLS-1$
-                sb.append(attributePair.getValue());
-                sb.append("\""); //$NON-NLS-1$
-                if (this.isClosed() || i != this.attributeCount() - 1)
-                        sb.append(' ');
-            }
-            if (this.isClosed()) sb.append("/"); //$NON-NLS-1$
-            sb.append(">"); //$NON-NLS-1$
-            return sb.toString();
-        }
-    }
-
-    protected static class TagFormatter {
-
-        /**
-         * @param searchChar
-         * @param inTargetString
-         * @return
-         */
-        private int countChar(char searchChar, String inTargetString) {
-            StringCharacterIterator iter = new StringCharacterIterator(
-                    inTargetString);
-            int i = 0;
-            if (iter.first() == searchChar) i++;
-            while (iter.getIndex() < iter.getEndIndex()) {
-                if (iter.next() == searchChar) {
-                    i++;
-                }
-            }
-            return i;
-        }
-
-        /**
-         * @param tagText
-         * @param prefs
-         * @param indent
-         * @return
-         */
-        public String format(Tag tag, FormattingPreferences prefs, String indent) {
-            if (prefs.wrapLongTags()
-                    && lineRequiresWrap(indent + tag.toString(), prefs
-                            .getMaximumLineWidth(), prefs.getTabWidth())) {
-                return wrapTag(tag, prefs, indent);
-            }
-            return tag.toString();
-        }
-
-        /**
-         * @param line
-         * @param lineWidth
-         * @param tabWidth
-         * @return
-         */
-        protected boolean lineRequiresWrap(String line, int lineWidth,
-                int tabWidth) {
-            return tabExpandedLineWidth(line, tabWidth) > lineWidth;
-        }
-
-        /**
-         * @param line
-         *            the line in which spaces are to be expanded
-         * @param tabWidth
-         *            number of spaces to substitute for a tab
-         * @return length of the line with tabs expanded to spaces
-         */
-        protected int tabExpandedLineWidth(String line, int tabWidth) {
-            int tabCount = countChar('\t', line);
-            return (line.length() - tabCount) + (tabCount * tabWidth);
-        }
-
-        /**
-         * @param tag
-         * @param prefs
-         * @param indent
-         * @return
-         */
-        protected String wrapTag(Tag tag, FormattingPreferences prefs,
-                String indent) {
-            StringBuffer sb = new StringBuffer(1024);
-            sb.append('<');
-            sb.append(tag.getElementName());
-            sb.append(' ');
-
-            if (tag.attributeCount() > 0) {
-                sb.append(tag.getAttributePair(0).getAttribute());
-                sb.append("=\""); //$NON-NLS-1$
-                sb.append(tag.getAttributePair(0).getValue());
-                sb.append('"');
-            }
-
-            if (tag.attributeCount() > 1) {
-                char[] extraIndent = new char[tag.getElementName().length() + 2];
-                Arrays.fill(extraIndent, ' ');
-                for (int i = 1; i < tag.attributeCount(); i++) {
-                    sb.append('\n');
-                    sb.append(indent);
-                    sb.append(extraIndent);
-                    sb.append(tag.getAttributePair(i).getAttribute());
-                    sb.append("=\""); //$NON-NLS-1$
-                    sb.append(tag.getAttributePair(i).getValue());
-                    sb.append('"');
-                }
-            }
-
-            if (prefs.alignElementCloseChar()) {
-                sb.append("\n"); //$NON-NLS-1$
-                sb.append(indent);
-            } else if (tag.isClosed()) {
-                sb.append(' ');
-            }
-
-            if (tag.isClosed()) sb.append("/"); //$NON-NLS-1$
-            sb.append(">"); //$NON-NLS-1$
-            return sb.toString();
-        }
-    }
-
-    // if object creation is an issue, use static methods or a flyweight
-    // pattern
-    protected static class TagParser {
-
-        private String elementName;
-
-        private String parseText;
-
-        /**
-         *  
-         */
-        protected List getAttibutes(String elementText)
-                throws ParseException {
-
-            class Mode {
-                private int mode;
-                public void setAttributeNameSearching() {mode = 0;}
-                public void setAttributeNameFound() {mode = 1;}
-                public void setAttributeValueSearching() {mode = 2;}
-                public void setAttributeValueFound() {mode = 3;}
-                public void setFinished() {mode = 4;}
-                public boolean isAttributeNameSearching() {return mode == 0;}
-                public boolean isAttributeNameFound() {return mode == 1;}
-                public boolean isAttributeValueSearching() {return mode == 2;}
-                public boolean isAttributeValueFound() {return mode == 3;}
-                public boolean isFinished() {return mode == 4;}
-            }
-
-            List attributePairs = new ArrayList();
-
-            CharacterIterator iter = new StringCharacterIterator(elementText
-                    .substring(getElementName(elementText).length() + 2));
-
-            // state for finding attributes
-            Mode mode = new Mode();
-            mode.setAttributeNameSearching();
-            char attributeQuote = '"';
-            StringBuffer currentAttributeName = null;
-            StringBuffer currentAttributeValue = null;
-
-            char c = iter.first();
-            while (!mode.isFinished() && iter.getIndex() < iter.getEndIndex()) {
-                
-                switch (c) {                
-                
-                case '"':
-                case '\'':
-
-                    if (mode.isAttributeValueSearching()) {
-
-                        // start of an attribute value
-                        attributeQuote = c;
-                        mode.setAttributeValueFound();
-                        currentAttributeValue = new StringBuffer(1024);
-
-                    } else if (mode.isAttributeValueFound()
-                            && attributeQuote == c) {
-
-                        // we've completed a pair!
-                        AttributePair pair = new AttributePair(
-                                currentAttributeName.toString(),
-                                currentAttributeValue.toString());
-
-                        attributePairs.add(pair);
-
-                        // start looking for another attribute
-                        mode.setAttributeNameSearching();
-
-                    } else if (mode.isAttributeValueFound()
-                            && attributeQuote != c) {
-
-                        // this quote character is part of the attribute value
-                        currentAttributeValue.append(c);
-
-                    } else {
-                        // this is no place for a quote!
-                        throw new ParseException("Unexpected '" + c //$NON-NLS-1$
-                                + "' when parsing:\n\t" + elementText); //$NON-NLS-1$
-                    }
-                    break;
-
-                case '=':
-                    
-                    if (mode.isAttributeValueFound()) {
-
-                        // this character is part of the attribute value
-                        currentAttributeValue.append(c);
-
-                    } else if (mode.isAttributeNameFound()) {
-
-                        // end of the name, now start looking for the value
-                        mode.setAttributeValueSearching();
-                        
-                    } else {
-                        // this is no place for an equals sign!
-                        throw new ParseException("Unexpected '" + c //$NON-NLS-1$
-                                + "' when parsing:\n\t" + elementText); //$NON-NLS-1$
-                    }
-                    break;
-
-                case '/':
-                case '>':
-                    if (mode.isAttributeValueFound()) {
-                        // attribute values are CDATA, add it all
-                        currentAttributeValue.append(c);
-                    } else if (mode.isAttributeNameSearching()) {
-                        mode.setFinished();
-                    } else {
-                        // we aren't ready to be done!
-                        throw new ParseException("Unexpected '" + c //$NON-NLS-1$
-                                + "' when parsing:\n\t" + elementText); //$NON-NLS-1$
-                    }
-                    break;
-
-                default:
-
-                    if (mode.isAttributeValueFound()) {
-                        // attribute values are CDATA, add it all
-                        currentAttributeValue.append(c);
-                    } else {
-                        if (!Character.isWhitespace(c)) {
-                            if (mode.isAttributeNameSearching()) {
-                                // we found the start of an attribute name
-                                mode.setAttributeNameFound();
-                                currentAttributeName = new StringBuffer(255);
-                                currentAttributeName.append(c);
-                            } else if (mode.isAttributeNameFound()) {
-                                currentAttributeName.append(c);                            
-                            }
-                        }
-                    }
-                    break;
-                }
-                
-                c = iter.next();
-            }
-            return attributePairs;
-        }
-
-        /**
-         * @param tagText
-         *            text of an XML tag
-         * @return extracted XML element name
-         */
-        protected String getElementName(String tagText) throws ParseException {
-            if (!tagText.equals(this.parseText) || this.elementName == null) {
-                int endOfTag = tagEnd(tagText);
-                if ((tagText.length() > 2) && (endOfTag > 1)) {
-                    this.parseText = tagText;
-                    this.elementName = tagText.substring(1, endOfTag);
-                } else {
-                    throw new ParseException("No element name for the tag:\n\t" //$NON-NLS-1$
-                            + tagText);
-                }
-            }
-            return elementName;
-        }
-
-        /**
-         * @param tagText
-         * @return
-         */
-        protected boolean isClosed(String tagText) {
-            return tagText.charAt(tagText.lastIndexOf(">") - 1) == '/'; //$NON-NLS-1$
-        }
-
-        /**
-         * @param tagText
-         * @return an fully populated tag
-         */
-        public Tag parse(String tagText) throws ParseException {
-            Tag tag = new Tag();
-            tag.setElementName(getElementName(tagText));
-            tag.setAttributes(getAttibutes(tagText));
-            tag.setClosed(isClosed(tagText));
-            return tag;
-        }
-
-        private int tagEnd(String text) {
-            // This is admittedly a little loose, but we don't want the
-            // formatter to be too strict...
-            // http://www.w3.org/TR/2000/REC-xml-20001006#NT-Name
-            for (int i = 1; i < text.length(); i++) {
-                char c = text.charAt(i);
-                if (!Character.isLetterOrDigit(c) && c != ':' && c != '.'
-                        && c != '-' && c != '_') { return i; }
-            }
-            return -1;
-        }
-    }
-
-    /**
-     * @param tagText
-     * @param prefs
-     * @param indent
-     * @return
-     */
-    public static String format(String tagText, FormattingPreferences prefs,
-            String indent) {
-
-        Tag tag;
-        if (tagText.startsWith("</") || tagText.startsWith("<%") //$NON-NLS-1$ //$NON-NLS-2$
-                || tagText.startsWith("<?") || tagText.startsWith("<[")) { //$NON-NLS-1$ //$NON-NLS-2$
-            return tagText;
-        } 
-    	try {
-            tag = new TagParser().parse(tagText);
-        } catch (ParseException e) {
-            // if we can't parse the tag, give up and leave the text as is.
-            return tagText;
-        }
-        return new TagFormatter().format(tag, prefs, indent);
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntDefiningTaskNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntDefiningTaskNode.java
deleted file mode 100644
index cbdc6a9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntDefiningTaskNode.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.UnknownElement;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.internal.ui.editor.outline.XMLProblem;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-public class AntDefiningTaskNode extends AntTaskNode {
-	
-	public AntDefiningTaskNode(Task task, String label) {
-		super(task, label);
-	}
-	
-	protected ImageDescriptor getBaseImageDescriptor() {
-		String taskName= getTask().getTaskName();
-		if ("taskdef".equalsIgnoreCase(taskName) || "typedef".equalsIgnoreCase(taskName)) {  //$NON-NLS-1$//$NON-NLS-2$
-			return super.getBaseImageDescriptor();
-		}
-		return AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_MACRODEF);	
-	}
-	
-	/**
-	 * Execute the defining task.
-	 */
-	public boolean configure(boolean validateFully) {
-		try {
-			getTask().maybeConfigure();
-			getTask().execute();
-			return false;
-		} catch (BuildException be) {
-			getAntModel().handleBuildException(be, this, XMLProblem.SEVERITY_WARNING);
-		}
-		return false;
-	}
-	
-	public Object getRealTask() {
-		Task task= getTask();
-		if (task instanceof UnknownElement) {
-			task.maybeConfigure();
-			return ((UnknownElement)task).getRealThing();
-		}
-		return task;
-	}
-	
-	/*
-	 * Sets the Java class path in org.apache.tools.ant.types.Path
-	 * so that the classloaders defined by these "definer" tasks will have the 
-	 * correct classpath.
-	 */
-	public static void setJavaClassPath() {
-		
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		URL[] antClasspath= prefs.getURLs();
-		
-		StringBuffer buff= new StringBuffer();
-		File file= null;
-		for (int i = 0; i < antClasspath.length; i++) {
-			try {
-				file = new File(Platform.asLocalURL(antClasspath[i]).getPath());
-			} catch (IOException e) {
-				continue;
-			}
-			buff.append(file.getAbsolutePath());
-			buff.append("; "); //$NON-NLS-1$
-		}
-
-		org.apache.tools.ant.types.Path systemClasspath= new org.apache.tools.ant.types.Path(null, buff.substring(0, buff.length() - 2));
-		org.apache.tools.ant.types.Path.systemClasspath= systemClasspath;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#setParent(org.eclipse.ant.internal.ui.editor.model.AntElementNode)
-	 */
-	protected void setParent(AntElementNode node) {
-		super.setParent(node);
-		getProjectNode().addDefiningTaskNode(this);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntElementNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntElementNode.java
deleted file mode 100644
index 20ee6b9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntElementNode.java
+++ /dev/null

@@ -1,565 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49445
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.model;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.outline.IProblem;
-import org.eclipse.ant.internal.ui.editor.outline.LocationProvider;
-import org.eclipse.ant.internal.ui.editor.outline.XMLProblem;
-import org.eclipse.ant.internal.ui.model.AntImageDescriptor;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * General representation of an Ant buildfile element.
- * 
- */
-public class AntElementNode implements IAdaptable {
-    
-	/**
-	 * The offset of the corresponding source.
-	 * @see #getOffset()
-	 */
-	protected int offset= -1;
-	
-	/**
-	 * The length of the corresponding source.
-	 * @see #getLength()
-	 */
-	protected int length= -1;
-	
-	/**
-	 * The length of the source to select for this node
-	 */
-	protected int selectionLength;
-	
-    /**
-     * The parent node.
-     */
-    protected AntElementNode parent;
-    
-    /**
-     * The import node that "imported" this element
-     */
-    private AntElementNode importNode;
-
-    /**
-     * The child nodes.
-     */
-    protected List childNodes= null;
-
-    /**
-     * The (tag-)name of the element.
-     */
-    protected String name;
-
-	/**
-	 * Whether this element has been generated as part of an element hierarchy
-	 * this has problems. This is the severity of the problem.
-	 * @see XMLProblem#NO_PROBLEM
-	 * @see XMLProblem#SEVERITY_ERROR
-	 * @see XMLProblem#SEVERITY_WARNING
-	 * @see XMLProblem#SEVERITY_FATAL_ERROR
-	 */
-	private int problemSeverity= XMLProblem.NO_PROBLEM;
-	
-	/**
-	 * 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;
-	
-	/**
-	 * 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;
-
-	/**
-	 * The problem associated with this node. May be <code>null</code>.
-     */
-	private IProblem fProblem;
-	
-	/**
-	 * Only used when opening an import element to indicate the location in the imported file
-	 */
-	private int fLine;
-	private int fColumn;
-
-	/**
-     * Creates an instance with the specified name.
-     */
-    public AntElementNode(String aName) {
-       name = aName;
-    }
-    
-    /**
-     * Creates an instance with the specified name.
-     */
-    public AntElementNode() {
-    }
-    
-    
-    /**
-     * Returns the name.
-     */
-    public String getName() {
-        return name;
-    }
-    
-    
-    /**
-     * Returns the label 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 label.
-     */
-    public String getLabel() {
-    	return getName();
-    }
-    
-    
-    /**
-     * Returns the child nodes.
-     */
-    public List getChildNodes() {
-        return childNodes;
-    }
-    
-    /**
-     * Returns all the descendents of this target
-     */
-    public List getDescendents() {
-    	if (childNodes == null) {
-    		return null;
-    	}
-    	List descendents= new ArrayList();
-        determineDescendents(descendents, childNodes);
-        
-        return descendents;
-    }
-    
-    
-    private void determineDescendents(List descendents, List childrenNodes) {
-		Iterator itr= childrenNodes.iterator();
-        while (itr.hasNext()) {
-			AntElementNode element = (AntElementNode) itr.next();
-			if (element.hasChildren()) {
-				determineDescendents(descendents, element.getChildNodes());
-			}
-			descendents.add(element);
-		}
-	}
-
-	/**
-     * Returns the parent <code>AntElementNode</code>.
-     * 
-     * @return the parent or <code>null</code> if this element has no parent.
-     */
-    public AntElementNode getParentNode() {
-        return parent;
-    } 
-    
-    public AntProjectNode getProjectNode() {
-    	AntElementNode projectParent= getParentNode();
-    	while (projectParent != null && !(projectParent instanceof AntProjectNode)) {
-    		projectParent= projectParent.getParentNode();
-    	}
-    	return (AntProjectNode)projectParent;
-    }
-    
-    
-    /**
-     * Adds the specified element as child.
-     * <P>
-     * The specified element will have this assigned as its parent.
-     * 
-     */
-    public void addChildNode(AntElementNode childElement) {
-    	childElement.setParent(this);
-        if (childNodes == null) {
-        	childNodes= new ArrayList();
-        }
-        childNodes.add(childElement);
-    }
-    
-	protected void setParent(AntElementNode node) {
-		parent= node;
-	}
-
-	/**
-	 * Sets the absolute file system path of the file this element is defined
-	 * within.
-	 */
-	public void setFilePath(String path) {
-		URL url= null;
-		try {		
-			url= new URL(path);
-		} catch (MalformedURLException e) {		
-			filePath= path;
-			return;
-		}
-		filePath = new Path(new File(url.getPath()).getAbsolutePath()).toString();
-	}
-	
-	/**
-	 * Returns the absolute file system path of the file this element is defined
-     * within. Only relevant for nodes that are external
-     * @see #isExternal()
-     */
-	public String getFilePath() {
-		return filePath;
-	}
-
-    /**
-	 * 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;
-		if (fProblem != null && fProblem instanceof XMLProblem) {
-			((XMLProblem)fProblem).setLength(aLength);
-			fProblem= null;
-		}
-	}
-
-	/**
-	 * Returns a string representation of this element.
-	 */
-	public String toString() {
-		return "Ant Element Node: " + getLabel() + " Offset: " + getOffset() + " Length: " + getLength();  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	/**
-	 * 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 problemSeverity == XMLProblem.SEVERITY_ERROR || problemSeverity == XMLProblem.SEVERITY_FATAL_ERROR;
-	}
-	
-	/**
-	 * Returns whether this element has been generated as part of an element
-	 * hierarchy that has warning(s) associated with it
-	 */
-	public boolean isWarningNode() {
-		return problemSeverity == XMLProblem.SEVERITY_WARNING;
-	}
-	
-	/**
-	 * Sets whether this element has been generated as part of an element
-	 * hierarchy that has problems. The severity of the problem is provided.
-	 */
-	public void setProblemSeverity(int severity) {
-		this.problemSeverity= severity;
-	}
-	
-	/**
-	 * 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;
-	}
-	
-	private 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(getLabel() != null ? getLabel() : ""), '\\', "$/[]\\").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(AntElementNode child) {
-		if (getChildNodes() == null) {
-			return -1;
-		}
-		
-		int result= -1;
-		
-		Iterator iter= getChildNodes().iterator();
-		AntElementNode current= null;
-		while (current != child && iter.hasNext()) {
-			current= (AntElementNode) 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 AntElementNode || o2 instanceof AntElementNode)) {
-			return o2.equals(o1);
-		}
-		if (!(o1 instanceof AntElementNode && o2 instanceof AntElementNode)) {
-			return false;
-		}
-		
-		AntElementNode e1= (AntElementNode) o1;
-		AntElementNode e2= (AntElementNode) o2;
-	
-		return e1.getElementPath().equals(e2.getElementPath());
-	}
-
-	/*
-	 * @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
-		
-		return getElementPath().hashCode();
-	}
-
-	/**
-	 * Returns the length of source to select for this node.
-	 * @return the length of source to select
-	 */
-	public int getSelectionLength() {
-		return selectionLength;
-	}
-	
-	public void setSelectionLength(int selectionLength) {
-		this.selectionLength= selectionLength;
-	}
-	
-	/**
-	 * Returns the node with the narrowest source range that contains the offset.
-	 * It may be this node or one of its children or <code>null</code> if the offset is not in the source range of this node.
-	 * @param sourceOffset The source offset
-	 * @return the node that includes the offset in its source range or <code>null</code>
-	 */
-	public AntElementNode getNode(int sourceOffset) {
-		if (childNodes != null) {
-			for (Iterator iter = childNodes.iterator(); iter.hasNext(); ) {
-				AntElementNode node = (AntElementNode) iter.next();
-				AntElementNode containingNode= node.getNode(sourceOffset);
-				if (containingNode != null) {
-					return containingNode;
-				}
-			}
-		}
-		if (length == -1 && offset <= sourceOffset && !isExternal()) { //this is still an open element
-			return this;
-		}
-		if (offset <= sourceOffset && sourceOffset <= (offset + length - 2)) {
-			return this;
-		}
-		
-		return null;
-	}
-	
-	public Image getImage() {
-		int flags = 0;
-		
-		if (isErrorNode()) {
-			flags = flags | AntImageDescriptor.HAS_ERRORS;
-		} else if (isWarningNode()) {
-			flags = flags | AntImageDescriptor.HAS_WARNINGS;
-		}
-		if(importNode != null || isExternal()){
-			flags = flags | AntImageDescriptor.IMPORTED;
-		}
-		ImageDescriptor base= getBaseImageDescriptor();
-		return AntUIImages.getImage(new AntImageDescriptor(base, flags));			
-	}
-
-	protected ImageDescriptor getBaseImageDescriptor() {
-		return AntUIImages.getImageDescriptor(IAntUIConstants.IMG_TASK_PROPOSAL);
-	}
-	
-	protected AntModel getAntModel() {
-		AntElementNode parentNode= getParentNode();
-		while (!(parentNode instanceof AntProjectNode)) {
-			parentNode= parentNode.getParentNode();
-		}
-		return parentNode.getAntModel();
-	}
-
-	/**
-	 * Sets the problem associated with this element
-	 * @param problem The problem associated with this element.
-	 */
-	public void associatedProblem(IProblem problem) {
-		fProblem= problem;
-	}
-
-	protected void appendEntityName(StringBuffer displayName) {
-		String path= getFilePath();
-		
-		if (getImportNode() != null) {
-			displayName.append(MessageFormat.format(AntModelMessages.getString("AntElementNode.9"), new String[]{getImportNode().getLabel()})); //$NON-NLS-1$
-		} else {
-			String entityName= getAntModel().getEntityName(path);
-			displayName.append(MessageFormat.format(AntModelMessages.getString("AntElementNode.9"), new String[]{entityName})); //$NON-NLS-1$
-		}
-	}
-	
-	public AntElementNode getImportNode() {
-		return importNode;
-	}
-	
-	public void setImportNode(AntElementNode importNode) {
-		this.importNode = importNode;
-	}
-	
-	public boolean hasChildren() {
-		if (childNodes == null) {
-			return false;
-		}
-		return !childNodes.isEmpty();
-	}
-
-	public void reset() {
-		childNodes= null;
-	}
-
-	public void setExternalInfo(int line, int column) {
-		fLine= line;
-		fColumn= column;
-	}
-	
-	public int[] getExternalInfo() {
-		return new int[] {fLine, fColumn};
-	}
-	
-	public IFile getIFile() {
-		IFile file;
-		if (isExternal()) {
-			file= AntUtil.getFileForLocation(filePath, null);
-		} else {
-			LocationProvider locationProvider= getAntModel().getLocationProvider();
-			file= locationProvider.getFile();
-		}
-		return file;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntImportNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntImportNode.java
deleted file mode 100644
index c61410e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntImportNode.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.xml.sax.Attributes;
-
-public class AntImportNode extends AntTaskNode {
-	
-	private String fFile= null;
-	
-	public AntImportNode(Task task, Attributes attributes) {
-		super(task);
-         fFile= attributes.getValue(IAntModelConstants.ATTR_FILE);
-	}
-	
-	public String getFile() {
-		return fFile;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#getBaseImageDescriptor()
-	 */
-	protected ImageDescriptor getBaseImageDescriptor() {
-		return AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_IMPORT);
-	}
-	
-	public String getLabel() {
-		StringBuffer label= new StringBuffer(getTask().getTaskName());
-		label.append(' ');
-		label.append(fFile);
-		
-		if (isExternal()) {
-			appendEntityName(label);
-		}
-		return label.toString();
-	}
-
-	/**
-	 * Execute the import.
-	 * Returns <code>true</code> as the import adds to the Ant model
-	 */
-	public boolean configure(boolean validateFully) {
-		if (configured) {
-			return false;
-		}
-		try {
-			getTask().maybeConfigure();
-			getTask().execute();
-			configured= true;
-			return true;
-		} catch (BuildException be) {
-			getAntModel().handleBuildException(be, this);
-		}
-		return false;
-	}
-	
-	public IFile getIFile() {
-		IFile file;
-		if (isExternal()) {
-			file= AntUtil.getFileForLocation(getFilePath(), null);
-		} else {
-			String path= getFile();
-			file= AntUtil.getFileForLocation(path, getAntModel().getEditedFile().getParentFile());
-		}
-		return file;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.java
deleted file mode 100644
index 3c3f3f6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntModelMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.editor.model.AntModelMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntModelMessages() {
-	}
-
-	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/internal/ui/editor/model/AntModelMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.properties
deleted file mode 100644
index c6a682c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntModelMessages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntTargetNode.2=\ [default]
-AntElementNode.9=\ [from {0}]

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntProjectNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntProjectNode.java
deleted file mode 100644
index d12cb1a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntProjectNode.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.tools.ant.Project;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.outline.AntModelProject;
-import org.eclipse.ant.internal.ui.editor.outline.XMLProblem;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-public class AntProjectNode extends AntElementNode {
-
-	private AntModelProject fProject;
-	private AntModel fModel;
-	private Map fNameToDefiningNodeMap;
-	
-	public AntProjectNode(AntModelProject project, AntModel antModel) {
-		super("project"); //$NON-NLS-1$
-		fProject= project;
-		fModel= antModel;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#getDisplayName()
-	 */
-	public String getLabel() {
-		String projectName= fProject.getName();
-		if (projectName == null || projectName.length() == 0) {
-			projectName= "project"; //$NON-NLS-1$
-		}
-		return projectName;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#getBaseImageDescriptor()
-	 */
-	protected ImageDescriptor getBaseImageDescriptor() {
-		return AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_PROJECT);
-	}
-
-	/**
-	 * Returns the Ant project associated with this project node.
-	 * @return the Ant project
-	 */
-	public Project getProject() {
-		return fProject;
-	}
-	
-	protected AntModel getAntModel() {
-		return fModel;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#reset()
-	 */
-	public void reset() {
-		super.reset();
-		fProject.reset();
-		if (fNameToDefiningNodeMap != null) {
-			getAntModel().setNamesOfOldDefiningNodes(fNameToDefiningNodeMap.keySet());
-		}
-		fNameToDefiningNodeMap= null;
-		setProblemSeverity(XMLProblem.NO_PROBLEM);
-	}
-	
-	public void addDefiningTaskNode(AntDefiningTaskNode node) {
-		if (fNameToDefiningNodeMap == null) {
-			fNameToDefiningNodeMap= new HashMap();
-		}
-		fNameToDefiningNodeMap.put(node.getLabel(), node);
-	}
-	
-	public AntDefiningTaskNode getDefininingTaskNode(String nodeName) {
-		if (fNameToDefiningNodeMap != null) {
-			return (AntDefiningTaskNode)fNameToDefiningNodeMap.get(nodeName);
-		}
-		return null;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntPropertyNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntPropertyNode.java
deleted file mode 100644
index 3767f9f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntPropertyNode.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.xml.sax.Attributes;
-
-public class AntPropertyNode extends AntTaskNode {
-	
-	private String fValue= null;
-	
-	public AntPropertyNode(Task task, Attributes attributes) {
-		super(task);
-		 String label = attributes.getValue(IAntModelConstants.ATTR_NAME);
-         if(label == null) {
-         	label = attributes.getValue(IAntModelConstants.ATTR_FILE);
-         	if(label != null) {
-         		label=  "file="+label; //$NON-NLS-1$
-         	} else {	
-         		label =  attributes.getValue(IAntModelConstants.ATTR_RESOURCE);
-         		if (label != null) {
-         			label= "resource="+label; //$NON-NLS-1$
-         		} else {
-         			label = attributes.getValue(IAntModelConstants.ATTR_ENVIRONMENT);
-         			if(label != null) {
-         				label= "environment=" + label; //$NON-NLS-1$
-         			}
-         		}
-         	}
-         } else {
-         	fValue= attributes.getValue(IAntModelConstants.ATTR_VALUE);
-         }
-         setLabel(label);
-	}
-	
-	public String getValue() {
-		return fValue;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#getBaseImageDescriptor()
-	 */
-	protected ImageDescriptor getBaseImageDescriptor() {
-		return AntUIImages.getImageDescriptor(IAntUIConstants.IMG_PROPERTY);
-	}
-	
-	/**
-	 * Sets the property in the project.
-	 */
-	public boolean configure(boolean validateFully) {
-		if (configured) {
-			return false;
-		}
-		try {
-			getTask().maybeConfigure();
-			getTask().execute();
-			configured= true;
-		} catch (BuildException be) {
-			getAntModel().handleBuildException(be, this);
-		}
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTargetNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTargetNode.java
deleted file mode 100644
index fa7ff7c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTargetNode.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-import java.util.Enumeration;
-import java.util.Map;
-
-import org.apache.tools.ant.Target;
-import org.eclipse.ant.internal.ui.editor.outline.XMLProblem;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-public class AntTargetNode extends AntElementNode {
-
-	private Target fTarget= null;
-	
-	public AntTargetNode(Target target) {
-		super("target"); //$NON-NLS-1$
-		fTarget= target;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#getDisplayName()
-	 */
-	public String getLabel() {
-		String targetName= fTarget.getName();
-		if (targetName == null) {
-			targetName= "target"; //$NON-NLS-1$
-			setProblemSeverity(XMLProblem.SEVERITY_ERROR);
-		}
-		
-		StringBuffer displayName= new StringBuffer(targetName);
-		if (isDefaultTarget()) {
-			displayName.append(AntModelMessages.getString("AntTargetNode.2")); //$NON-NLS-1$
-		}
-		if (isExternal()) {
-			appendEntityName(displayName);
-		}
-		
-		return displayName.toString();
-	}
-	
-	public Target getTarget() {
-		return fTarget;
-	}
-	
-	public boolean isDefaultTarget() {
-		String targetName= fTarget.getName();
-		if (targetName == null) {
-			return false;
-		}
-		return targetName.equals(fTarget.getProject().getDefaultTarget());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#getBaseImageDescriptor()
-	 */
-	protected ImageDescriptor getBaseImageDescriptor() {
-		ImageDescriptor base= null;
-		if (isDefaultTarget()) {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_DEFAULT_TARGET);
-		} else if (getTarget().getDescription() == null) {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET_INTERNAL);
-		} else {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET);
-		}
-		return base;
-	}
-	/**
-	 * @param target The Target to set.
-	 */
-	public void setTarget(Target target) {
-		fTarget = target;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.model.AntElementNode#reset()
-	 */
-	public void reset() {
-		super.reset();
-		 Map currentTargets = fTarget.getProject().getTargets();
-		 if (currentTargets.get(fTarget.getName()) != null) {
-		 	currentTargets.remove(fTarget.getName());
-		 }
-	}
-
-	/**
-	 * Returns the name of a missing dependency or <code>null</code> if all
-	 * dependencies exist in the project.
-	 */
-	public String checkDependencies() {
-		Enumeration dependencies= fTarget.getDependencies();
-		while (dependencies.hasMoreElements()) {
-			String dependency = (String) dependencies.nextElement();
-			 if (fTarget.getProject().getTargets().get(dependency) == null) {
-			 	return dependency;
-			 }
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTaskNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTaskNode.java
deleted file mode 100644
index 227daea..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/AntTaskNode.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-public class AntTaskNode extends AntElementNode {
-
-	private Task fTask= null;
-	private String fLabel= null;
-	private String fId= null;
-	protected boolean configured= false;
-	
-	public AntTaskNode(Task task) {
-		super(task.getTaskName());
-		fTask= task;
-	}	
-	
-	public AntTaskNode(Task task, String label) {
-		super(task.getTaskName());
-		fTask= task;
-		fLabel= label;
-	}	
-	
-	public String getLabel() {
-		StringBuffer label= new StringBuffer();
-		if (fLabel != null) {
-			label.append(fLabel);
-		} else if (fId != null) {
-			label.append(fId);
-		} else {
-			label.append(fTask.getTaskName());
-		}
-		if (isExternal()) {
-			appendEntityName(label);
-		}
-		return label.toString();
-	}
-	
-	public void setLabel(String label) {
-		fLabel= label;
-	}
-	
-	public Task getTask() {
-		return fTask;
-	}
-	
-	public void setTask(Task task) {
-		fTask= task;
-	}
-	
-	protected ImageDescriptor getBaseImageDescriptor() {
-		if (fId != null) {
-			return AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TYPE);
-		}
-		
-		return super.getBaseImageDescriptor();
-	}
-
-	/**
-	 * The reference id for this task
-	 * @param id The reference id for this task
-	 */
-	public void setId(String id) {
-		fId= id;
-	}
-	
-	/**
-	 * Returns the reference id for this task or <code>null</code>
-	 * if it has no reference id.
-	 * @return The reference id for this task
-	 */
-	public String getId() {
-		return fId;
-	}
-	
-	/**
-	 * Configures the associated task if required.
-	 * Allows subclasses to do specific configuration (such as executing the task) by
-	 * calling <code>nodeSpecificConfigure</code>
-	 * 
-	 * @return whether the configuration of this node could have impact on other nodes
-	 */
-	public boolean configure(boolean validateFully) {
-		if (!validateFully || (getParentNode() instanceof AntTaskNode)) {
-			return false;
-		}
-		if (configured) {
-			return false;
-		}
-		try {
-			getTask().maybeConfigure();
-			nodeSpecificConfigure();
-			configured= true;
-			return true;
-		} catch (BuildException be) {
-			getAntModel().handleBuildException(be, this);
-		}
-		return false;
-	}
-
-	protected void nodeSpecificConfigure() {
-		//by default do nothing
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/IAntModelConstants.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/IAntModelConstants.java
deleted file mode 100644
index 6bcb936..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/model/IAntModelConstants.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.model;
-
-/**
- * Constants used by the Ant model to reference attributes
- */
-public interface IAntModelConstants {
-	
-	/**
-	 * Attributes of Ant elements
-	 */
-	public static final String ATTR_NAME= "name"; //$NON-NLS-1$
-	public static final String ATTR_VALUE= "value"; //$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_DESCRIPTION= "description"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java
deleted file mode 100644
index 9bf3f43..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorContentOutlinePage.java
+++ /dev/null

@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49380, bug 34548, bug 53547
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.outline;
-
-import java.util.List;
-
-import org.apache.tools.ant.Target;
-import org.eclipse.ant.internal.ui.editor.AntEditor;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntImportNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.model.AntPropertyNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTargetNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTaskNode;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.ant.internal.ui.views.actions.AntOpenWithMenu;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-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.util.ListenerList;
-import org.eclipse.jface.viewers.IColorProvider;
-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.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-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;
-	private boolean fFilterInternalTargets;
-    private InternalTargetFilter fInternalTargetFilter= null;
-    private boolean fFilterImportedElements;
-    private ImportedElementsFilter fImportedElementsFilter= null;   
-	private boolean fFilterProperties;
-	private PropertiesFilter fPropertiesFilter= null;
-	private boolean fFilterTopLevel;
-	private TopLevelFilter fTopLevelFilter= null;
-	private boolean fSort;
-
-	private ViewerSorter fSorter;
-	
-	private static final Object[] EMPTY_ARRAY= new Object[0];
-	
-	private AntEditor fEditor;
-	
-	/**
-	 * A viewer filter that removes internal targets
-	 */
-	private class InternalTargetFilter extends ViewerFilter {
-		
-		/**
-		 * Returns whether the given target is an internal target. Internal
-		 * targets are targets which have no description. The default target
-		 * is never considered internal.
-		 */
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof AntTargetNode) {
-				Target target= ((AntTargetNode)element).getTarget();
-				return target.getDescription() != null || ((AntTargetNode)element).isDefaultTarget();
-			} 
-			return true;
-		}
-	}
-	
-	/**
-	 * A viewer filter that removes imported elements except an imported default target
-	 */
-	private class ImportedElementsFilter extends ViewerFilter {
-		
-		/**
-		 * Returns whether the given {@link AntElementNode} is imported from
-		 * another file.
-		 */
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof AntElementNode) {
-			    AntElementNode node = (AntElementNode) element; 			    
-				if (node.getImportNode() !=  null || node.isExternal()) {
-					if (node instanceof AntTargetNode && ((AntTargetNode)node).isDefaultTarget()) {
-						return true;
-					}
-					return false;
-				}
-			} 
-			return true;
-		}
-	}
-	
-	/**
-	 * A viewer filter that removes properties
-	 */
-	private class PropertiesFilter extends ViewerFilter {
-		
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof AntPropertyNode) {
-				return false;
-			} 
-			return true;
-		}
-	}
-	
-	/**
-	 * A viewer filter that removes top level tasks and types
-	 */
-	private class TopLevelFilter extends ViewerFilter {
-		
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof AntTaskNode) {
-				if (parentElement instanceof AntProjectNode) {
-					return false;
-				}
-			} 
-			return true;
-		}
-	}
-	
-	private class AntOutlineSorter extends 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) {
-			if (!(e1 instanceof AntElementNode && e2 instanceof AntElementNode)) {
-				return super.compare(viewer, e1, e2);
-			}
-			String name1= ((AntElementNode) e1).getLabel();
-			String name2= ((AntElementNode) e2).getLabel();
-			return getCollator().compare(name1, name2);
-		}
-	}
-
-	/**
-	 * 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) {
-			AntElementNode tempParentElement = (AntElementNode)parentNode;
-			if (tempParentElement.hasChildren()) {
-				List children= tempParentElement.getChildNodes();
-				return children.toArray();
-			} 
-			return EMPTY_ARRAY;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
-		 */
-		public Object getParent(Object aNode) {
-			AntElementNode tempElement = (AntElementNode)aNode;
-			return tempElement.getParentNode();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
-		 */
-		public boolean hasChildren(Object aNode) {
-			return ((AntElementNode)aNode).hasChildren();
-		}
-
-		/* (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 extends org.eclipse.jface.viewers.LabelProvider implements IColorProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-		 */
-		public Image getImage(Object anElement) {
-			AntElementNode node = (AntElementNode)anElement;
-			return node.getImage();
-		}
-        
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-		 */
-		public String getText(Object node) {
-			AntElementNode element= (AntElementNode) node;
-			return element.getLabel();
-		}
-
-		public Color getForeground(Object node) {
-			if (node instanceof AntTargetNode && ((AntTargetNode)node).isDefaultTarget() ) {
-				return Display.getDefault().getSystemColor(SWT.COLOR_BLUE);
-			}
-			
-			return null;
-		}
-
-		public Color getBackground(Object element) {
-			return null;
-		}
-	}
-	
-	/**
-	 * Sets whether internal targets should be filtered out of the outline.
-	 * 
-	 * @param filter whether or not internal targets should be filtered out
-	 */
-	protected void setFilterInternalTargets(boolean filter) {
-		fFilterInternalTargets= filter;
-		setFilter(filter, getInternalTargetsFilter(), IAntUIPreferenceConstants.ANTEDITOR_FILTER_INTERNAL_TARGETS);   
-	}
-	
-	/**
-	 * Sets whether imported elements should be filtered out of the outline.
-	 * 
-	 * @param filter whether or not imported elements should be filtered out
-	 */
-    protected void setFilterImportedElements(boolean filter) {
-		fFilterImportedElements= filter;
-		setFilter(filter, getImportedElementsFilter(), IAntUIPreferenceConstants.ANTEDITOR_FILTER_IMPORTED_ELEMENTS);        
-    }
-
-	private void setFilter(boolean filter, ViewerFilter viewerFilter, String name) {
-		if (filter) {
-			getTreeViewer().addFilter(viewerFilter);
-		} else {
-			getTreeViewer().removeFilter(viewerFilter);
-		}
-		AntUIPlugin.getDefault().getPreferenceStore().setValue(name, filter);
-		getTreeViewer().refresh();
-	}
-
-	/**
-	 * Sets whether properties should be filtered out of the outline.
-	 * 
-	 * @param filter whether or not properties should be filtered out
-	 */
-	protected void setFilterProperties(boolean filter) {
-		fFilterProperties= filter;
-		setFilter(filter, getPropertiesFilter(), IAntUIPreferenceConstants.ANTEDITOR_FILTER_PROPERTIES);     
-	}
-	
-	/**
-	 * Sets whether internal targets should be filtered out of the outline.
-	 * 
-	 * @param filter whether or not internal targets should be filtered out
-	 */
-	protected void setFilterTopLevel(boolean filter) {
-		fFilterTopLevel= filter;
-		setFilter(filter, getTopLevelFilter(), IAntUIPreferenceConstants.ANTEDITOR_FILTER_TOP_LEVEL);     
-	}
-	
-	private ViewerFilter getInternalTargetsFilter() {
-		if (fInternalTargetFilter == null) {
-			fInternalTargetFilter= new InternalTargetFilter();
-		}
-		return fInternalTargetFilter;
-	}
-	
-    private ViewerFilter getImportedElementsFilter() {
-		if (fImportedElementsFilter == null) {
-		    fImportedElementsFilter= new ImportedElementsFilter();
-		}
-		return fImportedElementsFilter;
-    }
-	
-	private ViewerFilter getPropertiesFilter() {
-		if (fPropertiesFilter == null) {
-			fPropertiesFilter= new PropertiesFilter();
-		}
-		return fPropertiesFilter;
-	}
-	
-	private ViewerFilter getTopLevelFilter() {
-		if (fTopLevelFilter == null) {
-			fTopLevelFilter= new TopLevelFilter();
-		}
-		return fTopLevelFilter;
-	}
-
-	/**
-	 * Returns whether internal targets are currently being filtered out of
-	 * the outline.
-	 * 
-	 * @return whether or not internal targets are being filtered out
-	 */
-	protected boolean filterInternalTargets() {
-		return fFilterInternalTargets;
-	}
-	
-	/**
-	 * Returns whether imported elements are currently being filtered out of
-	 * the outline.
-	 * 
-	 * @return whether or not imported elements are being filtered out
-	 */
-	protected boolean filterImportedElements() {
-		return fFilterImportedElements;
-	}
-
-	/**
-	 * Returns whether properties are currently being filtered out of
-	 * the outline.
-	 * 
-	 * @return whether or not properties are being filtered out
-	 */
-	protected boolean filterProperties() {
-		return fFilterProperties;
-	}
-	
-	/**
-	 * Returns whether top level tasks/types are currently being filtered out of
-	 * the outline.
-	 * 
-	 * @return whether or not top level tasks/types are being filtered out
-	 */
-	protected boolean filterTopLevel() {
-		return fFilterTopLevel;
-	}
-	
-	/**
-	 * Sets whether elements should be sorted in the outline.
-	 *  
-	 * @param sort whether or not elements should be sorted
-	 */
-	protected void setSort(boolean sort) {
-		fSort= sort;
-		if (sort) {
-			if (fSorter == null) {
-				fSorter= new AntOutlineSorter();
-			}
-			getTreeViewer().setSorter(fSorter);
-		} else {
-			getTreeViewer().setSorter(null);
-		}
-		AntUIPlugin.getDefault().getPreferenceStore().setValue(IAntUIPreferenceConstants.ANTEDITOR_SORT, sort);
-	}
-	
-	/**
-	 * Returns whether elements are currently being sorted.
-	 * 
-	 * @return whether elements are currently being sorted
-	 */
-	protected boolean isSort() {
-		return fSort;
-	}
-	
-	/**
-	 * Creates a new AntEditorContentOutlinePage.
-	 */
-	public AntEditorContentOutlinePage(XMLCore core, AntEditor editor) {
-		super();
-		fCore= core;
-		fFilterInternalTargets= AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.ANTEDITOR_FILTER_INTERNAL_TARGETS);
-		fFilterImportedElements= AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.ANTEDITOR_FILTER_IMPORTED_ELEMENTS);
-		fFilterProperties= AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.ANTEDITOR_FILTER_PROPERTIES);
-		fFilterTopLevel= AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.ANTEDITOR_FILTER_TOP_LEVEL);
-		fSort= AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.ANTEDITOR_SORT);
-		fEditor= editor;
-	}
-
-	/* (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());
-		setSort(fSort);
-
-		/*
-		 * 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$
-		
-		IToolBarManager tbm= site.getActionBars().getToolBarManager();
-		tbm.add(new ToggleSortAntOutlineAction(this));
-		tbm.add(new FilterInternalTargetsAction(this));
-		tbm.add(new FilterPropertiesAction(this));
-		tbm.add(new FilterImportedElementsAction(this));
-		tbm.add(new FilterTopLevelAction(this));
-		
-		IMenuManager viewMenu= site.getActionBars().getMenuManager();
-		viewMenu.add(new ToggleLinkWithEditorAction(fEditor));
-		
-		openWithMenu= new AntOpenWithMenu(this.getSite().getPage());
-		
-		viewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				firePostSelectionChanged(event.getSelection());
-			}
-		});
-		
-		setFilterInternalTargets(fFilterInternalTargets);
-		setFilterImportedElements(fFilterImportedElements);
-		setFilterProperties(fFilterProperties);
-		setFilterTopLevel(fFilterTopLevel);
-	}
-	
-	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);
-		}
-	}
-	
-	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) {
-		AntElementNode element= getSelectedNode();
-		IFile file = element.getIFile();
-		if (file != null) {
-			menuManager.add(new Separator("group.open")); //$NON-NLS-1$
-			IMenuManager submenu= new MenuManager(AntOutlineMessages.getString("AntEditorContentOutlinePage.Open_With_1"));  //$NON-NLS-1$
-			openWithMenu.setFile(file);
-			if (element.getImportNode() != null) {
-				int[] lineAndColumn= element.getExternalInfo();
-				openWithMenu.setExternalInfo(lineAndColumn[0], lineAndColumn[1]);
-			}
-			submenu.add(openWithMenu);
-			menuManager.appendToGroup("group.open", submenu); //$NON-NLS-1$
-		}
-	}
-	
-	private boolean shouldAddOpenWithMenu() {
-		AntElementNode node= getSelectedNode();
-		if (node instanceof AntImportNode) {
-			return true;
-		}
-		if (node != null && node.isExternal()) {
-			String path = node.getFilePath();
-			if (path != null && path.length() > 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private AntElementNode getSelectedNode() {
-		ISelection iselection= getSelection();
-		if (iselection instanceof IStructuredSelection) {
-			IStructuredSelection selection= (IStructuredSelection)iselection;
-			if (selection.size() == 1) {
-				Object selected= selection.getFirstElement();
-				if (selected instanceof AntElementNode) {
-					return (AntElementNode)selected;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (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() {
-		IFile file= null;
-		if (fModel != null) {
-			AntElementNode node= getSelectedNode();
-			file= node.getIFile();
-		}
-		if (file != null) {
-			ISelection selection= new StructuredSelection(file);
-			return new ShowInContext(null, selection);
-		} 
-		return null;
-	}
-	
-	public void select(AntElementNode node) {
-		if (getTreeViewer() != null) {
-			ISelection s= getTreeViewer().getSelection();
-			if (s instanceof IStructuredSelection) {
-				IStructuredSelection ss= (IStructuredSelection) s;
-				List nodes= ss.toList();
-				if (!nodes.contains(node)) {
-					s= (node == null ? StructuredSelection.EMPTY : new StructuredSelection(node));
-					getTreeViewer().setSelection(s, true);
-				}
-			}
-		}
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java
deleted file mode 100644
index fc18d55..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntEditorMarkerUpdater.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.outline;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-public class AntEditorMarkerUpdater {
-	
-	private AntModel fModel= null;
-	private List fCollectedProblems= new ArrayList();
-	public static final String BUILDFILE_PROBLEM_MARKER = AntUIPlugin.PI_ANTUI + ".buildFileProblem"; //$NON-NLS-1$
-	private IFile fFile= null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.internal.ui.editor.outline.IProblem)
-	 */
-	public void acceptProblem(IProblem problem) {
-		fCollectedProblems.add(problem);
-	}
-	
-	public void beginReporting() {
-		fCollectedProblems.clear();
-	}
-	
-	private void removeProblems() {
-		try {
-			getFile().deleteMarkers(BUILDFILE_PROBLEM_MARKER, false, IResource.DEPTH_INFINITE);
-		} catch (CoreException e) {
-			// assume there were no problems
-		}
-	}
-	
-	private void createMarker(IProblem problem) {
-		IFile file = getFile();
-		Map attributes= getMarkerAttributes(problem);
-		try {
-			MarkerUtilities.createMarker(file, attributes, BUILDFILE_PROBLEM_MARKER);
-		} catch (CoreException e) {			
-		} 
-	}
-	
-	public void setModel(AntModel model) {
-		fModel= model;
-	}
-	
-	public void updateMarkers() {
-		removeProblems();
-		if (!shouldAddMarkers()) {
-			return;
-		}
-
-		if (fCollectedProblems.size() > 0) {
-			Iterator e= fCollectedProblems.iterator();
-			while (e.hasNext()) {
-				IProblem problem= (IProblem) e.next();
-				createMarker(problem);
-			}
-			fCollectedProblems.clear();
-		}
-	}
-	
-	private IFile getFile() {
-		if (fFile == null) {
-			fFile= fModel.getFile();
-		}
-		return fFile;
-	}
-	
-	/**
-	 * Returns the attributes with which a newly created marker will be
-	 * initialized.
-	 *
-	 * @return the initial marker attributes
-	 */
-	private Map getMarkerAttributes(IProblem problem) {
-		
-		Map attributes= new HashMap(11);
-		int severity= IMarker.SEVERITY_ERROR;
-		if (problem.isWarning()) {
-			severity= IMarker.SEVERITY_WARNING;
-		}
-		// marker line numbers are 1-based
-		MarkerUtilities.setMessage(attributes, problem.getUnmodifiedMessage());
-		MarkerUtilities.setLineNumber(attributes, problem.getLineNumber());
-		MarkerUtilities.setCharStart(attributes, problem.getOffset());
-		MarkerUtilities.setCharEnd(attributes, problem.getOffset() + problem.getLength());
-		attributes.put(IMarker.SEVERITY, new Integer(severity));
-		return attributes;
-	}
-	
-	/**
-	 * Returns whether or not to add markers to the file based on the file's content type.
-	 * The content type is considered an Ant buildfile if the XML has a root &quot;project&quot; element.
-	 * Content type is defined in the org.eclipse.ant.core plugin.xml.
-	 * @return whether or not to add markers to the file based on the files content type
-	 */
-	private boolean shouldAddMarkers() {
-		IFile file= getFile();
-		if (file == null || !file.exists()) {
-			return false;
-		}
-		IContentDescription description;
-		try {
-			description = file.getContentDescription();
-		} catch (CoreException e) {
-			return false;
-		}
-		if (description != null) {
-			IContentType type= description.getContentType();
-			return type != null && AntCorePlugin.ANT_BUILDFILE_CONTENT_TYPE.equals(type.getId());
-		}
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModel.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModel.java
deleted file mode 100644
index d4fc66a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModel.java
+++ /dev/null

@@ -1,1258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Nico Seessle - bug 51332
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.outline;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import org.apache.tools.ant.AntTypeDefinition;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ComponentHelper;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.TaskAdapter;
-import org.apache.tools.ant.UnknownElement;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.internal.ui.editor.model.AntDefiningTaskNode;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntImportNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.model.AntPropertyNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTargetNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTaskNode;
-import org.eclipse.ant.internal.ui.editor.model.IAntModelConstants;
-import org.eclipse.ant.internal.ui.editor.text.XMLReconcilingStrategy;
-import org.eclipse.ant.internal.ui.editor.utils.ProjectHelper;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-public class AntModel {
-
-	private static ClassLoader fgClassLoader;
-	private static int fgInstanceCount= 0;
-	
-	private XMLCore fCore;
-	private IDocument fDocument;
-	private IProblemRequestor fProblemRequestor;
-	private LocationProvider fLocationProvider;
-
-	private AntProjectNode fProjectNode;
-	private AntTargetNode fCurrentTargetNode;
-	private AntElementNode fLastNode;
-	private AntElementNode fNodeBeingResolved;
-	
-	private AntTargetNode fIncrementalTarget= null;
-	private boolean fReplaceHasOccurred= false;
-	private int fRemoveLengthOfReplace= 0;
-	private DirtyRegion fDirtyRegion= null;
-	
-	 /**
-     * Stack of still open elements.
-     * <P>
-     * On top of the stack is the innermost element.
-     */
-	private Stack fStillOpenElements = new Stack();
-	
-	private Map fTaskToNode= new HashMap();
-
-	private List fTaskNodes= new ArrayList();
-	
-	private Map fEntityNameToPath;
-
-	private final Object fDirtyLock= new Object();
-	private boolean fIsDirty= true;
-	private IDocumentListener fListener;
-	private File fEditedFile= null;	
-	private AntEditorMarkerUpdater fMarkerUpdater= null;
-	private Set fNamesOfOldDefiningNodes;
-	
-	private Preferences.IPropertyChangeListener fPropertyChangeListener= new Preferences.IPropertyChangeListener() {
-		public void propertyChange(Preferences.PropertyChangeEvent event) {
-			fgClassLoader= null;
-			AntDefiningTaskNode.setJavaClassPath();
-			fIsDirty= true;
-			reconcile(null);
-			updateMarkers();
-		}
-	};
-
-	public AntModel(XMLCore core, IDocument document, IProblemRequestor problemRequestor, LocationProvider locationProvider) {
-		fCore= core;
-		fDocument= document;
-		fProblemRequestor= problemRequestor;
-		fMarkerUpdater= new AntEditorMarkerUpdater();
-		fMarkerUpdater.setModel(this);
-		fLocationProvider= locationProvider;
-		AntCorePlugin.getPlugin().getPluginPreferences().addPropertyChangeListener(fPropertyChangeListener);
-		AntDefiningTaskNode.setJavaClassPath();
-		fgInstanceCount++;
-	}
-
-	public void install() {
-		fListener= new IDocumentListener() {
-			public void documentAboutToBeChanged(DocumentEvent event) {
-				synchronized (fDirtyLock) {
-					fIsDirty= true;
-				}
-			}
-			public void documentChanged(DocumentEvent event) {}
-		};
-		fDocument.addDocumentListener(fListener);
-	}
-	
-	public void dispose() {		
-		synchronized (this) {
-			if (fDocument != null) {
-				fDocument.removeDocumentListener(fListener);
-			}
-			fDocument= null;
-			fCore= null;
-			ProjectHelper.setAntModel(null);
-		}
-		
-		AntCorePlugin.getPlugin().getPluginPreferences().removePropertyChangeListener(fPropertyChangeListener);
-		fgInstanceCount--;
-		if (fgInstanceCount == 0) {
-			fgClassLoader= null;
-		}
-		if (getProjectNode() != null) {
-			//cleanup the introspection helpers that may have been
-			//generated
-			getProjectNode().getProject().fireBuildFinished(null);
-		}
-	}
-	
-	public void reconcile(DirtyRegion region) {
-		//TODO turn off incremental as it is deferred to post 3.0
-		region= null; 
-		fDirtyRegion= region;
-		synchronized (fDirtyLock) {
-			if (!fIsDirty) {
-				return;
-			}
-			if (fReplaceHasOccurred && region != null) {
-				//this is the removed part of a replace
-				//the insert region will be along shortly
-				fRemoveLengthOfReplace= region.getLength();
-				fReplaceHasOccurred= false;
-				return;
-			}
-				fIsDirty= false;
-			}
-
-		synchronized (this) {
-			if (fCore == null) {
-				// disposed
-				notifyAll();
-				return;
-			}
-			
-			if (fDocument == null) {
-				fProjectNode= null;
-			} else {
-				reset(region);
-				if (fDocument.get().trim().length() != 0) {
-					parseDocument(fDocument, region);
-				}
-				fRemoveLengthOfReplace= 0;
-				fDirtyRegion= null;
-				reconcileTaskAndTypes();
-			} 
-	
-			fCore.notifyDocumentModelListeners(new DocumentModelChangeEvent(this));
-			notifyAll();
-		}
-	}
-
-	private void reset(DirtyRegion region) {
-		//TODO this could be better for incremental parsing
-		//cleaning up the task to node map (do when a target is reset)
-		fCurrentTargetNode= null;
-		
-		if (region == null ) {
-			fStillOpenElements= new Stack();
-			fTaskToNode= new HashMap();
-			fTaskNodes= new ArrayList();
-			fNodeBeingResolved= null;
-			fLastNode= null;
-		}
-	}
-
-	public AntElementNode[] getRootElements() {
-		possiblyWaitForReconcile();
-		if (fProjectNode == null) {
-			return new AntElementNode[0];
-		} 
-			return new AntElementNode[] {fProjectNode};
-		}
-
-	private void parseDocument(IDocument input, DirtyRegion region) {
-		boolean parsed= true;
-		if (input.getLength() == 0) {
-			fProjectNode= null;
-			parsed= false;
-			return;
-		}
-		ClassLoader parsingClassLoader= getClassLoader();
-		ClassLoader originalClassLoader= Thread.currentThread().getContextClassLoader();
-		Thread.currentThread().setContextClassLoader(parsingClassLoader);
-		boolean incremental= false;
-		Project project= null;
-    	try {
-    		String textToParse= null;
-    		ProjectHelper projectHelper= null;
-			if (region == null || fProjectNode == null) {  //full parse
-				if (fProjectNode == null || !fProjectNode.hasChildren()) {
-					fProjectNode= null;
-					project = new AntModelProject();
-					projectHelper= prepareForFullParse(project, parsingClassLoader);
-					textToParse= input.get(); //the entire document
-				} else {
-					project= fProjectNode.getProject();
-					projectHelper= (ProjectHelper)project.getReference("ant.projectHelper"); //$NON-NLS-1$
-					textToParse= prepareForFullIncremental(input);
-				}
-			} else { //incremental
-				project= fProjectNode.getProject();
-				textToParse= prepareForIncrementalParse(project, region, input);
-				if (textToParse == null) {
-					parsed= false;
-					return;
-				}
-				incremental= true;
-				projectHelper= (ProjectHelper)project.getReference("ant.projectHelper"); //$NON-NLS-1$
-			}
-			beginReporting();
-			Map references= project.getReferences();
-			references.remove("ant.parsing.context"); //$NON-NLS-1$
-			ProjectHelper.setAntModel(this);
-			projectHelper.parse(project, textToParse);
-			
-    	} catch(BuildException e) {
-			handleBuildException(e, null);
-    	} finally {
-    		Thread.currentThread().setContextClassLoader(originalClassLoader);
-    		if (parsed) {
-    			if (incremental) {
-    	    		updateAfterIncrementalChange(region, true);
-    	    	}
-    			resolveBuildfile();
-    			endReporting();
-    			project.fireBuildFinished(null); //cleanup (IntrospectionHelper)
-    			fIncrementalTarget= null;
-    		}
-    	}
-	}
-	
-	private void updateAfterIncrementalChange(DirtyRegion region, boolean updateProjectLength) {
-		if (fProjectNode == null) {
-			return;
-		}
-		int editAdjustment= determineEditAdjustment(region);
-		if (editAdjustment == 0) {
-			return;
-		}
-		if (updateProjectLength) { //edit within the project 
-			fProjectNode.setLength(fProjectNode.getLength() + editAdjustment);
-		} else {
-			fProjectNode.setOffset(fProjectNode.getOffset() + editAdjustment);
-		}
-		if ((fIncrementalTarget != null || !updateProjectLength) && fProjectNode.hasChildren()) {
-			List children= fProjectNode.getChildNodes();
-			int index= children.indexOf(fIncrementalTarget) + 1;
-			updateNodesForIncrementalParse(editAdjustment, children, index);
-		}
-	}
-
-	private void updateNodesForIncrementalParse(int editAdjustment, List children, int index) {
-		AntElementNode node;
-		for (int i = index; i < children.size(); i++) {
-			node= (AntElementNode)children.get(i);
-			node.setOffset(node.getOffset() + editAdjustment);
-			if (node.hasChildren()) {
-				updateNodesForIncrementalParse(editAdjustment, node.getChildNodes(), 0);
-			}
-		}
-	}
-
-	private ProjectHelper prepareForFullParse(Project project, ClassLoader parsingClassLoader) {
-		initializeProject(project, parsingClassLoader);
-    	// 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
-    	File file = getEditedFile();
-    	String filePath= ""; //$NON-NLS-1$
-    	if (file != null) {
-    		filePath= file.getAbsolutePath();
-    	}
-    	project.setUserProperty("ant.file", filePath); //$NON-NLS-1$
-
-		ProjectHelper projectHelper= new ProjectHelper(this);
-		projectHelper.setBuildFile(file);
-		project.addReference("ant.projectHelper", projectHelper); //$NON-NLS-1$
-		return projectHelper;
-	}
-	
-	private String prepareForIncrementalParse(Project project, DirtyRegion region, IDocument input) {
-		String textToParse= null;
-		AntElementNode node= fProjectNode.getNode(region.getOffset());
-		if (node == null) {
-			if (fProjectNode.getLength() > 0) {
-				//outside of any element
-				if (region.getOffset() < fProjectNode.getOffset()) {
-					updateAfterIncrementalChange(region, false);
-				}
-				return null;
-			}
-			//nodes don't know their lengths due to parsing error --> full parse
-			textToParse = prepareForFullIncremental(input);
-			return textToParse;
-		}
-		
-		while (node != null && !(node instanceof AntTargetNode)) {
-			node= node.getParentNode();
-		}
-		if (node == null) { //no enclosing target node found
-			if (region.getText() != null && region.getText().trim().length() == 0) {
-				return null; //no need to parse for whitespace additions
-			}
-			textToParse= prepareForFullIncremental(input);
-		} else {
-			fIncrementalTarget= (AntTargetNode)node;
-			if (fIncrementalTarget.hasChildren()) {
-				Collection nodes= fTaskToNode.values();
-				nodes.removeAll(fIncrementalTarget.getDescendents());
-			}
-			
-			markHierarchy(node, XMLProblem.NO_PROBLEM);
-			
-			StringBuffer temp = createIncrementalContents(project);			
-			fIncrementalTarget.reset();
-			try {
-				int editAdjustment = determineEditAdjustment(region) + 1;
-				String targetString= input.get(node.getOffset() - 1, node.getLength() + editAdjustment);
-				temp.append(targetString);
-				temp.append("\n</project>"); //$NON-NLS-1$
-				textToParse= temp.toString();
-			} catch (BadLocationException e) {
-				textToParse= input.get();
-			}
-		}
-		return textToParse;
-	}
-
-	private String prepareForFullIncremental(IDocument input) {
-		String textToParse=  input.get();
-		fProjectNode.reset();
-		fTaskToNode= new HashMap();
-		fTaskNodes= new ArrayList();
-		return textToParse;
-	}
-
-	private StringBuffer createIncrementalContents(Project project) {
-		int offset= fIncrementalTarget.getOffset();
-		int line= getLine(offset) - 1;
-		
-		StringBuffer temp= new StringBuffer("<project");//$NON-NLS-1$
-		String defltTarget= project.getDefaultTarget();
-		if (defltTarget != null) {
-			temp.append(" default=\""); //$NON-NLS-1$
-			temp.append(defltTarget);
-			temp.append("\""); //$NON-NLS-1$
-		}
-		temp.append(">"); //$NON-NLS-1$
-		while (line > 0) {
-			temp.append("\n"); //$NON-NLS-1$
-			line--;
-		}
-		return temp;
-	}
-
-	private int determineEditAdjustment(DirtyRegion region) {
-		int editAdjustment= 0;
-		if (region.getType().equals(DirtyRegion.INSERT)) {
-			editAdjustment+= region.getLength() - fRemoveLengthOfReplace;
-		} else {
-			editAdjustment-= region.getLength();
-		}
-		return editAdjustment;
-	}
-
-	private void initializeProject(Project project, ClassLoader loader) {
-		project.init();
-		setTasks(project, loader);
-		setTypes(project, loader);
-	}
-	
-	private void setTasks(Project project, ClassLoader loader) {
-		List tasks = AntCorePlugin.getPlugin().getPreferences().getTasks();
-		for (Iterator iterator = tasks.iterator(); iterator.hasNext();) {
-			org.eclipse.ant.core.Task task = (org.eclipse.ant.core.Task) iterator.next();
-			AntTypeDefinition def= new AntTypeDefinition();
-			def.setName(task.getTaskName());
-            def.setClassName(task.getClassName());
-            def.setClassLoader(loader);
-            def.setAdaptToClass(Task.class);
-            def.setAdapterClass(TaskAdapter.class);
-            ComponentHelper.getComponentHelper(project).addDataTypeDefinition(def);
-		}
-	}
-		
-	private void setTypes(Project project, ClassLoader loader) {
-		List types = AntCorePlugin.getPlugin().getPreferences().getTypes();
-		for (Iterator iterator = types.iterator(); iterator.hasNext();) {
-			Type type = (Type) iterator.next();
-			 AntTypeDefinition def = new AntTypeDefinition();
-             def.setName(type.getTypeName());
-             def.setClassName(type.getClassName());
-             def.setClassLoader(loader);
-             ComponentHelper.getComponentHelper(project).addDataTypeDefinition(def);
-		}
-	}
-
-	private void resolveBuildfile() {	
-		Collection nodeCopy= new ArrayList(fTaskNodes.size());
-		nodeCopy.addAll(fTaskNodes);
-		Iterator iter= nodeCopy.iterator();
-		while (iter.hasNext()) {
-			AntTaskNode node = (AntTaskNode) iter.next();
-			fNodeBeingResolved= node;
-			if (node.configure(false)) {
-				//resolve any new elements that may have been added
-				resolveBuildfile();
-			}
-		}
-		fNodeBeingResolved= null;
-		
-		checkTargets();
-	}
-
-	/**
-	 * Check that we have a default target defined and that the 
-	 * target dependencies exist. 
-	 */
-	private void checkTargets() {
-		if (fProjectNode == null) {
-			return;
-		}
-		String defaultTargetName= fProjectNode.getProject().getDefaultTarget();
-		if (defaultTargetName == null || fProjectNode.getProject().getTargets().get(defaultTargetName) == null) {
-			//no default target
-			String message;
-			if (defaultTargetName == null) {
-				message= AntOutlineMessages.getString("AntModel.0"); //$NON-NLS-1$
-			} else {
-				message= MessageFormat.format(AntOutlineMessages.getString("AntModel.43"), new String[]{defaultTargetName}); //$NON-NLS-1$
-			}
-			IProblem problem= createProblem(message, fProjectNode.getOffset(), fProjectNode.getSelectionLength(), XMLProblem.SEVERITY_ERROR);
-			acceptProblem(problem);
-			markHierarchy(fProjectNode, XMLProblem.SEVERITY_ERROR);
-		}
-		if (!fProjectNode.hasChildren()) {
-			return;
-		}
-		List children= fProjectNode.getChildNodes();
-		Iterator iter= children.iterator();
-		while (iter.hasNext()) {
-			AntElementNode node = (AntElementNode) iter.next();
-			if (node instanceof AntTargetNode) {
-				String missing= ((AntTargetNode)node).checkDependencies();
-				if (missing != null) {
-					String message= MessageFormat.format(AntOutlineMessages.getString("AntModel.44"), new String[]{missing}); //$NON-NLS-1$
-					IProblem problem= createProblem(message, node.getOffset(), node.getSelectionLength(), XMLProblem.SEVERITY_ERROR);
-					acceptProblem(problem);
-					markHierarchy(node, XMLProblem.SEVERITY_ERROR);
-				}
-			}
-		}
-		
-	}
-
-	public void handleBuildException(BuildException e, AntElementNode node, int severity) {
-		try {
-			if (node != null) {
-				markHierarchy(node, severity);
-			}
-			Location location= e.getLocation();
-			int line= 0;
-			int originalOffset= 0;
-			int nonWhitespaceOffset= 0; 
-			int length= 0;
-			if (location == Location.UNKNOWN_LOCATION && node != null) {
-				nonWhitespaceOffset= node.getOffset();
-				length= node.getLength();
-			} else {
-				line= location.getLineNumber();
-				if (line == 0) {
-					if (getProjectNode() != null) {
-						length= getProjectNode().getSelectionLength();
-						nonWhitespaceOffset= getProjectNode().getOffset();
-						if (severity == XMLProblem.SEVERITY_ERROR) {
-							getProjectNode().setProblemSeverity(XMLProblem.NO_PROBLEM);
-						}
-					} else {
-						return;
-					}
-				} else {
-					if (node == null) {
-						originalOffset= getOffset(line, 1);
-						nonWhitespaceOffset= originalOffset;
-						try {
-							nonWhitespaceOffset= getNonWhitespaceOffset(line, 1);
-						} catch (BadLocationException be) {
-						}
-							length= getLastCharColumn(line) - (nonWhitespaceOffset - originalOffset);
-						} else {
-							nonWhitespaceOffset= node.getOffset();
-							length= node.getLength();
-					}
-				}
-			}
-			notifyProblemRequestor(e, nonWhitespaceOffset, length, severity);
-		} catch (BadLocationException e1) {
-		}
-	}
-
-	public void handleBuildException(BuildException e, AntElementNode node) {
-		handleBuildException(e, node, XMLProblem.SEVERITY_ERROR);
-	}
-
-	public File getEditedFile() {
-		if (fLocationProvider != null && fEditedFile == null) {
-        	fEditedFile= fLocationProvider.getLocation().toFile();
-		}
-		return fEditedFile;
-    }
-
-	private void markHierarchy(AntElementNode openElement, int severity) {
-		while (openElement != null) {
-			openElement.setProblemSeverity(severity);
-			openElement= openElement.getParentNode();
-		}
-	}
-	
-	public LocationProvider getLocationProvider() {
-		return fLocationProvider;
-	}
-
-	public void addTarget(Target newTarget, int line, int column) {
-		if (fIncrementalTarget != null) {
-			fCurrentTargetNode= fIncrementalTarget;
-			fCurrentTargetNode.setTarget(newTarget);
-			fStillOpenElements.push(fCurrentTargetNode);
-		} else {
-			AntTargetNode targetNode= new AntTargetNode(newTarget);
-			fProjectNode.addChildNode(targetNode);
-			fCurrentTargetNode= targetNode;
-			fStillOpenElements.push(targetNode);
-			computeOffset(targetNode, line, column);
-			if (fNodeBeingResolved instanceof AntImportNode) {
-				targetNode.setImportNode(fNodeBeingResolved);
-			}
-		}
-	}
-	
-	public void addProject(Project project, int line, int column) {
-		if (fIncrementalTarget != null) {
-			return;
-		}
-		fProjectNode= new AntProjectNode((AntModelProject)project, this);
-		fStillOpenElements.push(fProjectNode);
-		computeOffset(fProjectNode, line, column);
-	}
-
-	public void addTask(Task newTask, Task parentTask, Attributes attributes, int line, int column) {
-		AntTaskNode taskNode= null;
-		if (parentTask == null) {
-			taskNode= newTaskNode(newTask, attributes);
-			if (fCurrentTargetNode == null) {
-				fProjectNode.addChildNode(taskNode);
-			} else {
-				fCurrentTargetNode.addChildNode(taskNode);
-				if (taskNode.isExternal()) {
-					fCurrentTargetNode.setExternal(true);
-					fCurrentTargetNode.setFilePath(taskNode.getFilePath());
-			}
-			}
-		} else {
-			taskNode= newNotWellKnownTaskNode(newTask, attributes);
-			((AntTaskNode)fTaskToNode.get(parentTask)).addChildNode(taskNode);
-		}
-		fTaskToNode.put(newTask, taskNode);
-		
-		fStillOpenElements.push(taskNode);
-		computeOffset(taskNode, line, column);
-		if (fNodeBeingResolved instanceof AntImportNode) {
-			taskNode.setImportNode(fNodeBeingResolved);
-			//place the node in the collection right after the import node
-			int index= fTaskNodes.indexOf(fNodeBeingResolved) + 1;
-			fTaskNodes.add(index, taskNode);
-		} else {
-			fTaskNodes.add(taskNode);
-		}
-	}
-	
-	public void addEntity(String entityName, String entityPath) {
-		if (fEntityNameToPath == null) {
-			fEntityNameToPath= new HashMap();
-		}
-		fEntityNameToPath.put(entityName, entityPath);
-	}
-
-	private AntTaskNode newTaskNode(Task newTask, Attributes attributes) {
-		AntTaskNode newNode= null;
-		String taskName= newTask.getTaskName();
-		if (isPropertySettingTask(taskName)) { //$NON-NLS-1$
-			newNode= new AntPropertyNode(newTask, attributes);
-		} else if (taskName.equalsIgnoreCase("import")) { //$NON-NLS-1$
-			newNode= new AntImportNode(newTask, attributes);
-		} else if (taskName.equalsIgnoreCase("macrodef")  //$NON-NLS-1$
-        		|| taskName.equalsIgnoreCase("presetdef") //$NON-NLS-1$
-				|| taskName.equalsIgnoreCase("typedef") //$NON-NLS-1$
-				|| taskName.equalsIgnoreCase("taskdef")) { //$NON-NLS-1$
-                    String name = attributes.getValue(IAntModelConstants.ATTR_NAME);
-                    newNode= new AntDefiningTaskNode(newTask, name);
-		} else if(taskName.equalsIgnoreCase("antcall")) { //$NON-NLS-1$
-            newNode= new AntTaskNode(newTask, generateLabel(taskName, attributes, IAntModelConstants.ATTR_TARGET));
-        } else if(taskName.equalsIgnoreCase("mkdir")) { //$NON-NLS-1$
-            newNode= new AntTaskNode(newTask, generateLabel(taskName, attributes, IAntModelConstants.ATTR_DIR));
-        } else if(taskName.equalsIgnoreCase("copy")) { //$NON-NLS-1$
-        	 newNode= new AntTaskNode(newTask, generateLabel(taskName, attributes, IAntModelConstants.ATTR_DESTFILE));
-        } else if(taskName.equalsIgnoreCase("tar")  //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("jar") //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("war") //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("zip")) { //$NON-NLS-1$
-        	newNode= new AntTaskNode(newTask, generateLabel(newTask.getTaskName(), attributes, IAntModelConstants.ATTR_DESTFILE));
-        } else if(taskName.equalsIgnoreCase("untar")  //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("unjar") //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("unwar") //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("gunzip") //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("bunzip2") //$NON-NLS-1$
-        	|| taskName.equalsIgnoreCase("unzip")) { //$NON-NLS-1$
-        	newNode= new AntTaskNode(newTask, generateLabel(newTask.getTaskName(), attributes, IAntModelConstants.ATTR_SRC));
-        } else if(taskName.equalsIgnoreCase("gzip")  //$NON-NLS-1$
-        		|| taskName.equalsIgnoreCase("bzip2")) { //$NON-NLS-1$
-        	newNode= new AntTaskNode(newTask, generateLabel(newTask.getTaskName(), attributes, IAntModelConstants.ATTR_ZIPFILE));
-        } else if(taskName.equalsIgnoreCase("exec")) { //$NON-NLS-1$
-        	String label = "exec "; //$NON-NLS-1$
-            String command = attributes.getValue(IAntModelConstants.ATTR_COMMAND);
-            if(command != null) {
-            	label += command;
-            }
-            command = attributes.getValue(IAntModelConstants.ATTR_EXECUTABLE);
-            if(command != null) {
-            	label += command;
-            }
-            newNode= new AntTaskNode(newTask, label);        
-		} else if(taskName.equalsIgnoreCase("delete")) { //$NON-NLS-1$
-			
-        	String label = "delete "; //$NON-NLS-1$
-            String file = attributes.getValue(IAntModelConstants.ATTR_FILE);
-            if(file != null) {
-            	label+= file;
-            } else {
-            	file = attributes.getValue(IAntModelConstants.ATTR_DIR);
-            	if(file != null) {
-            		label+= file;
-            	}
-            }
-            newNode= new AntTaskNode(newTask, label);
-        	
-        } else if(taskName.equalsIgnoreCase("import")) { //$NON-NLS-1$
-        	newNode= new AntTaskNode(newTask, generateLabel(taskName, attributes, IAntModelConstants.ATTR_FILE)); //$NON-NLS-1$
-        } else {   
-        	newNode = newNotWellKnownTaskNode(newTask, attributes);
-        }
-		String taskFileName= newTask.getLocation().getFileName();
-		boolean external= isTaskExternal(taskFileName);
-		newNode.setExternal(external);
-		if (external) {
-			newNode.setFilePath(taskFileName);
-		}
-		return newNode;
-	}
-            
-	/**
-	 * @param taskName the name of the task to check
-	 * @return whether or not a task with this name sets properties
-	 */
-	public static boolean isPropertySettingTask(String taskName) {
-		return taskName.equalsIgnoreCase("property") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("available") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("basename") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("condition") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("dirname") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("loadfile") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("pathconvert") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("uptodate") //$NON-NLS-1$
-			|| taskName.equalsIgnoreCase("xmlproperty"); //$NON-NLS-1$
-	}
-
-	private boolean isTaskExternal(String taskFileName) {
-		File taskFile= new File(taskFileName);
-		return !taskFile.equals(getEditedFile());
-	}
-
-	private AntTaskNode newNotWellKnownTaskNode(Task newTask, Attributes attributes) {
-		AntTaskNode newNode= new AntTaskNode(newTask);
-		String id= attributes.getValue("id"); //$NON-NLS-1$
-		if (id != null) {
-			newNode.setId(id);
-		}
-		return newNode;
-	}
-
-	private String generateLabel(String taskName, Attributes attributes, String attributeName) {
-		StringBuffer label = new StringBuffer(taskName);
-        String srcFile = attributes.getValue(attributeName);
-        if(srcFile != null) {
-        	label.append(' ');
-        	label.append(srcFile);
-        }	
-        return label.toString();
-	}
-
-	private void computeLength(AntElementNode element, int line, int column) {
-		if (element.isExternal()) {
-			element.setExternalInfo(line, column);
-			return;
-		}
-		try {
-			int length;
-			int offset;
-			if (column <= 0) {
-				column= getLastCharColumn(line);
-				String lineText= fDocument.get(fDocument.getLineOffset(line - 1), column);
-				StringBuffer searchString= new StringBuffer("</"); //$NON-NLS-1$
-				searchString.append(element.getName());
-				searchString.append('>'); 
-				int index= lineText.indexOf(searchString.toString());
-				if (index == -1) {
-					index= lineText.indexOf("/>"); //$NON-NLS-1$
-					if (index == -1 ) {
-						index= column; //set to the end of line 
-					} else {
-						index= index + 3;
-					}
-				} else {
-					index= index + searchString.length() + 1;
-				}
-				offset= getOffset(line, index);
-			} else {
-				offset= getOffset(line, column);
-			}
-			
-			length= offset - element.getOffset();
-			element.setLength(length);
-		} catch (BadLocationException e) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}
-	}
-	
-	private void computeOffset(AntElementNode element, int line, int column) {
-		if (element.isExternal()) {
-			return;
-		}
-		try {
-			int offset;
-			String prefix= "<"; //$NON-NLS-1$
-			if (column <= 0) {
-				offset= getOffset(line, 0);
-				int lastCharColumn= getLastCharColumn(line);
-				offset= computeOffsetUsingPrefix(element, line, offset, prefix, lastCharColumn);
-			} else {
-				offset= getOffset(line, column);
-				offset= computeOffsetUsingPrefix(element, line, offset, prefix, column);
-			}
- 			
-			element.setOffset(offset + 1);
-			element.setSelectionLength(element.getName().length());
-		} catch (BadLocationException e) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}
-	}
-	
-	private int computeOffsetUsingPrefix(AntElementNode element, int line, int offset, String prefix, int column) throws BadLocationException {
-		String lineText= fDocument.get(fDocument.getLineOffset(line - 1), column);
-		int lastIndex= lineText.indexOf(prefix + element.getName());
-		if (lastIndex > -1) {
-			offset= getOffset(line, lastIndex + 1);
-		} else {
-			return computeOffsetUsingPrefix(element, line - 1, offset, prefix, getLastCharColumn(line - 1));
-		}
-		return offset;
-	}
-
-	public int getOffset(int line, int column) throws BadLocationException {
-		return fDocument.getLineOffset(line - 1) + column - 1;
-	}
-	
-	private int getNonWhitespaceOffset(int line, int column) throws BadLocationException {
-		int offset= fDocument.getLineOffset(line - 1) + column - 1;
-		while(Character.isWhitespace(fDocument.getChar(offset))) {
-			offset++;
-		}
-		return offset;
-	}
-	
-	private int getLine(int offset) {
-		try {
-			return fDocument.getLineOfOffset(offset) + 1;
-		} catch (BadLocationException be) {
-			return -1;
-		}
-	}
-	
-	private int getLastCharColumn(int line) throws BadLocationException {
-		String lineDelimiter= fDocument.getLineDelimiter(line - 1);
-		int lineDelimiterLength= lineDelimiter != null ? lineDelimiter.length() : 0;
-		return fDocument.getLineLength(line - 1) - lineDelimiterLength;
-	}
-
-	public void setCurrentElementLength(int lineNumber, int column) {
-		fLastNode= (AntElementNode)fStillOpenElements.pop();
-		if (fLastNode == fCurrentTargetNode) {
-			fCurrentTargetNode= null; //the current target element has been closed
-		}
-		computeLength(fLastNode, lineNumber, column);
-	}
-	
-	public void acceptProblem(IProblem problem) {
-		if (fProblemRequestor != null) {
-			fProblemRequestor.acceptProblem(problem);
-			fMarkerUpdater.acceptProblem(problem);
-		}
-	}
-	
-	protected IFile getFile() {
-		IPath location= fLocationProvider.getLocation();
-		if (location == null) {
-			return null;
-		}
-		IFile[] files= ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(location);
-		if (files.length > 0) {
-			return files[0];
-		} 
-		return null;
-	}
-
-	private void beginReporting() {
-		if (fProblemRequestor != null) {
-			fProblemRequestor.beginReporting();
-			fMarkerUpdater.beginReporting();
-		}
-	}
-	
-	private void endReporting() {
-		if (fProblemRequestor != null) {
-			fProblemRequestor.endReporting();
-		}
-	}
-
-	private IProblem createProblem(Exception exception, int offset, int length,  int severity) {
-		return createProblem(exception.getMessage(), offset, length, severity);
-	}
-	
-	private IProblem createProblem(String message, int offset, int length, int severity) {
-		return new XMLProblem(message, severity, offset, length, getLine(offset));
-	}
-
-	protected void notifyProblemRequestor(Exception exception, AntElementNode element, int severity) {
-		IProblem problem= createProblem(exception, element.getOffset(), element.getLength(), severity);
-		acceptProblem(problem);
-		element.associatedProblem(problem);
-	}
-	
-	protected void notifyProblemRequestor(Exception exception, int offset, int length, int severity) {
-		if (fProblemRequestor != null) {
-			IProblem problem= createProblem(exception, offset, length, severity);
-			acceptProblem(problem);
-		}
-	}
-
-	public void warning(Exception exception) {
-		notifyProblemRequestor(exception, (AntElementNode)fStillOpenElements.pop(), XMLProblem.SEVERITY_WARNING);
-	}
-	
-	public void error(Exception exception) {
-		AntElementNode node= null;
-		if (fStillOpenElements.empty()) {
-			if (exception instanceof SAXParseException) {
-				node= createProblemElement((SAXParseException)exception);
-			}
-		} else {
-			node= (AntElementNode)fStillOpenElements.peek();
-			markHierarchy(node, XMLProblem.SEVERITY_ERROR);
-		}
-	
-		notifyProblemRequestor(exception, node, XMLProblem.SEVERITY_ERROR);
-	}
-	
-	public void errorFromElementText(Exception exception, int start, int count) {
-		AntElementNode node= fLastNode;
-		if (node == null) {
-			if (!fStillOpenElements.empty()) {
-				node= (AntElementNode)fStillOpenElements.peek();
-			} 
-		}
-		if (node == null) {
-			return;
-		}
-		computeEndLocationForErrorNode(node, start, count);
-		notifyProblemRequestor(exception, start, count, XMLProblem.SEVERITY_ERROR);
-		markHierarchy(fLastNode, XMLProblem.SEVERITY_ERROR);
-	} 
-	
-	public void errorFromElement(Exception exception, AntElementNode node, int lineNumber, int column) {
-		if (node == null) {
-			if (!fStillOpenElements.empty()) {
-				node= (AntElementNode)fStillOpenElements.peek();
-			} else {
-				node= fLastNode;
-			}
-		}
-		computeEndLocationForErrorNode(node, lineNumber, column);
-		notifyProblemRequestor(exception, node, XMLProblem.SEVERITY_ERROR);
-		markHierarchy(node, XMLProblem.SEVERITY_ERROR);
-	}
-
-	private AntElementNode createProblemElement(SAXParseException exception) {
-		int lineNumber= exception.getLineNumber();
-		StringBuffer message= new StringBuffer(exception.getMessage());
-		if (lineNumber != -1){
-			message.append(AntOutlineMessages.getString("AntModel.1") + lineNumber); //$NON-NLS-1$
-		}
-
-		AntElementNode errorNode= new AntElementNode(message.toString());
-		errorNode.setFilePath(exception.getSystemId());
-		errorNode.setProblemSeverity(XMLProblem.SEVERITY_ERROR);
-		computeErrorLocation(errorNode, exception);
-		return errorNode;
-	}
-	
-	private void computeErrorLocation(AntElementNode element, SAXParseException exception) {
-		if (element.isExternal()) {
-			return;
-		}
-		
-		int line= exception.getLineNumber();
-		int startColumn= exception.getColumnNumber();
-		computeEndLocationForErrorNode(element, line, startColumn);	
-	}
-	
-	private void computeEndLocationForErrorNode(AntElementNode element, int line, int startColumn) {
-		try {
-			if (line <= 0) {
-				line= 1;
-			}
-			int endColumn;
-			if (startColumn <= 0) {
-				if (element.getOffset() > -1) {
-					startColumn= element.getOffset() + 1;
-				} else {
-					startColumn= 1;
-				}
-				endColumn= getLastCharColumn(line) + 1;
-			} else {
-				if (startColumn > 1) {
-					--startColumn;
-				}
-				
-				endColumn= startColumn;
-				if (startColumn <= getLastCharColumn(line)) {
-					++endColumn;
-				}
-			}
-			
-			int correction= 0;
-			if (element.getOffset() == -1) {
-				int originalOffset= getOffset(line, startColumn);
-				int nonWhitespaceOffset= originalOffset; 
-				try {
-					nonWhitespaceOffset= getNonWhitespaceOffset(line, startColumn);
-				} catch (BadLocationException be) {
-				}
-				element.setOffset(nonWhitespaceOffset);
-				correction= nonWhitespaceOffset - originalOffset;
-			}
-			if (endColumn - startColumn == 0) {
-				int offset= getOffset(line, startColumn);
-				element.setLength(offset - element.getOffset() - correction);
-			} else {
-				element.setLength(endColumn - startColumn - correction);
-			}
-		} catch (BadLocationException e) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}
-	}
-
-	public void fatalError(Exception exception) {
-		if (fStillOpenElements.isEmpty()) {
-			//TODO do we need to handle this better
-			return;
-		}
-		AntElementNode node= (AntElementNode)fStillOpenElements.peek();
-		markHierarchy(node, XMLProblem.SEVERITY_ERROR);
-		
-		if (exception instanceof SAXParseException) {
-			SAXParseException parseException= (SAXParseException)exception;
-			if (node.getOffset() == -1) { 
-				computeEndLocationForErrorNode(node, parseException.getLineNumber() - 1, parseException.getColumnNumber());
-			} else {
-				int lineNumber= parseException.getLineNumber();
-				int columnNumber= parseException.getColumnNumber();
-				if (columnNumber == -1) {
-					columnNumber= 1;
-				}
-				try {
-					AntElementNode childNode= node.getNode(getNonWhitespaceOffset(lineNumber, columnNumber) + 1);
-					if (childNode != null && childNode != node) {
-						node= childNode;
-						node.setProblemSeverity(XMLProblem.SEVERITY_ERROR);
-					} else {
-						node= createProblemElement(parseException);
-					}
-				} catch (BadLocationException be) {
-					node= createProblemElement(parseException);
-				}
-			}
-		}
-		
-		notifyProblemRequestor(exception, node, XMLProblem.SEVERITY_FATAL_ERROR);
-		
-		while (node.getParentNode() != null) {
-			AntElementNode parentNode= node.getParentNode();
-			if (parentNode.getLength() == -1) {
-				parentNode.setLength(node.getOffset() - parentNode.getOffset() + node.getLength());
-			}
-			node= parentNode;
-		}
-		
-		if (fIncrementalTarget != null) { //update the targets length for the edit
-			int editAdjustment= determineEditAdjustment(fDirtyRegion);
-			fIncrementalTarget.setLength(fIncrementalTarget.getLength() + editAdjustment);
-			AntElementNode startingNode= null;	
-			while(fStillOpenElements.peek() != fIncrementalTarget) {
-				startingNode= (AntElementNode)fStillOpenElements.pop();
-				if (startingNode.getLength() > -1) {
-					startingNode.setLength(startingNode.getLength() + editAdjustment);
-				}
-			}
-			fStillOpenElements.pop(); //get rid of the incremental target
-			if (startingNode != null && fIncrementalTarget.hasChildren()) {
-				List children= fIncrementalTarget.getChildNodes();
-				int index= children.indexOf(startingNode);
-				updateNodesForIncrementalParse(editAdjustment, children, index);
-			}
-		}
-	}
-	
-	public AntElementNode getOpenElement() {
-		if (fStillOpenElements.isEmpty()) {
-			return null;
-		}
-		return (AntElementNode)fStillOpenElements.peek();
-	}
-
-	
-	public String getEntityPath(String entityName) {
-		if (fEntityNameToPath != null) {
-			return (String)fEntityNameToPath.get(entityName);
-		} 
-		return null;
-	}
-	
-	public String getEntityName(String path) {
-		if (fEntityNameToPath != null) {
-			Iterator itr= fEntityNameToPath.keySet().iterator();
-			String entityPath;
-			String name;
-			while (itr.hasNext()) {
-				name= (String) itr.next();
-				entityPath= (String) fEntityNameToPath.get(name);
-				if (entityPath.equals(path)) {
-					return name;
-				}
-			}
-		} 
-		return null;
-	}
-	
-	public String getPropertyValue(String propertyName) {
-		AntProjectNode projectNode= getProjectNode();
-		if (projectNode == null) {
-			return null;
-		}
-		return projectNode.getProject().getProperty(propertyName);
-	}
-
-	public Object getReferenceObject(String refId) {
-		AntProjectNode projectNode= getProjectNode();
-		if (projectNode == null) {
-			return null;
-		}
-		try {
-			Project project= projectNode.getProject();
-			Object ref= project.getReference(refId);
-			return ref;
-			
-		} catch (BuildException be) {
-			handleBuildException(be, null);
-		}
-		return null;
-	}
-
-	public AntElementNode getReferenceNode(String text) {
-		Object reference= getReferenceObject(text);
-		if (reference == null) {
-			return null;
-		}
-		
-		Collection nodes= fTaskToNode.keySet();
-		Iterator iter= nodes.iterator();
-		while (iter.hasNext()) {
-			Object original = iter.next();
-			Object object= original;
-			if (object instanceof UnknownElement) {
-				UnknownElement element= (UnknownElement) object;
-				object= element.getRealThing();
-				if (object == null) {
-					continue;
-				}
-			} 
-			if (object == reference) {
-				return (AntElementNode)fTaskToNode.get(original);
-			}
-		}
-		return null;
-	}
-	
-	private ClassLoader getClassLoader() {
-		if (fgClassLoader == null) {
-			fgClassLoader= AntCorePlugin.getPlugin().getNewClassLoader(true);
-		}
-		return fgClassLoader;
-	}
-
-	
-	public String getTargetDescription(String targetRename) {
-		AntProjectNode projectNode= getProjectNode();
-		if (projectNode == null) {
-			return null;
-		}
-		Project project= projectNode.getProject();
-		Map targets= project.getTargets();
-		Target target= (Target)targets.get(targetRename);
-		if (target != null) {
-			return target.getDescription();
-		}
-		return null;
-	}
-	
-	public AntProjectNode getProjectNode(boolean waitForReconcile) {
-		if (waitForReconcile) {
-			possiblyWaitForReconcile();
-		}
-		return fProjectNode;
-	}
-	
-	public AntProjectNode getProjectNode() {
-		return getProjectNode(true);
-	}
-	
-	private void possiblyWaitForReconcile() {
-		synchronized (fDirtyLock) {
-			if (!fIsDirty) {
-				return;
-			}
-		}
-		synchronized (this) {
-			//wait for the reconcile from the edit
-			//or if that fails, timeout
-			try {
-				wait(XMLReconcilingStrategy.DELAY * 10);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-
-	public void setReplaceHasOccurred() {
-		fReplaceHasOccurred= true;
-	}
-	
-	public void updateMarkers() {
-		possiblyWaitForReconcile();
-		fMarkerUpdater.updateMarkers();
-	}
-	
-	public AntElementNode getNode(int offset, boolean waitForReconcile) {
-		if (getProjectNode(waitForReconcile) != null) {
-			return getProjectNode(waitForReconcile).getNode(offset);
-		}
-		return null;
-	}
-	
-	/**
-	 * The Ant model has been reconciled for the first time with the contents displayed in the Ant editor.
-	 * Since problem marker creation has been added after many buildfiles have been created (or if the file has been
-	 * created outside of Eclipse) we need to update the markers to match the problems.
-	 */
-	public void updateForInitialReconcile() {
-		fMarkerUpdater.updateMarkers();
-	}
-
-	/**
-     * Provides the set of names of the defining nodes that existed from the previous
-     * parse of the build file.
-     */
-	public void setNamesOfOldDefiningNodes(Set set) {
-		fNamesOfOldDefiningNodes= set;
-	}
-	
-	/**
-     * Removes any type definitions that no longer exist in the buildfile
-     */
-	private void reconcileTaskAndTypes() {
-		if (fNamesOfOldDefiningNodes == null) {
-			return;
-		}
-		Iterator iter= fNamesOfOldDefiningNodes.iterator();
-		while (iter.hasNext()) {
-			String nodeLabel = (String) iter.next();
-			if (fProjectNode.getDefininingTaskNode(nodeLabel) == null) {
-				ComponentHelper helper= ComponentHelper.getComponentHelper(fProjectNode.getProject());
-				helper.getAntTypeTable().remove(nodeLabel);
-				iter.remove();
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModelProject.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModelProject.java
deleted file mode 100644
index f2dc4d9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntModelProject.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.outline;
-
-/*
- * Copyright  2000-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.Project;
-
-/**
- * Derived from the original Ant Project class
- * This class allows property values to be written multiple times.
- * This facilitates incremental parsing of the Ant build file
- * It also attempts to ensure that we clean up after ourselves and allows
- * more manipulation of properties resulting from incremental parsing
- */
-public class AntModelProject extends Project {
-	
-	private Hashtable fBaseProperties;
-	private Hashtable fCurrentProperties= new Hashtable();
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#setNewProperty(java.lang.String, java.lang.String)
-	 */
-	public void setNewProperty(String name, String value) {
-		
-		if (fCurrentProperties.get(name) != null) {
-			return;
-		} 
-		//always property values to be over-written for this parse session
-		//there is currently no way to remove properties from the Apache Ant project
-		//the project resets it properties for each parse...see reset()
-		fCurrentProperties.put(name, value);
-		super.setProperty(name, value);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#fireBuildFinished(java.lang.Throwable)
-	 */
-	public void fireBuildFinished(Throwable exception) {
-		super.fireBuildFinished(exception);
-		Enumeration e= getBuildListeners().elements();
-		while (e.hasMoreElements()) {
-			BuildListener listener = (BuildListener) e.nextElement();
-			removeBuildListener(listener);
-		}
-	}
-	
-	public void reset() {
-		getTargets().clear();
-		setDefault(null);
-		setDescription(null);
-		setName(""); //$NON-NLS-1$
-		//reset the properties to the initial set
-		fCurrentProperties= new Hashtable();
-        Enumeration e = fBaseProperties.keys();
-        while (e.hasMoreElements()) {
-            Object name = e.nextElement();
-            Object value = fBaseProperties.get(name);
-            fCurrentProperties.put(name, value);
-        }	  
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#getProperty(java.lang.String)
-	 */
-	public String getProperty(String name) {
-		//override as we cannot remove properties from the Apache Ant project
-		return (String)fCurrentProperties.get(name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#getProperties()
-	 */
-	public Hashtable getProperties() {
-		//override as we cannot remove properties from the Apache Ant project
-		return fCurrentProperties;
-	}
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#init()
-	 */
-	public void init() throws BuildException {
-		super.init();
-		fBaseProperties= super.getProperties();
-		fCurrentProperties= super.getProperties();
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntOutlineMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntOutlineMessages.java
deleted file mode 100644
index 482e2c0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.editor.outline;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntOutlineMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/editor/outline/AntOutlineMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntOutlineMessages.properties
deleted file mode 100644
index 1563e7b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/AntOutlineMessages.properties
+++ /dev/null

@@ -1,30 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 53547
-###############################################################################
-
-AntModel.1=\ line: 
-AntModel.0=No default target specified
-AntModel.43=Default target {0} does not exist in this project
-AntModel.44=Target {0} does not exist in this project
-
-AntEditorContentOutlinePage.Open_With_1=Open With
-
-FilterInternalTargetsAction.0=Hide Internal Targets
-FilterImportedElementsAction.0=Hide Imported Elements
-FilterPropertiesAction.0=Hide Properties
-
-FilterTopLevelAction.0=Hide Top Level Elements
-
-ToggleSortAntOutlineAction.0=Sort
-
-ToggleLinkWithEditorAction.0=Lin&k With Editor
-ToggleLinkWithEditorAction.1=Link with Editor
-ToggleLinkWithEditorAction.2=Link with active editor
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/DocumentModelChangeEvent.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/DocumentModelChangeEvent.java
deleted file mode 100644
index c945377..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/outline/FilterImportedElementsAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterImportedElementsAction.java
deleted file mode 100644
index 5c1245e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterImportedElementsAction.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     John-Mason P. Shackelford - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.editor.outline;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.custom.BusyIndicator;
-
-/** 
- * An action which toggles filtering of imported elements from the Ant outline.
- */
-public class FilterImportedElementsAction extends Action {
-    
-	private AntEditorContentOutlinePage fPage;
-	
-	public FilterImportedElementsAction(AntEditorContentOutlinePage page) {
-		super(AntOutlineMessages.getString("FilterImportedElementsAction.0")); //$NON-NLS-1$
-		fPage = page;
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_FILTER_IMPORTED_ELEMENTS));
-		setToolTipText(AntOutlineMessages.getString("FilterImportedElementsAction.0")); //$NON-NLS-1$
-		setChecked(fPage.filterImportedElements());
-	}
-
-    /**
-	 * Toggles the filtering of imported elements from the Ant outline
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		BusyIndicator.showWhile(fPage.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				fPage.setFilterImportedElements(isChecked());
-			}
-		});
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterInternalTargetsAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterInternalTargetsAction.java
deleted file mode 100644
index bbf8df4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterInternalTargetsAction.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.ui.editor.outline;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.custom.BusyIndicator;
-
-/** 
- * An action which toggles filtering of internal targets from the Ant outline.
- */
-public class FilterInternalTargetsAction extends Action {
-	
-	private AntEditorContentOutlinePage fPage;
-	
-	public FilterInternalTargetsAction(AntEditorContentOutlinePage page) {
-		super(AntOutlineMessages.getString("FilterInternalTargetsAction.0")); //$NON-NLS-1$
-		fPage = page;
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_FILTER_INTERNAL_TARGETS));
-		setToolTipText(AntOutlineMessages.getString("FilterInternalTargetsAction.0")); //$NON-NLS-1$
-		setChecked(fPage.filterInternalTargets());
-	}
-	
-	/**
-	 * Toggles the filtering of internal targets from the Ant outline
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		BusyIndicator.showWhile(fPage.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				fPage.setFilterInternalTargets(isChecked());
-			}
-		});
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterPropertiesAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterPropertiesAction.java
deleted file mode 100644
index fb1e002..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterPropertiesAction.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.ui.editor.outline;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.custom.BusyIndicator;
-
-/** 
- * An action which toggles filtering of properties from the Ant outline.
- */
-public class FilterPropertiesAction extends Action {
-	
-	private AntEditorContentOutlinePage fPage;
-	
-	public FilterPropertiesAction(AntEditorContentOutlinePage page) {
-		super(AntOutlineMessages.getString("FilterPropertiesAction.0")); //$NON-NLS-1$
-		fPage = page;
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_FILTER_PROPERTIES));
-		setToolTipText(AntOutlineMessages.getString("FilterPropertiesAction.0")); //$NON-NLS-1$
-		setChecked(fPage.filterProperties());
-	}
-	
-	/**
-	 * Toggles the filtering of properties from the Ant outline
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		BusyIndicator.showWhile(fPage.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				fPage.setFilterProperties(isChecked());
-			}
-		});
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterTopLevelAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterTopLevelAction.java
deleted file mode 100644
index 4b06d29..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/FilterTopLevelAction.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.outline;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.custom.BusyIndicator;
-
-/** 
- * An action which toggles filtering of properties from the Ant outline.
- */
-public class FilterTopLevelAction extends Action {
-	
-	private AntEditorContentOutlinePage fPage;
-	
-	public FilterTopLevelAction(AntEditorContentOutlinePage page) {
-		super(AntOutlineMessages.getString("FilterTopLevelAction.0")); //$NON-NLS-1$
-		fPage = page;
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_FILTER_TOP_LEVEL));
-		setToolTipText(AntOutlineMessages.getString("FilterTopLevelAction.0")); //$NON-NLS-1$
-		setChecked(fPage.filterTopLevel());
-	}
-	
-	/**
-	 * Toggles the filtering of top level tasks and types from the Ant outline
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		BusyIndicator.showWhile(fPage.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				fPage.setFilterTopLevel(isChecked());
-			}
-		});
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IDocumentModelListener.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IDocumentModelListener.java
deleted file mode 100644
index a5db242..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.editor.outline;
-
-
-public interface IDocumentModelListener {
-	
-	public void documentModelChanged(DocumentModelChangeEvent event);
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblem.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblem.java
deleted file mode 100644
index 39dada2..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblem.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.internal.ui.editor.outline;
-
-import org.eclipse.jface.text.IRegion;
-
-
-public interface IProblem extends IRegion {
-
-	/**
-	 * Answer a localized, human-readable message string which describes the problem.
-	 * The message has been "escaped" to handle special characters.
-	 *
-	 * @return a localized, human-readable message string which describes the problem
-	 */
-	String getMessage();
-	
-	/**
-	 * Answer a localized, human-readable message string which describes the problem.
-	 * The message is in its original form; special characters have not been escaped.
-	 *
-	 * @return localized, human-readable message string which describes the problem
-	 */
-	String getUnmodifiedMessage();
-
-	/**
-	 * 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();
-	
-	/**
-	 * Returns the line number of this problem.
-	 *
-	 * @return the line number of this problem
-	 */
-	int getLineNumber();
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblemRequestor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/IProblemRequestor.java
deleted file mode 100644
index 62325a7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/outline/LocationProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/LocationProvider.java
deleted file mode 100644
index c498957..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/LocationProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.outline;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.editors.text.ILocationProvider;
-
-public class LocationProvider {
-	private IEditorInput fEditorInput;
-	
-	public LocationProvider(IEditorInput input) {
-		fEditorInput= input;
-	}
-
-	public IPath getLocation() {
-		if(fEditorInput instanceof IFileEditorInput) {
-			return ((IFileEditorInput)fEditorInput).getFile().getLocation();
-		} else if (fEditorInput instanceof ILocationProvider) {
-			return ((ILocationProvider)fEditorInput).getPath(fEditorInput);
-		}
-		return null;
-	}
-	
-	public IFile getFile() {
-		if(fEditorInput instanceof IFileEditorInput) {
-			return ((IFileEditorInput)fEditorInput).getFile();
-		}
-		return null;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleLinkWithEditorAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleLinkWithEditorAction.java
deleted file mode 100644
index 1dacdec..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleLinkWithEditorAction.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.outline;
-
-import org.eclipse.ant.internal.ui.editor.AntEditor;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.jface.action.Action;
-
-/**
- * This action toggles whether the Ant Outline page links its selection to the
- * active editor.
- * 
- * @since 3.0
- */
-public class ToggleLinkWithEditorAction extends Action {
-	
-	AntEditor fEditor;
-	
-	public ToggleLinkWithEditorAction(AntEditor editor) {
-		super(AntOutlineMessages.getString("ToggleLinkWithEditorAction.0")); //$NON-NLS-1$
-		boolean isLinkingEnabled = AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.OUTLINE_LINK_WITH_EDITOR);
-		setChecked(isLinkingEnabled);
-		fEditor = editor;
-		setToolTipText(AntOutlineMessages.getString("ToggleLinkWithEditorAction.1")); //$NON-NLS-1$
-		setDescription(AntOutlineMessages.getString("ToggleLinkWithEditorAction.2")); //$NON-NLS-1$
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_LINK_WITH_EDITOR));
-	}
-	
-	public void run() {
-		AntUIPlugin.getDefault().getPreferenceStore().setValue(IAntUIPreferenceConstants.OUTLINE_LINK_WITH_EDITOR, isChecked());
-		if (isChecked())
-			fEditor.synchronizeOutlinePage(false);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleSortAntOutlineAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleSortAntOutlineAction.java
deleted file mode 100644
index 3e76d1f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/ToggleSortAntOutlineAction.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.ant.internal.ui.editor.outline;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.action.Action;
-
-/**
- * An action which toggles sorting in the Ant outline page.
- */
-public class ToggleSortAntOutlineAction extends Action {
-
-	private AntEditorContentOutlinePage fPage;
-	
-	public ToggleSortAntOutlineAction(AntEditorContentOutlinePage page) {
-		super(AntOutlineMessages.getString("ToggleSortAntOutlineAction.0")); //$NON-NLS-1$
-		fPage = page;
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_SORT_OUTLINE));
-		setToolTipText(AntOutlineMessages.getString("ToggleSortAntOutlineAction.0")); //$NON-NLS-1$
-		setChecked(fPage.isSort());
-	}
-	
-	/**
-	 * Toggles the sorting of targets in the Ant outline
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		fPage.setSort(isChecked());
-	}
-	
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLCore.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLCore.java
deleted file mode 100644
index 9eb410a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLCore.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.internal.ui.editor.outline;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * XMLCore.java
- */
-public class XMLCore {
-	
-	private static XMLCore inst;
-	
-	public static XMLCore getDefault() {
-		if (inst == null) {
-			inst= new XMLCore();
-		}
-			
-		return inst;
-	}
-	
-	private List 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/internal/ui/editor/outline/XMLProblem.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLProblem.java
deleted file mode 100644
index 473c88d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/outline/XMLProblem.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.outline;
-
-import org.eclipse.jface.text.Region;
-
-public class XMLProblem extends Region implements IProblem {
-	
-	public static final int NO_PROBLEM= -1;
-	public static final int SEVERITY_WARNING= 0;
-	public static final int SEVERITY_ERROR= 1;
-	public static final int SEVERITY_FATAL_ERROR= 2;
-	
-	private String fMessage;
-	private String fEscapedMessage;
-	private int fSeverity;
-	private int fAdjustedLength= -1;
-	private int fLineNumber= -1;
-	
-	public XMLProblem(String message, int severity, int offset, int length, int lineNumber) {
-		super(offset, length);
-		fMessage= message;
-		fEscapedMessage= getEscaped(message);
-		fSeverity= severity;
-		fLineNumber= lineNumber;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblem#getMessage()
-	 */
-	public String getMessage() {
-		return fEscapedMessage;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblem#isError()
-	 */
-	public boolean isError() {
-		return fSeverity == SEVERITY_ERROR || fSeverity == SEVERITY_FATAL_ERROR;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblem#isWarning()
-	 */
-	public boolean isWarning() {
-		return fSeverity == SEVERITY_WARNING;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IRegion#getLength()
-	 */
-	public int getLength() {
-		if (fAdjustedLength != -1) {
-			return fAdjustedLength;
-		}
-		return super.getLength();
-	}
-	
-	/**
-	 * Sets the length for this problem.
-	 */
-	public void setLength(int adjustedLength) {
-		fAdjustedLength= adjustedLength;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblem#getLineNumber()
-	 */
-	public int getLineNumber() {
-		return fLineNumber;
-	}
-	
-	private void appendEscapedChar(StringBuffer buffer, char c) {
-		String replacement= getReplacement(c);
-		if (replacement != null) {
-			buffer.append(replacement);
-		} else {
-			buffer.append(c);
-		}
-	}
-	
-	private String getEscaped(String s) {
-		StringBuffer result= new StringBuffer(s.length() + 10);
-		for (int i= 0; i < s.length(); ++i) {
-			appendEscapedChar(result, s.charAt(i));
-		}
-		return result.toString();
-	}
-	
-	private String getReplacement(char c) {
-		// Encode special characters into the equivalent character references.
-		// Ensures that error messages that include special characters do not get
-		//incorrectly represented as HTML in the text hover (bug 56258)
-		switch (c) {
-			case '<' :
-				return "&lt;"; //$NON-NLS-1$
-			case '>' :
-				return "&gt;"; //$NON-NLS-1$
-			case '"' :
-				return "&quot;"; //$NON-NLS-1$
-			case '\'' :
-				return "&apos;"; //$NON-NLS-1$
-			case '&' :
-				return "&amp;"; //$NON-NLS-1$
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.outline.IProblem#getUnmodifiedMessage()
-	 */
-	public String getUnmodifiedMessage() {
-		return fMessage;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java
deleted file mode 100644
index d8a6fda..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntContext.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.TemplateException;
-
-public class AntContext extends DocumentTemplateContext {
-	
-	private AntModel fAntModel;
-	
-	public AntContext(TemplateContextType type, IDocument document, AntModel model, int completionOffset, int completionLength) {
-		super(type, document, completionOffset, completionLength);
-		fAntModel= model;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.TemplateContext#evaluate(org.eclipse.jface.text.templates.Template)
-	 */
-	public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException {
-
-		TemplateBuffer templateBuffer= super.evaluate(template);
-		
-		if (templateBuffer == null) {
-			return null;
-		}
-		//TODO bug 55356 
-//		if (AntUIPlugin.getDefault().getPreferenceStore().getBoolean(AntEditorPreferenceConstants.TEMPLATES_USE_CODEFORMATTER)) {
-//			FormattingPreferences prefs = new FormattingPreferences();
-//			XmlDocumentFormatter formatter= new XmlDocumentFormatter();
-//			formatter.format(templateBuffer, this, prefs);
-//		}
-		return templateBuffer;
-	}
-	
-	/**
-	 * @return Returns the AntModel.
-	 */
-	public AntModel getAntModel() {
-		return fAntModel;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.DocumentTemplateContext#getEnd()
-	 */
-	public int getEnd() {
-		int replacementOffset = getCompletionOffset();
-		int replacementLength = getCompletionLength();
-		if (replacementOffset > 0 && getDocument().get().charAt(replacementOffset - 1) == '<') {
-			replacementLength++;
-		}
-		return replacementLength;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.templates.DocumentTemplateContext#getStart()
-	 */
-	public int getStart() {
-		int replacementOffset= getCompletionOffset();
-		if (replacementOffset > 0 && getDocument().get().charAt(replacementOffset - 1) == '<') {
-			replacementOffset--;
-		}
-		return replacementOffset;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntSourceViewerInformationControl.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntSourceViewerInformationControl.java
deleted file mode 100644
index a6adcf6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntSourceViewerInformationControl.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
-import org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.swt.widgets.Shell;
-
-public class AntSourceViewerInformationControl extends DefaultInformationControl {
-	
-	public AntSourceViewerInformationControl(Shell parent, int shellStyle, int style, IInformationPresenter presenter) {
-		super(parent, shellStyle, style, presenter);
-	}
-	
-	public AntSourceViewerInformationControl(Shell parent, int shellStyle, int style, IInformationPresenter presenter, String statusFieldText) {
-		super(parent, shellStyle, style, presenter, statusFieldText);
-	}
-	
-	public AntSourceViewerInformationControl(Shell parent, int style, IInformationPresenter presenter) {
-		super(parent, style, presenter);
-	}
-	
-	public AntSourceViewerInformationControl(Shell parent, int style, IInformationPresenter presenter, String statusFieldText) {
-		super(parent, style, presenter, statusFieldText);
-	}
-	
-	public AntSourceViewerInformationControl(Shell parent) {
-		super(parent);
-	}
-	
-	public AntSourceViewerInformationControl(Shell parent, IInformationPresenter presenter) {
-		super(parent, presenter);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String)
-	 */
-	public void setInformation(String content) {
-		if (content != null) {
-			XmlDocumentFormatter formatter= new XmlDocumentFormatter();
-			content= formatter.format(content, new FormattingPreferences());
-		}
-		super.setInformation(content);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateAccess.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateAccess.java
deleted file mode 100644
index 29d920e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateAccess.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import java.io.IOException;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-
-
-public class AntTemplateAccess {
-	/** Key to store custom templates. */
-	private static final String CUSTOM_TEMPLATES_KEY= "org.eclipse.ant.ui.customtemplates"; //$NON-NLS-1$
-	
-	/** The shared instance. */
-	private static AntTemplateAccess fgInstance;
-	
-	/** The template store. */
-	private TemplateStore fStore;
-	
-	/** The context type registry. */
-	private ContributionContextTypeRegistry fRegistry;
-	
-	private AntTemplateAccess() {
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance
-	 */
-	public static AntTemplateAccess getDefault() {
-		if (fgInstance == null) {
-			fgInstance= new AntTemplateAccess();
-		}
-		return fgInstance;
-	}
-
-	/**
-	 * Returns this plug-in's template store.
-	 * 
-	 * @return the template store of this plug-in instance
-	 */
-	public TemplateStore getTemplateStore() {
-		if (fStore == null) {
-			fStore= new ContributionTemplateStore(getContextTypeRegistry(),AntUIPlugin.getDefault().getPreferenceStore(), CUSTOM_TEMPLATES_KEY);
-			try {
-				fStore.load();
-			} catch (IOException e) {
-				AntUIPlugin.log(e);
-			}
-		}
-		return fStore;
-	}
-
-	/**
-	 * Returns this plug-in's context type registry.
-	 * 
-	 * @return the context type registry for this plug-in instance
-	 */
-	public ContextTypeRegistry getContextTypeRegistry() {
-		if (fRegistry == null) {
-			// create and configure the contexts available in the template editor
-			fRegistry= new ContributionContextTypeRegistry();
-			fRegistry.addContextType(BuildFileContextType.BUILDFILE_CONTEXT_TYPE);
-			fRegistry.addContextType(TaskContextType.TASK_CONTEXT_TYPE);
-		}
-		return fRegistry;
-	}
-
-	public IPreferenceStore getPreferenceStore() {	    
-		return AntUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	public void savePluginPreferences() {
-		AntUIPlugin.getDefault().savePluginPreferences();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateInformationControlCreator.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateInformationControlCreator.java
deleted file mode 100644
index a862c1e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateInformationControlCreator.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2004 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
-	IBM Corporation - Initial implementation
-**********************************************************************/
-package org.eclipse.ant.internal.ui.editor.templates;
-
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.IInformationControlCreatorExtension;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class AntTemplateInformationControlCreator implements IInformationControlCreator, IInformationControlCreatorExtension {
-	
-	private AntSourceViewerInformationControl fControl;
-	
-	public AntTemplateInformationControlCreator()  {
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell)
-	 */
-	public IInformationControl createInformationControl(Shell parent) {
-		fControl= new AntSourceViewerInformationControl(parent);
-		fControl.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				fControl= null;
-			}
-		});
-		return fControl;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlCreatorExtension#canReuse(org.eclipse.jface.text.IInformationControl)
-	 */
-	public boolean canReuse(IInformationControl control) {
-		return fControl == control && fControl != null;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlCreatorExtension#canReplace(org.eclipse.jface.text.IInformationControlCreator)
-	 */
-	public boolean canReplace(IInformationControlCreator creator) {
-		return (creator != null && getClass() == creator.getClass());
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java
deleted file mode 100644
index 57bb910..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplatePreferencePage.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004  John-Mason P. Shackelford and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- * 	   John-Mason P. Shackelford - initial API and implementation
- *     IBM Corporation - bug fixes
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.editor.templates;
-
-import org.eclipse.ant.internal.ui.editor.formatter.FormattingPreferences;
-import org.eclipse.ant.internal.ui.editor.formatter.XmlDocumentFormatter;
-import org.eclipse.ant.internal.ui.editor.text.AntDocumentSetupParticipant;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
-
-/**
- * @see org.eclipse.jface.preference.PreferencePage
- */
-public class AntTemplatePreferencePage extends TemplatePreferencePage {
-
-	private XmlDocumentFormatter fFormatter= new XmlDocumentFormatter();
-	private FormattingPreferences fFormattingPreferences= new FormattingPreferences();
-	
-    public AntTemplatePreferencePage() {
-        setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-        setTemplateStore(AntTemplateAccess.getDefault().getTemplateStore());
-        setContextTypeRegistry(AntTemplateAccess.getDefault().getContextTypeRegistry());
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-     */
-    public boolean performOk() {
-    	  boolean ok = super.performOk();
-    	  AntUIPlugin.getDefault().savePluginPreferences();
-    	  return ok;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite)
-     */
-    protected SourceViewer createViewer(Composite parent) {
-    	SourceViewer viewer = new SourceViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-          
-		SourceViewerConfiguration configuration = new AntTemplateViewerConfiguration();        
-		IDocument document = new Document();       
-		new AntDocumentSetupParticipant().setup(document);
-		viewer.configure(configuration);
-		viewer.setDocument(document);
-		viewer.setEditable(false);	
-		Font font= JFaceResources.getFont(JFaceResources.TEXT_FONT);
-		viewer.getTextWidget().setFont(font);    
-		        
-		return viewer;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#getFormatterPreferenceKey()
-     */
-    protected String getFormatterPreferenceKey() {
-		return AntEditorPreferenceConstants.TEMPLATES_USE_CODEFORMATTER;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#updateViewerInput()
-	 */
-	protected void updateViewerInput() {
-		IStructuredSelection selection= (IStructuredSelection) getTableViewer().getSelection();
-		SourceViewer viewer= getViewer();
-		
-		if (selection.size() == 1 && selection.getFirstElement() instanceof TemplatePersistenceData) {
-			TemplatePersistenceData data= (TemplatePersistenceData) selection.getFirstElement();
-			Template template= data.getTemplate();
-			if (AntUIPlugin.getDefault().getPreferenceStore().getBoolean(getFormatterPreferenceKey())) {
-				String formatted= fFormatter.format(template.getPattern(),fFormattingPreferences);
-				viewer.getDocument().set(formatted);
-			} else {
-				viewer.getDocument().set(template.getPattern());
-			}
-		} else {
-			viewer.getDocument().set(""); //$NON-NLS-1$
-		}		
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateProposal.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateProposal.java
deleted file mode 100644
index 2d4a080..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateProposal.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.swt.graphics.Image;
-
-public class AntTemplateProposal extends TemplateProposal {
-	
-	public AntTemplateProposal(Template template, TemplateContext context,IRegion region, Image image) {
-		super(template, context, region, image);
-	}
-	
-	public AntTemplateProposal(Template template, TemplateContext context, IRegion region, Image image, int relevance) {
-		super(template, context, region, image, relevance);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
-	 */
-	public IInformationControlCreator getInformationControlCreator() {
-		return new AntTemplateInformationControlCreator();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateVariableTextHover.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateVariableTextHover.java
deleted file mode 100644
index 0b50e34..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateVariableTextHover.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import java.util.Iterator;
-import org.eclipse.ant.internal.ui.editor.text.XMLTextHover;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.TemplateVariableResolver;
-
-public class AntTemplateVariableTextHover implements ITextHover {
-
-	public AntTemplateVariableTextHover() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
-	 */
-	public String getHoverInfo(ITextViewer textViewer, IRegion subject) {
-		try {
-			IDocument doc= textViewer.getDocument();
-			int offset= subject.getOffset();
-			if (offset >= 2 && "${".equals(doc.get(offset-2, 2))) { //$NON-NLS-1$
-				String varName= doc.get(offset, subject.getLength());
-				TemplateContextType contextType= AntTemplateAccess.getDefault().getContextTypeRegistry().getContextType(TaskContextType.TASK_CONTEXT_TYPE);
-				if (contextType != null) {
-					Iterator iter= contextType.resolvers();
-					while (iter.hasNext()) {
-						TemplateVariableResolver var= (TemplateVariableResolver) iter.next();
-						if (varName.equals(var.getType())) {
-							return var.getDescription();
-						}
-					}
-				}
-			}				
-		} catch (BadLocationException e) {
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		if (textViewer != null) {
-			return XMLTextHover.getRegion(textViewer, offset);
-		}
-		return null;	
-	}
-} 
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateViewerConfiguration.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateViewerConfiguration.java
deleted file mode 100644
index 2ec22a6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntTemplateViewerConfiguration.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import org.eclipse.ant.internal.ui.editor.AbstractAntSourceViewerConfiguration;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-
-public class AntTemplateViewerConfiguration extends AbstractAntSourceViewerConfiguration {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
-	 */
-	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
-		return new AntTemplateVariableTextHover();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntVariableResolver.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntVariableResolver.java
deleted file mode 100644
index fb5d8da..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/AntVariableResolver.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.internal.ui.editor.templates;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateVariableResolver;
-
-/**
- * Looks up existing ant variables and proposes them. The proposals are sorted by 
- * their prefix-likeness with the variable type.
- */
-public class AntVariableResolver extends TemplateVariableResolver {
-	/*
-	 * @see org.eclipse.jface.text.templates.TemplateVariableResolver#resolveAll(org.eclipse.jface.text.templates.TemplateContext)
-	 */
-	protected String[] resolveAll(TemplateContext context) {
-		String[] proposals= new String[] { "${srcDir}", "${dstDir}" }; //$NON-NLS-1$ //$NON-NLS-2$
-		
-		Arrays.sort(proposals, new Comparator() {
-
-			public int compare(Object o1, Object o2) {
-				return getCommonPrefixLength(getType(), (String) o2) - getCommonPrefixLength(getType(), (String) o1);
-			}
-
-			private int getCommonPrefixLength(String type, String var) {
-				int i= 0;
-				CharSequence vSeq= var.subSequence(2, var.length() - 1); // strip away ${}
-				while (i < type.length() && i < vSeq.length())
-					if (Character.toLowerCase(type.charAt(i)) == Character.toLowerCase(vSeq.charAt(i)))
-						i++;
-					else
-						break;
-				return i;
-			}
-		});
-		
-		return proposals;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/BuildFileContextType.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/BuildFileContextType.java
deleted file mode 100644
index f50cd11..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/BuildFileContextType.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-
-
-/**
- * A very simple context type.
- */
-public class BuildFileContextType extends TemplateContextType {
-
-	/** This context's id */
-	public static final String BUILDFILE_CONTEXT_TYPE= "org.eclipse.ant.ui.templateContextType.buildFile"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new XML context type. 
-	 */
-	public BuildFileContextType() {
-		addGlobalResolvers();
-	}
-
-	private void addGlobalResolvers() {
-		addResolver(new GlobalTemplateVariables.Cursor());
-		addResolver(new GlobalTemplateVariables.WordSelection());
-		addResolver(new GlobalTemplateVariables.LineSelection());
-		addResolver(new GlobalTemplateVariables.Dollar());
-		addResolver(new GlobalTemplateVariables.Date());
-		addResolver(new GlobalTemplateVariables.Year());
-		addResolver(new GlobalTemplateVariables.Time());
-		addResolver(new GlobalTemplateVariables.User());
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/TaskContextType.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/TaskContextType.java
deleted file mode 100644
index 4c1f978..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/templates/TaskContextType.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.templates;
-
-public class TaskContextType extends BuildFileContextType {
-	public static final String TASK_CONTEXT_TYPE= "org.eclipse.ant.ui.templateContextType.task"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AnnotationAccess.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AnnotationAccess.java
deleted file mode 100644
index 947b5fe..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AnnotationAccess.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-
-public class AnnotationAccess extends DefaultMarkerAnnotationAccess {
-
-	/* (non-Javadoc)
-	 * @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.getType();
-			}
-		}
-		
-		return super.getType(annotation);
-	}
-
-	/* (non-Javadoc)
-	 * @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 super.isTemporary(annotation);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentFactory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentFactory.java
deleted file mode 100644
index 2059bbe..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentFactory.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2004 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
-	IBM Corporation - Initial implementation
-**********************************************************************/
-package org.eclipse.ant.internal.ui.editor.text;
-
-import org.eclipse.core.filebuffers.IDocumentFactory;
-import org.eclipse.jface.text.IDocument;
-
-/**
- * The document factory for Ant UI
- */
-public class AntDocumentFactory  implements IDocumentFactory {
-
-	public AntDocumentFactory() {
-	}
-		
-	/*
-	 * @see org.eclipse.core.filebuffers.IDocumentFactory#createDocument()
-	 */
-	public IDocument createDocument() {
-		return new PartiallySynchronizedDocument();
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentSetupParticipant.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentSetupParticipant.java
deleted file mode 100644
index b894724..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntDocumentSetupParticipant.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2004 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
-	IBM Corporation - Initial implementation
-**********************************************************************/
-package org.eclipse.ant.internal.ui.editor.text;
-
-import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-
-/**
- * The document setup participant for Ant.
- */
-public class AntDocumentSetupParticipant  implements IDocumentSetupParticipant {
-
-	public AntDocumentSetupParticipant() {
-	}
-	
-	/*
-	 * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
-	 */
-	public void setup(IDocument document) {
-		if (document != null) {
-			IDocumentPartitioner partitioner = createDocumentPartitioner();
-			document.setDocumentPartitioner(partitioner);
-			partitioner.connect(document);
-		}
-	}
-	
-	private IDocumentPartitioner createDocumentPartitioner() {
-		return new DefaultPartitioner(
-				new AntEditorPartitionScanner(), new String[]{
-						AntEditorPartitionScanner.XML_TAG,
-						AntEditorPartitionScanner.XML_COMMENT});
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java
deleted file mode 100644
index e93c13b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorDocumentProvider.java
+++ /dev/null

@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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.internal.ui.editor.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.ant.internal.ui.editor.outline.AntEditorMarkerUpdater;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.outline.IProblem;
-import org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor;
-import org.eclipse.ant.internal.ui.editor.outline.LocationProvider;
-import org.eclipse.ant.internal.ui.editor.outline.XMLCore;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ISynchronizable;
-import org.eclipse.jface.text.Position;
-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.editors.text.EditorsUI;
-import org.eclipse.ui.editors.text.TextFileDocumentProvider;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-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 TextFileDocumentProvider {
-
-	protected class AntAnnotationModel 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();
-
-		public AntAnnotationModel(IFile file) {
-			super(file);
-		}
-
-		/*
-		 * @see org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel#createMarkerAnnotation(org.eclipse.core.resources.IMarker)
-		 */
-		protected MarkerAnnotation createMarkerAnnotation(IMarker marker) {
-			String markerType= MarkerUtilities.getMarkerType(marker);
-			if (AntEditorMarkerUpdater.BUILDFILE_PROBLEM_MARKER.equals(markerType)) {
-				return null;
-			}
-			return new XMLMarkerAnnotation(EditorsUI.getAnnotationTypeLookup().getAnnotationType(marker), 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.internal.ui.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.internal.ui.editor.outline.IProblem)
-		 */
-		public void acceptProblem(IProblem problem) {
-			fCollectedProblems.add(problem);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.internal.ui.editor.outline.IProblem)
-		 */
-		public void beginReporting() {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ant.internal.ui.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.internal.ui.editor.outline.IProblem)
-		 */
-		public void endReporting() {
-			boolean temporaryProblemsChanged= false;
-			fPreviouslyOverlaid= fCurrentlyOverlaid;
-			fCurrentlyOverlaid= new ArrayList();
-				
-			synchronized (getAnnotationMap()) {
-					
-				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);
-							try {
-								addAnnotation(annotation, position, false);
-							} catch (BadLocationException ex) {
-								AntUIPlugin.log(ex);
-							}
-								
-							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);
-		}
-						
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.source.AnnotationModel#addAnnotation(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position, boolean)
-		 */
-		protected void addAnnotation(Annotation annotation, Position position, boolean fireModelChanged) throws BadLocationException {
-			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);
-			}
-		}
-			
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.source.AnnotationModel#removeAllAnnotations(boolean)
-		 */
-		protected void removeAllAnnotations(boolean fireModelChanged) {
-			super.removeAllAnnotations(fireModelChanged);
-			fReverseMap.clear();
-		}
-			
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.source.AnnotationModel#removeAnnotation(org.eclipse.jface.text.source.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 Ant document model for each element.
-	 */
-	protected class AntFileInfo extends FileInfo {
-		
-		public AntModel fAntModel;
-		
-		public AntFileInfo() {
-		}
-	}
-	
-	/**
-	 * 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(new TextFileDocumentProvider(new AntStorageDocumentProvider()));
-		fCore= core;
-	}
-
-    public AntModel getAntModel(Object element) {
-	    FileInfo info= getFileInfo(element);
-	    if (info instanceof AntFileInfo) {
-		    AntFileInfo xmlInfo= (AntFileInfo) info;
-		    return xmlInfo.fAntModel;
-	    }
-	    return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createAnnotationModel(org.eclipse.core.resources.IFile)
-     */
-    protected IAnnotationModel createAnnotationModel(IFile file) {
-		   return new AntAnnotationModel(file);
-    }
-
-    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 IEditorInput ? (IEditorInput) element : null));
-    }
-    
-    /*
-	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object)
-	 */
-	protected FileInfo createFileInfo(Object element) throws CoreException {
-		FileInfo info= super.createFileInfo(element);
-		if (!(info instanceof AntFileInfo)) {
-			return null;
-		}
-	
-		AntFileInfo xmlInfo= (AntFileInfo) info;
-		IAnnotationModel model= xmlInfo.fModel;
-//		if (model == null) {
-//			model= createAnnotationModel(null);
-//			model.connect(xmlInfo.fTextFileBuffer.getDocument());
-//		}
-		AntModel antModel= createAntModel(element, xmlInfo.fTextFileBuffer.getDocument(), model);
-		antModel.install();
-		xmlInfo.fAntModel= antModel;
-		setUpSynchronization(xmlInfo);
-		
-		return xmlInfo;
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#disposeFileInfo(java.lang.Object, org.eclipse.ui.editors.text.TextFileDocumentProvider.FileInfo)
-     */
-    protected void disposeFileInfo(Object element, FileInfo info) {
-	    if (info instanceof AntFileInfo) {
-		    AntFileInfo xmlInfo= (AntFileInfo) info;
-		    if (xmlInfo.fAntModel != null)
-			    xmlInfo.fAntModel.dispose();
-	    }
-	    super.disposeFileInfo(element, info);	
-    }
-    
-    /*
-	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createEmptyFileInfo()
-	 */
-	protected FileInfo createEmptyFileInfo() {
-		return new AntFileInfo();
-	}
-	
-	 private void setUpSynchronization(AntFileInfo antInfo) {
-        IDocument document= antInfo.fTextFileBuffer.getDocument();
-        IAnnotationModel model= antInfo.fModel;
-        
-        if (document instanceof ISynchronizable && model instanceof ISynchronizable) {
-            Object lock= ((ISynchronizable) document).getLockObject();
-            ((ISynchronizable) model).setLockObject(lock);
-        }
-    }
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorPartitionScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorPartitionScanner.java
deleted file mode 100644
index 4e3155d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorPartitionScanner.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 32890, bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.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.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 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 MultiLineRule("<!--", "-->", xmlComment, '\\', true); //$NON-NLS-1$ //$NON-NLS-2$
-
-        IToken tag = new Token(XML_TAG);
-		rules[1]= new TagRule(tag);
-	
-		setPredicateRules(rules);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorProcInstrScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorProcInstrScanner.java
deleted file mode 100644
index 6f6fb77..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorProcInstrScanner.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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.internal.ui.editor.text;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-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;
-
-/**
- * The scanner to tokenize for XML processing instructions and text
- */
-public class AntEditorProcInstrScanner extends RuleBasedScanner {
-
-	Token fProcInstructionToken= null;
-	
-    public AntEditorProcInstrScanner() {
-		IRule[] rules =new IRule[2];
-        fProcInstructionToken =
-            new Token(
-                new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.PROCESSING_INSTRUCTIONS_COLOR)));
-
-        //Add rule for processing instructions
-        rules[0]= new SingleLineRule("<?", "?>", fProcInstructionToken); //$NON-NLS-1$ //$NON-NLS-2$
-
-        // Add generic whitespace rule.
-        rules[1]= new WhitespaceRule(new AntEditorWhitespaceDetector());
-
-        setRules(rules);
-        
-        setDefaultReturnToken(new Token(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.TEXT_COLOR))));
-    }
-
-	/**
-	 * Update the text attributes associated with the tokens of this scanner as a color preference has been changed. 
-	 */
-	public void adaptToColorChange() {
-		((Token)fDefaultReturnToken).setData(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.TEXT_COLOR)));
-		fProcInstructionToken.setData(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.PROCESSING_INSTRUCTIONS_COLOR)));
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTagScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTagScanner.java
deleted file mode 100644
index 80d48b3..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTagScanner.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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, bug 47139
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.text;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-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;
-
-/**
- * The scanner to tokenize for strings and tags
- */
-public class AntEditorTagScanner extends RuleBasedScanner {
-
-	private Token fStringToken;
-	
-    public AntEditorTagScanner() {
-    	fStringToken= new Token(
-                			new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.STRING_COLOR)));
-                    
-		IRule[] rules= new IRule[3];
-
-        // Add rule for single and double quotes
-        rules[0]= new MultiLineRule("\"", "\"", fStringToken, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-        rules[1]= new SingleLineRule("'", "'", fStringToken, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-
-        // Add generic whitespace rule.
-        rules[2]= new WhitespaceRule(new AntEditorWhitespaceDetector());
-
-        setRules(rules);
-        
-        setDefaultReturnToken(
-        		new Token(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.TAG_COLOR))));
-    }
-    
-    /**
-     * Update the text attributes associated with the tokens of this scanner as a color preference has been changed. 
-     */
-    public void adaptToColorChange() {
-    	((Token)fDefaultReturnToken).setData(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.TAG_COLOR)));
-    	fStringToken.setData(new TextAttribute(JFaceResources.getColorRegistry().get(IAntEditorColorConstants.STRING_COLOR)));
-    }
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.java
deleted file mode 100644
index b1574fd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntEditorTextMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.editor.text.AntEditorTextMessages";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-	
-	private AntEditorTextMessages() {
-	
-	}
-	
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.properties
deleted file mode 100644
index e4abbc2..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorTextMessages.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-XMLTextHover.4=Path Elements:
-XMLTextHover.5=Includes: 
-XMLTextHover.6=Excludes: 
-XMLTextHover.7=Press F2 for focus

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorWhitespaceDetector.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntEditorWhitespaceDetector.java
deleted file mode 100644
index 4cba648..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/text/AntStorageDocumentProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntStorageDocumentProvider.java
deleted file mode 100644
index 949ceec..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/AntStorageDocumentProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**********************************************************************
- Copyright (c) 2000, 2004 IBM Corp. and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Common Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/cpl-v10.html
-
- Contributors:
- IBM Corporation - Initial implementation
- **********************************************************************/
-package org.eclipse.ant.internal.ui.editor.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.ui.editors.text.StorageDocumentProvider;
-
-/**
- * @since 3.0
- */
-public class AntStorageDocumentProvider extends StorageDocumentProvider {
-	
-	/*
-	 * @see org.eclipse.ui.editors.text.StorageDocumentProvider#setupDocument(java.lang.Object,
-	 *      org.eclipse.jface.text.IDocument)
-	 */
-	protected void setupDocument(Object element, IDocument document) {
-		if (document != null) {
-			IDocumentPartitioner partitioner = createDocumentPartitioner();
-			document.setDocumentPartitioner(partitioner);
-			partitioner.connect(document);
-		}
-	}
-	
-	private IDocumentPartitioner createDocumentPartitioner() {
-		return new DefaultPartitioner(
-				new AntEditorPartitionScanner(), new String[]{
-						AntEditorPartitionScanner.XML_TAG,
-						AntEditorPartitionScanner.XML_COMMENT});
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/FileScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/FileScanner.java
deleted file mode 100644
index 3fa44d4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/FileScanner.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-import org.apache.tools.ant.DirectoryScanner;
-
-
-public class FileScanner extends DirectoryScanner {
-	
-	public String[] getExcludesPatterns() {
-		return excludes;
-	}
-	
-	public String[] getIncludePatterns() {
-		return includes;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IAntEditorColorConstants.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IAntEditorColorConstants.java
deleted file mode 100644
index d49055c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IAntEditorColorConstants.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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.internal.ui.editor.text;
-
-/**
- * The color constants used by the Ant Editor.
- */
-public interface IAntEditorColorConstants {
-	
-	/**
-	 * The symbolic names for colors used for the various text tokens in the Ant editor
-	 * @see org.eclipse.jface.resource.ColorRegistry
-	 */
-	public static final String XML_COMMENT_COLOR = "org.eclipse.ant.ui.commentsColor"; //$NON-NLS-1$
-	public static final String PROCESSING_INSTRUCTIONS_COLOR = "org.eclipse.ant.ui.processingInstructionsColor"; //$NON-NLS-1$
-	public static final String STRING_COLOR = "org.eclipse.ant.ui.constantStringsColor"; //$NON-NLS-1$
-	public static final String TEXT_COLOR = "org.eclipse.ant.ui.textColor"; //$NON-NLS-1$
-	public static final String TAG_COLOR = "org.eclipse.ant.ui.tagsColor"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IReconcilingParticipant.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IReconcilingParticipant.java
deleted file mode 100644
index 4c8a8ff..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/text/IXMLAnnotation.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IXMLAnnotation.java
deleted file mode 100644
index 58aa980..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/IXMLAnnotation.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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 {
-	public static final String ERROR_ANNOTATION_TYPE= "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$
-	public static final String WARNING_ANNOTATION_TYPE= "org.eclipse.ui.workbench.texteditor.warning"; //$NON-NLS-1$
-	public static final String INFO_ANNOTATION_TYPE= "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
-	
-	/**
-	 * Returns the type of this annotation.
-	 *
-	 * @return the type of the annotation or <code>null</code> if it has none.
-	 */
-	public String getType();
-	
-	/**
-	 * Returns whether this annotation is temporary rather than persistent.
-	 * 
-	 * @return <code>true</code> if temporary <code>false</code> otherwise
-	 */
-	public boolean isTemporary();
-	
-	/**
-	 * Returns the message assocaited with this annotation.
-	 * 
-	 * @return the message for this annotation
-	 */
-	public String getMessage();
-	
-	/**
-	 * Returns an image for this annotation.
-	 * 
-	 * @param display the display for which the image is requested
-	 * @return the image for this annotation
-	 */
-	public 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()
-	 */
-	public boolean isRelevant();
-	
-	/**
-	 * Returns whether this annotation is overlaid.
-	 * 
-	 * @return <code>true</code> if overlaid
-	 */
-	public boolean hasOverlay();
-	
-	/**
-	 * Returns an iterator for iterating over the
- 	 * annotation which are overlaid by this annotation.
-	 * 
-	 * @return an iterator over the overlaid annotaions
-	 */
-	public Iterator getOverlaidIterator();
-	
-	/**
-	 * Adds the given annotation to the list of
-	 * annotations which overlaid by this annotations.
-	 *  
-	 * @param annotation	the problem annoation
-	 */
-	public void addOverlaid(IXMLAnnotation annotation);
-	
-	/**
-	 * Removes the given annotation from the list of
-	 * annotations which are overlaid by this annotation.
-	 *  
-	 * @param annotation	the problem annoation
-	 */
-	public void removeOverlaid(IXMLAnnotation annotation);
-	
-	/**
-	 * Tells whether this annotation is a problem
-	 * annotation.
-	 * 
-	 * @return <code>true</code> if it is a problem annotation
-	 */
-	public boolean isProblem();
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/MultilineDamagerRepairer.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/MultilineDamagerRepairer.java
deleted file mode 100644
index 4d71823..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/MultilineDamagerRepairer.java
+++ /dev/null

@@ -1,176 +0,0 @@
-package org.eclipse.ant.internal.ui.editor.text;
-
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.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.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.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.text.rules.IToken;
-import org.eclipse.jface.text.rules.ITokenScanner;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.swt.custom.StyleRange;
-
-
-/**
- * Derived from org.eclipse.jface.text.rules.DefaultDamagerRepairer.
- * Considers multilines as damage regions even if the document partitioning has not changed.
- *
- * @see org.eclipse.jface.text.rules.DefaultDamagerRepairer
- */
-public class MultilineDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
-
-	
-	/** The document this object works on */
-	protected IDocument fDocument;
-	/** The scanner it uses */
-	protected ITokenScanner fScanner;
-	/** The default text attribute if non is returned as data by the current token */
-	protected TextAttribute fDefaultTextAttribute;
-	
-	/**
-	 * Creates a damager/repairer that uses the given scanner and returns the given default 
-	 * text attribute if the current token does not carry a text attribute.
-	 *
-	 * @param scanner the token scanner to be used
-	 * @param defaultTextAttribute the text attribute to be returned if none is specified by the current token,
-	 * 			may be <code>null</code>
-	 */
-	public MultilineDamagerRepairer(ITokenScanner scanner, TextAttribute defaultTextAttribute) {
-		fScanner= scanner;
-		fDefaultTextAttribute= defaultTextAttribute;
-	}
-	
-	/*
-	 * @see IPresentationDamager#setDocument(IDocument)
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument= document;
-	}
-	
-	//---- IPresentationDamager
-	
-	/**
-	 * 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
-	 */
-	protected 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 e, boolean documentPartitioningChanged) {	
-		return partition;
-	}
-	
-	//---- IPresentationRepairer
-	
-	/*
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
-		
-		if (fScanner == null) {
-			addRange(presentation, region.getOffset(), region.getLength(), fDefaultTextAttribute);
-			return;
-		}
-		
-		int lastStart= region.getOffset();
-		int length= 0;
-		IToken lastToken= Token.UNDEFINED;
-		TextAttribute lastAttribute= getTokenTextAttribute(lastToken);
-		
-		fScanner.setRange(fDocument, lastStart, region.getLength());
-		
-		while (true) {
-			IToken token= fScanner.nextToken();			
-			if (token.isEOF())
-				break;
-			
-			TextAttribute attribute= getTokenTextAttribute(token);			
-			if (lastAttribute != null && lastAttribute.equals(attribute)) {
-				length += fScanner.getTokenLength();
-			} else {
-				addRange(presentation, lastStart, length, lastAttribute);
-				lastToken= token;
-				lastAttribute= attribute;
-				lastStart= fScanner.getTokenOffset();
-				length= fScanner.getTokenLength();						    
-			}
-		}
-
-		addRange(presentation, lastStart, length, lastAttribute);
-	}
-	
-	/**
-	 * Returns a text attribute encoded in the given token. If the token's
-	 * data is not <code>null</code> and a text attribute it is assumed that
-	 * it is the encoded text attribute. It returns the default text attribute
-	 * if there is no encoded text attribute found.
-	 *
-	 * @param token the token whose text attribute is to be determined
-	 * @return the token's text attribute
-	 */
-	protected TextAttribute getTokenTextAttribute(IToken token) {
-		Object data= token.getData();
-		if (data instanceof TextAttribute) {
-			return (TextAttribute) data;
-		}
-		return 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
-	 */
-	protected 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) {
-		fDefaultTextAttribute= defaultTextAttribute;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/NotifyingReconciler.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/NotifyingReconciler.java
deleted file mode 100644
index cbcdeec..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/NotifyingReconciler.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.internal.ui.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();
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.AbstractReconciler#initialProcess()
-	 */
-	protected void initialProcess() {
-		super.initialProcess();
-		notifyReconcilingParticipants();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/PartiallySynchronizedDocument.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/PartiallySynchronizedDocument.java
deleted file mode 100644
index 5f2c5e8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/PartiallySynchronizedDocument.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.ISynchronizable;
-
-/**
- * Document that can also be used by a background reconciler.
- */
-public class PartiallySynchronizedDocument extends Document implements ISynchronizable {
-    
-    private final Object fInternalLockObject= new Object();
-    private Object fLockObject;
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentExtension#startSequentialRewrite(boolean)
-	 */
-	synchronized public void startSequentialRewrite(boolean normalized) {
-		super.startSequentialRewrite(normalized);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentExtension#stopSequentialRewrite()
-	 */
-	synchronized public void stopSequentialRewrite() {
-		super.stopSequentialRewrite();
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocument#get()
-	 */
-	synchronized public String get() {
-		return super.get();
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocument#get(int, int)
-	 */
-	synchronized public String get(int offset, int length) throws BadLocationException {
-		return super.get(offset, length);
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocument#getChar(int)
-	 */
-	synchronized public char getChar(int offset) throws BadLocationException {
-		return super.getChar(offset);
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocument#replace(int, int, java.lang.String)
-	 */
-	synchronized public void replace(int offset, int length, String text) throws BadLocationException {
-		super.replace(offset, length, text);
-		//TODO to be used for incremental parsing...not for 3.0
-//		if (length == 0 && text != null) {
-//			// Insert
-//		} else if (text == null || text.length() == 0) {
-//			// Remove
-//		} else {
-//			fAntModel.setReplaceHasOccurred();
-//		}
-	}
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocument#set(java.lang.String)
-	 */
-	synchronized public void set(String text) {
-		super.set(text);
-	}
-	
-	/*
-     * @see org.eclipse.jface.text.ISynchronizable#setLockObject(java.lang.Object)
-     */
-    public void setLockObject(Object lockObject) {
-        fLockObject= lockObject;
-    }
-
-    /*
-     * @see org.eclipse.jface.text.ISynchronizable#getLockObject()
-     */
-    public Object getLockObject() {
-        return fLockObject == null ? fInternalLockObject : fLockObject;
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/TagRule.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/TagRule.java
deleted file mode 100644
index 2a22c88..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/TagRule.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *     John-Mason P. Shackelford - bug 51215
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.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.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-
-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);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.text.rules.PatternRule#endSequenceDetected(org.eclipse.jface.text.rules.ICharacterScanner)
-     */
-    protected boolean endSequenceDetected(ICharacterScanner scanner) {
-        int c;
-        char[][] delimiters = scanner.getLegalLineDelimiters();
-        boolean previousWasEscapeCharacter = false;
-        while ((c = scanner.read()) != ICharacterScanner.EOF) {
-            if (c == fEscapeCharacter) {
-                // Skip the escaped character.
-                scanner.read();
-            } else if (fEndSequence.length > 0 && c == fEndSequence[0]) {
-                // Check if the specified end sequence has been found.
-                if (sequenceDetected(scanner, fEndSequence, true)) {
-                    if (fEndSequence[0] == '>') {
-                        return endOfTagDetected(scanner);
-                    } 
-                    return true;
-                }
-            } else if (fBreaksOnEOL) {
-                // Check for end of line since it can be used to terminate the
-                // pattern.
-                for (int i = 0; i < delimiters.length; i++) {
-                    if (c == delimiters[i][0]
-                            && sequenceDetected(scanner, delimiters[i], true)) {
-                        if (!fEscapeContinuesLine
-                                || !previousWasEscapeCharacter) return true;
-                    }
-                }
-            }
-            previousWasEscapeCharacter = (c == fEscapeCharacter);
-        }
-        if (fBreaksOnEOF) return true;
-        scanner.unread();
-        return false;
-    }
-
-    private boolean endOfTagDetected(ICharacterScanner scanner) {
-        int c;
-        int scanAhead = 0;
-        int endOfTagOffset = 0;
-        while ((c = scanner.read()) != ICharacterScanner.EOF && c != '<') {
-            scanAhead++;
-            if (c == '>') endOfTagOffset = scanAhead;
-        }
-
-        if (c == '<') {
-            int rewind = (scanAhead - endOfTagOffset) + 1;
-            for (int i = 0; i < rewind; i++) {
-                scanner.unread();
-            }
-        }
-        return true;
-    }    
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLAnnotationHover.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLAnnotationHover.java
deleted file mode 100644
index 381e429..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLAnnotationHover.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.internal.ui.editor.AntEditorMessages;
-import org.eclipse.ant.internal.ui.editor.derived.HTMLPrinter;
-
-
-/**
- * Determines all markers for the given line and collects, concatenates, and formulates
- * their messages.
- */
-public class XMLAnnotationHover implements IAnnotationHover {
-	
-	/**
-	 * Returns the distance to the ruler line. 
-	 */
-	private 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;
-	}
-	
-	/**
-	 * Returns one marker which includes the ruler's line of activity.
-	 */
-	private List getXMLAnnotationsForLine(ISourceViewer viewer, int line) {
-		
-		IDocument document= viewer.getDocument();
-		IAnnotationModel model= viewer.getAnnotationModel();
-		
-		if (model == null)
-			return null;
-			
-		List exact= new ArrayList();
-		
-		Iterator e= model.getAnnotationIterator();
-		Map 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;
-					}
-				}
-			}
-		}
-		
-		return exact;
-	}
-
-	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;
-				}
-				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;
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.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/internal/ui/editor/text/XMLAnnotationIterator.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLAnnotationIterator.java
deleted file mode 100644
index 825ea0d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/editor/text/XMLMarkerAnnotation.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLMarkerAnnotation.java
deleted file mode 100644
index 83c62bc..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLMarkerAnnotation.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.text.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-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 int fImageType;
-	
-	public XMLMarkerAnnotation(String annotationType, IMarker marker) {
-		super(annotationType, marker);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.MarkerAnnotation#initialize()
-	 */
-	protected void initialize() {
-		fImageType= NO_IMAGE;
-		
-		super.initialize();
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationExtension#getMessage()
-	 */
-	public String getMessage() {
-		IMarker marker= getMarker();
-		if (marker == null || !marker.exists()) {
-			return ""; //$NON-NLS-1$
-		}
-		
-		return marker.getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationExtension#isTemporary()
-	 */
-	public boolean isTemporary() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#isProblem()
-	 */
-	public boolean isProblem() {
-		return WARNING_ANNOTATION_TYPE.equals(getType()) || ERROR_ANNOTATION_TYPE.equals(getType());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#isRelevant()
-	 */
-	public boolean isRelevant() {
-		return !fNotRelevant;
-	}
-
-	/**
-	 * Overlays this annotation with the given xmlAnnotation.
-	 * 
-	 * @param xmlAnnotation 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);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#hasOverlay()
-	 */
-	public boolean hasOverlay() {
-		return fOverlay != null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.MarkerAnnotation#getImage(org.eclipse.swt.widgets.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;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#addOverlaid(org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation)
-	 */
-	public void addOverlaid(IXMLAnnotation annotation) {
-		// not supported
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#removeOverlaid(org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation)
-	 */
-	public void removeOverlaid(IXMLAnnotation annotation) {
-		// not supported
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#getOverlaidIterator()
-	 */
-	public Iterator getOverlaidIterator() {
-		// not supported
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLProblemAnnotation.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLProblemAnnotation.java
deleted file mode 100644
index 8c1ec2d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLProblemAnnotation.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.outline.IProblem;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Annotation representating an <code>IProblem</code>.
- */
-public class XMLProblemAnnotation extends Annotation implements IXMLAnnotation {
-	
-	private List fOverlaids;
-	private IProblem fProblem;
-	
-	public XMLProblemAnnotation(IProblem problem) {
-		
-		fProblem= problem;
-		
-		if (fProblem.isError()) {
-			setType(ERROR_ANNOTATION_TYPE);
-		} else if (fProblem.isWarning()) {
-			setType(WARNING_ANNOTATION_TYPE);
-		} else {
-			setType(INFO_ANNOTATION_TYPE);
-		}	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#getImage(org.eclipse.swt.widgets.Display)
-	 */
-	public Image getImage(Display display) {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#getMessage()
-	 */
-	public String getMessage() {
-		return fProblem.getMessage();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#isTemporary()
-	 */
-	public boolean isTemporary() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#isProblem()
-	 */
-	public boolean isProblem() {
-		return WARNING_ANNOTATION_TYPE.equals(getType()) || ERROR_ANNOTATION_TYPE.equals(getType());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#isRelevant()
-	 */
-	public boolean isRelevant() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#hasOverlay()
-	 */
-	public boolean hasOverlay() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#addOverlaid(org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation)
-	 */
-	public void addOverlaid(IXMLAnnotation annotation) {
-		if (fOverlaids == null) {
-			fOverlaids= new ArrayList(1);
-		}
-		fOverlaids.add(annotation);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#removeOverlaid(org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation)
-	 */
-	public void removeOverlaid(IXMLAnnotation annotation) {
-		if (fOverlaids != null) {
-			fOverlaids.remove(annotation);
-			if (fOverlaids.size() == 0) {
-				fOverlaids= null;
-			}
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.editor.text.IXMLAnnotation#getOverlaidIterator()
-	 */
-	public Iterator getOverlaidIterator() {
-		if (fOverlaids != null) {
-			return fOverlaids.iterator();
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLReconcilingStrategy.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLReconcilingStrategy.java
deleted file mode 100644
index 8c1c9fe..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLReconcilingStrategy.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-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.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-
-public class XMLReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
-
-	/**
-	 * How long the reconciler will wait for further text changes before reconciling
-	 */
-	public static final int DELAY= 500;
-	
-	private ITextEditor fEditor;
-
-	public XMLReconcilingStrategy(ITextEditor editor) {
-		fEditor= editor;
-	}
-	
-	private void internalReconcile(DirtyRegion dirtyRegion) {
-		try {
-			IDocumentProvider provider= fEditor.getDocumentProvider();
-			if (provider instanceof AntEditorDocumentProvider) {
-				AntEditorDocumentProvider documentProvider= (AntEditorDocumentProvider) provider;
-				AntModel model= documentProvider.getAntModel(fEditor.getEditorInput());
-				if (model != null) {
-					model.reconcile(dirtyRegion);
-				}
-			} 
-		} catch (Exception e) {
-			AntUIPlugin.log(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion)
-	 */
-	public void reconcile(IRegion partition) {
-		internalReconcile(null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion)
-	 */
-	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
-		internalReconcile(dirtyRegion);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument)
-	 */
-	public void setDocument(IDocument document) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile()
-	 */
-	public void initialReconcile() {
-		internalReconcile(null);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java
deleted file mode 100644
index 979ec15..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java
+++ /dev/null

@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.text;
-
-import java.util.Iterator;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.AbstractFileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PatternSet;
-import org.eclipse.ant.internal.ui.editor.AntEditor;
-import org.eclipse.ant.internal.ui.editor.derived.HTMLPrinter;
-import org.eclipse.ant.internal.ui.editor.derived.HTMLTextPresenter;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntPropertyNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.text.BadLocationException;
-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.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextHoverExtension;
-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.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class XMLTextHover implements ITextHover, ITextHoverExtension {
-
-	private AntEditor fEditor;
-	
-	public XMLTextHover(AntEditor editor) {
-		super();
-		fEditor = editor;
-	}
-	
-	/*
-	 * 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();
-	}
-	
-	/*
-	 * Formats a message as HTML text.
-	 */
-	private String formatPathMessage(String[] list) {
-		StringBuffer buffer= new StringBuffer();
-		HTMLPrinter.addPageProlog(buffer);
-		HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.getString("XMLTextHover.4")); //$NON-NLS-1$
-		HTMLPrinter.startBulletList(buffer);
-		for (int i = 0; i < list.length; i++) {
-			HTMLPrinter.addBullet(buffer, list[i]);
-		}
-		HTMLPrinter.endBulletList(buffer);
-		HTMLPrinter.addPageEpilog(buffer);
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.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);
-				}
-			}
-		}
-		AntModel antModel= fEditor.getAntModel();
-		if (antModel == null) { //the ant model has not been created yet
-			return null;
-		}
-		try {
-			IDocument document= textViewer.getDocument();
-			int offset= hoverRegion.getOffset();
-			int length= hoverRegion.getLength();
-			String text= document.get(offset, length);
-			String value;
-			AntElementNode node= antModel.getNode(offset, false);
-			if (document.get(offset - 2, 2).equals("${") || node instanceof AntPropertyNode) { //$NON-NLS-1$
-				value= antModel.getPropertyValue(text);
-				if (value != null) {
-					return formatMessage(value);
-				}
-			}
-			value= antModel.getTargetDescription(text);
-			if (value != null) {
-				return formatMessage(value);
-			}
-			Object referencedObject= antModel.getReferenceObject(text);
-			if (referencedObject != null) {
-				if (referencedObject instanceof Path) {
-					return formatPathMessage(((Path)referencedObject).list());
-				} else if (referencedObject instanceof PatternSet) {
-					return formatPatternSetMessage((PatternSet) referencedObject);
-				} else if (referencedObject instanceof AbstractFileSet) {
-					return formatFileSetMessage((AbstractFileSet)referencedObject);
-				}
-			}
-		} catch (BadLocationException e) {
-			
-		} catch (BuildException be) {
-			antModel.handleBuildException(be, null);
-		}
-		return null;
-	}
-	
-	private String formatFileSetMessage(AbstractFileSet set) {
-		FileScanner fileScanner= new FileScanner();
-		AntModel antModel= fEditor.getAntModel();
-		Project project= antModel.getProjectNode().getProject();
-		set.setupDirectoryScanner(fileScanner, project);
-		String[] excludedPatterns= fileScanner.getExcludesPatterns();
-		String[] includesPatterns= fileScanner.getIncludePatterns();
-		return formatSetMessage(includesPatterns, excludedPatterns);
-	}
-
-	private String formatPatternSetMessage(PatternSet set) {
-		AntModel antModel= fEditor.getAntModel();
-		Project project= antModel.getProjectNode().getProject();
-		String[] includes= set.getIncludePatterns(project);
-		String[] excludes= set.getExcludePatterns(project);
-		return formatSetMessage(includes, excludes);
-	}
-
-	private String formatSetMessage(String[] includes, String[] excludes) {
-		StringBuffer buffer= new StringBuffer();
-		HTMLPrinter.addPageProlog(buffer);
-		if (includes != null && includes.length > 0) {
-			HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.getString("XMLTextHover.5")); //$NON-NLS-1$
-			for (int i = 0; i < includes.length; i++) {
-				HTMLPrinter.addBullet(buffer, includes[i]);
-			}
-		}
-		HTMLPrinter.addParagraph(buffer, ""); //$NON-NLS-1$
-		HTMLPrinter.addParagraph(buffer, ""); //$NON-NLS-1$
-		if (excludes != null && excludes.length > 0) {
-			HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.getString("XMLTextHover.6")); //$NON-NLS-1$
-			for (int i = 0; i < excludes.length; i++) {
-				HTMLPrinter.addBullet(buffer, excludes[i]);
-			}
-		}
-		HTMLPrinter.addPageEpilog(buffer);
-		return buffer.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		if (textViewer != null) {
-			return getRegion(textViewer, offset);
-		}
-		return null;	
-	}
-
-	public static IRegion getRegion(ITextViewer textViewer, int offset) {
-		IDocument document= textViewer.getDocument();
-		
-		int start= -1;
-		int end= -1;
-		
-		try {	
-			int pos= offset;
-			char c;
-			
-			while (pos >= 0) {
-				c= document.getChar(pos);
-				if (c != '.' && c != '-' && c != '/' &&  c != '\\' && !Character.isJavaIdentifierPart(c))
-					break;
-				--pos;
-			}
-			
-			start= pos;
-			
-			pos= offset;
-			int length= document.getLength();
-			
-			while (pos < length) {
-				c= document.getChar(pos);
-				if (c != '.' && c != '-' && !Character.isJavaIdentifierPart(c))
-					break;
-				++pos;
-			}
-			
-			end= pos;
-			
-		} catch (BadLocationException x) {
-		}
-		
-		if (start > -1 && end > -1) {
-			if (start == offset && end == offset)
-				return new Region(offset, 0);
-			else if (start == offset)
-				return new Region(start, end - start);
-			else
-				return new Region(start + 1, end - start - 1);
-		}
-		
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
-	 */
-	public IInformationControlCreator getHoverControlCreator() {
-		if (PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE)) {
-			return new IInformationControlCreator() {
-				public IInformationControl createInformationControl(Shell parent) {
-	  				return new DefaultInformationControl(parent, SWT.NONE, 
-	  					new HTMLTextPresenter(true),
-				   		AntEditorTextMessages.getString("XMLTextHover.7")); //$NON-NLS-1$
-			 	}
-  			};
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java
deleted file mode 100644
index 6e07254..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelper.java
+++ /dev/null

@@ -1,631 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * Portions Copyright  2000-2004 The Apache Software Foundation
- * All rights reserved.  This program and the accompanying materials are made 
- * available under the terms of the Apache Software License v2.0 which 
- * accompanies this distribution and is available at 
- * http://www.apache.org/licenses/LICENSE-2.0.
- * 
- * Contributors:
- *     IBM Corporation - derived implementation
- *******************************************************************************/
-
-package org.eclipse.ant.internal.ui.editor.utils;
-  
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.RuntimeConfigurable;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.UnknownElement;
-import org.apache.tools.ant.helper.AntXMLContext;
-import org.apache.tools.ant.helper.ProjectHelper2;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.JAXPUtils;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.jface.text.BadLocationException;
-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.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
-
-/**
- * Derived from the original Ant ProjectHelper2 with help from the JAXPUtils class.
- * This class provides parsing for using a String as a source and provides
- * handlers that will continue parsing to completion upon hitting errors.
- */
-public class ProjectHelper extends ProjectHelper2 {
-
-	/**
-	 * helper for path -> URI and URI -> path conversions.
-	 */
-	private static FileUtils fu= null;
-	
-	/**
-	 * The buildfile that is to be parsed. Must be set if parsing is to
-	 * be successful.
-	 */
-	private File buildFile= null;
-	
-	private static String currentEntityName= null;
-	
-	private static int currentImportStackSize= 1;
-	
-	/**
-	 * The Ant Model
-	 */
-	private static AntModel fgAntModel;
-
-	private static AntHandler elementHandler= new ElementHandler();
-	private static AntHandler projectHandler= new ProjectHandler();
-	private static AntHandler targetHandler= new TargetHandler();
-	private static AntHandler mainHandler= new MainHandler();
-	private static LexicalHandler lexicalHandler= new LexHandler();
-	
-	public static class ElementHandler extends ProjectHelper2.ElementHandler {
-		
-		private UnknownElement task= null;
-		private Task currentTask= null;
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartChild(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public AntHandler onStartChild(String uri, String tag, String qname, Attributes attrs, AntXMLContext context) {
-			return ProjectHelper.elementHandler;
-		}
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void onStartElement(String uri, String tag, String qname, Attributes attrs, AntXMLContext context) {
-			try {
-				RuntimeConfigurable wrapper= context.currentWrapper();
-				currentTask= null;
-				task= null;
-				if (wrapper != null) {
-					currentTask= (Task)wrapper.getProxy();
-				}
-				onStartElement0(uri, tag, qname, attrs, context);
-				
-				Locator locator= context.getLocator();
-				getAntModel().addTask(task, currentTask, attrs, locator.getLineNumber(), locator.getColumnNumber());
-				
-			} catch (BuildException be) {
-				Locator locator= context.getLocator();
-				getAntModel().addTask(task, currentTask, attrs, locator.getLineNumber(), locator.getColumnNumber());
-				getAntModel().error(be);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onEndElement(java.lang.String, java.lang.String, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void onEndElement(String uri, String tag, AntXMLContext context) {
-			super.onEndElement(uri, tag, context);
-			
-			Locator locator= context.getLocator();
-			getAntModel().setCurrentElementLength(locator.getLineNumber(), locator.getColumnNumber());
-		}
-		
-		private void onStartElement0(String uri, String tag, String qname, Attributes attrs, AntXMLContext context) {
-			
-			RuntimeConfigurable parentWrapper = context.currentWrapper();
-            Object parent = null;
-
-            if (parentWrapper != null) {
-                parent = parentWrapper.getProxy();
-            }
-
-            /* UnknownElement is used for tasks and data types - with
-               delayed eval */
-            task = new UnknownElement(tag);
-            task.setProject(context.getProject());
-            task.setNamespace(uri);
-            task.setQName(qname);
-            task.setTaskType(org.apache.tools.ant.ProjectHelper.genComponentName(task.getNamespace(), tag));
-            task.setTaskName(qname);
-
-            Location location = new Location(context.getLocator().getSystemId(),
-                    context.getLocator().getLineNumber(),
-                    context.getLocator().getColumnNumber());
-            task.setLocation(location);
-            task.setOwningTarget(context.getCurrentTarget());
-
-            context.configureId(task, attrs);
-
-            if (parent != null) {
-                // Nested element
-                ((UnknownElement) parent).addChild(task);
-            }  else {
-                // Task included in a target ( including the default one ).
-                context.getCurrentTarget().addTask(task);
-            }
-
-            // container.addTask(task);
-            // This is a nop in UE: task.init();
-
-            RuntimeConfigurable wrapper
-                = new RuntimeConfigurable(task, task.getTaskName());
-
-            for (int i = 0; i < attrs.getLength(); i++) {
-                String attrUri = attrs.getURI(i);
-                if (attrUri != null
-                    && !attrUri.equals("") //$NON-NLS-1$
-                    && !attrUri.equals(uri)) {
-                    continue; // Ignore attributes from unknown uris
-                }
-                String name = attrs.getLocalName(i);
-                String value = attrs.getValue(i);
-                // PR: Hack for ant-type value
-                //  an ant-type is a component name which can
-                // be namespaced, need to extract the name
-                // and convert from qualified name to uri/name
-                if (name.equals("ant-type")) { //$NON-NLS-1$
-                    int index = value.indexOf(':');
-                    if (index != -1) {
-                        String prefix = value.substring(0, index);
-                        String mappedUri = context.getPrefixMapping(prefix);
-                        if (mappedUri == null) {
-                            throw new BuildException(
-                                "Unable to find XML NS prefix " + prefix); //$NON-NLS-1$
-                        }
-                        value = org.apache.tools.ant.ProjectHelper.genComponentName(mappedUri, value.substring(index + 1));
-                    }
-                }
-                wrapper.setAttribute(name, value);
-            }
-
-            if (parentWrapper != null) {
-                parentWrapper.addChild(wrapper);
-            }
-
-            context.pushWrapper(wrapper);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#characters(char[], int, int, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void characters(char[] buf, int start, int count, AntXMLContext context) {
-			try {
-				super.characters(buf, start, count, context);
-			} catch (SAXParseException e) {
-				ErrorHelper.handleErrorFromElementText(start, count, context, e);
-			} catch (BuildException be) {
-				ErrorHelper.handleErrorFromElementText(start, count, context, be);
-			}
-		}
-		
-		public void reset() {
-			task= null;
-			currentTask= null;
-		}
-	}
-	
-	public static class MainHandler extends ProjectHelper2.MainHandler {
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartChild(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs, AntXMLContext context) throws SAXParseException {
-			if (name.equals("project") //$NON-NLS-1$
-					&& (uri.equals("") || uri.equals(ANT_CORE_URI))) { //$NON-NLS-1$
-				return ProjectHelper.projectHandler;
-			} 
-			try {
-				return super.onStartChild(uri, name, qname, attrs, context);
-			} catch (SAXParseException e) {
-				getAntModel().error(e);
-				throw e;
-			}
-		}
-	}
-	
-	public static class ProjectHandler extends ProjectHelper2.ProjectHandler {
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartChild(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs, AntXMLContext context) {
-			if (name.equals("target") //$NON-NLS-1$
-					&& (uri.equals("") || uri.equals(ANT_CORE_URI))) { //$NON-NLS-1$
-				return ProjectHelper.targetHandler;
-			} 
-			return ProjectHelper.elementHandler;
-		}
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onEndElement(java.lang.String, java.lang.String, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void onEndElement(String uri, String tag, AntXMLContext context) {
-			super.onEndElement(uri, tag, context);
-			if (currentImportStackSize == 1) {
-				Locator locator= context.getLocator();
-				getAntModel().setCurrentElementLength(locator.getLineNumber(), locator.getColumnNumber());
-			}
-		}
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void onStartElement(String uri, String tag, String qname, Attributes attrs, AntXMLContext context) {
-			try {
-				super.onStartElement(uri, tag, qname, attrs, context);
-				if (currentImportStackSize == 1) {
-					Locator locator= context.getLocator();
-					getAntModel().addProject(context.getProject(), locator.getLineNumber(), locator.getColumnNumber());
-				}
-				
-			} catch (SAXParseException e) {
-				getAntModel().error(e);
-			} catch (BuildException be) {
-				getAntModel().error(be);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#characters(char[], int, int, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void characters(char[] buf, int start, int count, AntXMLContext context) {
-			try {
-				super.characters(buf, start, count, context);
-			} catch (SAXParseException e) {
-				ErrorHelper.handleErrorFromElementText(start, count, context, e);
-			} catch (BuildException be) {
-				ErrorHelper.handleErrorFromElementText(start, count, context, be);
-			}
-		}
-	}
-	
-	public static class TargetHandler extends ProjectHelper2.TargetHandler {
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartChild(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs, AntXMLContext context) {
-			return ProjectHelper.elementHandler;
-		}
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onStartElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void onStartElement(String uri, String tag, String qname, Attributes attrs, AntXMLContext context) {
-			try {
-				super.onStartElement(uri, tag, qname, attrs, context);
-				Target newTarget= context.getCurrentTarget();
-				Locator locator= context.getLocator();
-				getAntModel().addTarget(newTarget, locator.getLineNumber(), locator.getColumnNumber());
-			} catch (SAXParseException e) {
-				handleErrorInTarget(context, e);
-			} catch (BuildException be) {
-				handleErrorInTarget(context, be);
-			}
-		}
-		
-		private void handleErrorInTarget(AntXMLContext context, Exception e) {
-			Target newTarget= context.getCurrentTarget();
-			Locator locator= context.getLocator();
-			getAntModel().addTarget(newTarget, locator.getLineNumber(), locator.getColumnNumber());
-			getAntModel().errorFromElement(e, null, locator.getLineNumber(), locator.getColumnNumber());
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#onEndElement(java.lang.String, java.lang.String, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void onEndElement(String uri, String tag, AntXMLContext context) {
-			super.onEndElement(uri, tag, context);
-			Locator locator= context.getLocator();
-			getAntModel().setCurrentElementLength(locator.getLineNumber(), locator.getColumnNumber());
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler#characters(char[], int, int, org.apache.tools.ant.helper.AntXMLContext)
-		 */
-		public void characters(char[] buf, int start, int count, AntXMLContext context) {
-			try {
-				super.characters(buf, start, count, context);
-			} catch (SAXParseException e) {
-				ErrorHelper.handleErrorFromElementText(start, count, context, e);
-			} catch (BuildException be) {
-				ErrorHelper.handleErrorFromElementText(start, count, context, be);
-			}
-		}
-	}
-	
-	 public static class RootHandler extends ProjectHelper2.RootHandler {
-
-		public RootHandler(AntXMLContext context, AntHandler rootHandler) {
-			super(context, rootHandler);
-		}
-	
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-		 */
-		public void error(SAXParseException e) {
-			getAntModel().error(e);
-		}
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-		 */
-		public void fatalError(SAXParseException e) {
-			getAntModel().fatalError(e);
-		}
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-		 */
-		public void warning(SAXParseException e) {
-			getAntModel().warning(e);
-		}
-		/* (non-Javadoc)
-		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-		 */
-		public InputSource resolveEntity(String publicId, String systemId) {
-			InputSource source= super.resolveEntity(publicId, systemId);
-			if (source != null) {
-				String path = getFileUtils().fromURI(source.getSystemId());
-				getAntModel().addEntity(currentEntityName, path);
-			}
-			return source;
-		}
-	 }
-	 
-	 private static class ErrorHelper {
- 		public static void handleErrorFromElementText(int start, int count, AntXMLContext context, Exception e) {
- 			Locator locator= context.getLocator();
-			int columnNumber= locator.getColumnNumber();
-			if (columnNumber > -1) {
-				int offset= start;
-				try {
-					offset= getAntModel().getOffset(locator.getLineNumber(), 1);
-				} catch (BadLocationException e1) {
-				}
-				getAntModel().errorFromElementText(e, offset, locator.getColumnNumber());
-			} else {
-				getAntModel().errorFromElementText(e, start, count);
-			}
-		}
-	 }
-	 
-	 private static class LexHandler implements LexicalHandler {
-	 	/* (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 {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-		 */
-		public void startCDATA() throws SAXException {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-		 */
-		public void comment(char[] ch, int start, int length) throws SAXException {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-		 */
-		public void endEntity(String name) throws SAXException {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-		 */
-		public void startEntity(String name) throws SAXException {
-			currentEntityName= name;
-		}
-
-		/* (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 {	
-		}
-	 }
-	
-	public ProjectHelper(AntModel model) {
-		setAntModel(model);
-	}
-
-	/**
-     * Parses the project file, configuring the project as it goes.
-     *
-     * @param project the current project
-     * @param source  the xml source
-     * @param handler the root handler to use (contains the current context)
-     * @exception BuildException if the configuration is invalid or cannot
-     *                           be read
-     */
-    public void parse(Project project, Object source, org.apache.tools.ant.helper.ProjectHelper2.RootHandler handler) throws BuildException {
-    	
-    	if (!(source instanceof String)) {
-    		super.parse(project, source, handler);
-    		return;
-    	}
-    	
-    	AntXMLContext context= (AntXMLContext)project.getReference("ant.parsing.context"); //$NON-NLS-1$
-		//switch to using "our" handler so parsing will continue on hitting errors.
-    	handler= new RootHandler(context, mainHandler);
-    	
-        Reader stream= new StringReader((String)source);
-             
-        InputSource inputSource = null;
-        try {
-            /**
-             * SAX 2 style parser used to parse the given file.
-             */
-            
-        	//We cannot use the JAXPUtils support here as the underlying parser factory is cached and 
-        	//will not reflect classpath changes that effect which XML parser will be returned.
-        	//see bug 59764
-        	//XMLReader parser = JAXPUtils.getNamespaceXMLReader();
-        	XMLReader parser= getNamespaceXMLReader();
-        	if (parser == null) {
-        		throw new BuildException(ProjectHelperMessages.getString("ProjectHelper.0")); //$NON-NLS-1$
-        	}
-            String uri = null;
-            if (buildFile != null) {
-                uri = getFileUtils().toURI(buildFile.getAbsolutePath());
-            }
-
-            inputSource = new InputSource(stream);
-            if (uri != null) {
-                inputSource.setSystemId(uri);
-            }
-
-            context.setBuildFile(buildFile);
-            
-            parser.setContentHandler(handler);
-            parser.setEntityResolver(handler);
-            parser.setErrorHandler(handler);
-            parser.setDTDHandler(handler);
-            parser.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler); //$NON-NLS-1$
-            parser.parse(inputSource);
-        } catch (SAXParseException exc) {
-        	getAntModel().error(exc);
-        } catch (SAXException exc) {
-        	//ignore as we will be parsing incomplete source
-        } catch (FileNotFoundException exc) {
-            throw new BuildException(exc);
-        } catch (UnsupportedEncodingException exc) {
-              throw new BuildException(exc);
-        } catch (IOException exc) {
-            throw new BuildException(exc);
-        } finally {
-            if (stream != null) {
-                try {
-                	stream.close();
-                } catch (IOException ioe) {
-                    // ignore this
-                }
-            }
-        }
-    }
-
-	/**
-	 * Sets the buildfile that is about to be parsed or <code>null</code> if
-	 * parsing has completed.
-	 * 
-	 * @param file The buildfile about to be parsed
-	 */
-	public void setBuildFile(File file) {
-		buildFile= file;
-		currentImportStackSize= 1;
-	}
-	
-	/* (non-Javadoc)
-	 * We override this method from ProjectHelper2 as we do not want to execute the implicit target or
-	 * any other target for that matter as it could hang Eclipse.
-	 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=50795 for more details.
-	 * 
-	 * @see org.apache.tools.ant.ProjectHelper#parse(org.apache.tools.ant.Project, java.lang.Object)
-	 */
-	public void parse(Project project, Object source) throws BuildException {
-		AntXMLContext context = (AntXMLContext) project.getReference("ant.parsing.context"); //$NON-NLS-1$
-        if (context == null) {
-        	getImportStack().removeAllElements();
-            context = new AntXMLContext(project);
-            project.addReference("ant.parsing.context", context); //$NON-NLS-1$
-            project.addReference("ant.targets", context.getTargets()); //$NON-NLS-1$
-        }
-        getImportStack().addElement(source);
-		currentImportStackSize= getImportStack().size();
-        if (getImportStack().size() > 1) {
-            // we are in an imported file.
-            context.setIgnoreProjectTag(true);
-            Target currentTarget = context.getCurrentTarget();
-            try {
-                Target newCurrent = new Target();
-                newCurrent.setProject(project);
-                newCurrent.setName(""); //$NON-NLS-1$
-                context.setCurrentTarget(newCurrent);
-                parse(project, source, new RootHandler(context, mainHandler));
-            } finally {
-                context.setCurrentTarget(currentTarget);
-            }
-        } else {
-            // top level file
-            parse(project, source, new RootHandler(context, mainHandler));
-        }
-	}
-
-	public static void setAntModel(AntModel antModel) {
-		fgAntModel= antModel;
-		((ProjectHelper.ElementHandler)elementHandler).reset();
-		fu= null;
-	}
-
-	public static AntModel getAntModel() {
-		return fgAntModel;
-	}
-	
-	private static FileUtils getFileUtils() {
-		if (fu == null) {
-			fu= FileUtils.newFileUtils();
-		}
-		return fu;
-	}
-	
-	 /**
-     * Returns a newly created SAX 2 XMLReader, which is namespace aware
-     *
-     * @return a SAX 2 XMLReader.
-     * @since Ant 1.6 from org.apache.tools.ant.util.JAXPUtils
-     */
-    private XMLReader getNamespaceXMLReader() throws BuildException {
-        try {
-            return newSAXParser(getNSParserFactory()).getXMLReader();
-        } catch (SAXException e) {
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the parser factory to use to create namespace aware parsers.
-     *
-     * @return a SAXParserFactory to use which supports manufacture of
-     * namespace aware parsers
-     *
-     * @since Ant 1.6 from org.apache.tools.ant.util.JAXPUtils
-     */
-    private SAXParserFactory getNSParserFactory() throws BuildException {
-
-    	SAXParserFactory nsParserFactory = JAXPUtils.newParserFactory();
-        nsParserFactory.setNamespaceAware(true);
-        
-        return nsParserFactory;
-    }
-    
-    /**
-     * @return a new SAXParser instance as helper for getParser and
-     * getXMLReader.
-     *
-     * @since Ant 1.5 from org.apache.tools.ant.util.JAXPUtils
-     */
-    private SAXParser newSAXParser(SAXParserFactory factory) {
-        try {
-            return factory.newSAXParser();
-        } catch (ParserConfigurationException e) {
-          
-        } catch (SAXException e) {
-           
-        }
-        return null;
-    }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.java
deleted file mode 100644
index 7809c44..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.editor.utils;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ProjectHelperMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.editor.utils.ProjectHelperMessages";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-	private ProjectHelperMessages() {
-	}
-	public static String getString(String key) {
-		try
-		{
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e)
-		{
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.properties
deleted file mode 100644
index 61c1d27..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/utils/ProjectHelperMessages.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-ProjectHelper.0=XML Parser could not be created

diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/AntSupportMessages.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/AntSupportMessages.java
deleted file mode 100644
index 53d65f9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/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.internal.ui.antsupport;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntSupportMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/antsupport/AntSupportMessages.properties b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/AntSupportMessages.properties
deleted file mode 100644
index f479581..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/AntSupportMessages.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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
-AntInputHandler.5=Unable to respond to input request as a result of the user specified -noinput command
-
-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/internal/ui/antsupport/inputhandler/AntInputHandler.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java
deleted file mode 100644
index 0dd799a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.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.internal.ui.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.ant.internal.ui.antsupport.AntSupportMessages;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * 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.
- * If the build is occurring in Ant 1.6.0 and the -noinput option has been specified
- * this input handler will fail.
- */
-public class AntInputHandler extends DefaultInputHandler {
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.input.InputHandler#handleInput(org.apache.tools.ant.input.InputRequest)
-	 */
-	public void handleInput(InputRequest request) throws BuildException {
-		if (System.getProperty("eclipse.ant.noInput") != null) { //$NON-NLS-1$
-			throw new BuildException(AntSupportMessages.getString("AntInputHandler.5")); //$NON-NLS-1$
-		}
-		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;
-						} 
-						return AntSupportMessages.getString("AntInputHandler.Invalid_input_2"); //$NON-NLS-1$
-					}
-				};
-		
-				InputDialog dialog= new InputDialog(null, title, prompt, "", validator); //$NON-NLS-1$
-				if (dialog.open() != Window.OK) {
-					problem[0]= new BuildException(AntSupportMessages.getString("AntInputHandler.Unable_to_respond_to_<input>_request_4")); //$NON-NLS-1$
-				}
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/AntProcessBuildLogger.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/AntProcessBuildLogger.java
deleted file mode 100644
index 5e9bc4f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/AntProcessBuildLogger.java
+++ /dev/null

@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.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.internal.ui.antsupport.logger;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.eclipse.ant.core.AntSecurityException;
-import org.eclipse.ant.internal.ui.antsupport.AntSupportMessages;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntProcess;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntStreamMonitor;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntStreamsProxy;
-import org.eclipse.ant.internal.ui.launchConfigurations.TaskLinkManager;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-	
-public class AntProcessBuildLogger extends NullBuildLogger {
-	
-	private File fBuildFileParent= null;
-	private long fStartTime;
-
-	/**
-	 * 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;
-		}
-		
-		StringBuffer fullMessage= new StringBuffer(System.getProperty("line.separator")); //$NON-NLS-1$
-		
-		if (event.getException() == null && event.getTask() != null && !fEmacsMode) {
-			adornMessage(event, fullMessage);
-		} else {
-			fullMessage.append(message);
-		}
-		message= fullMessage.toString();
-		
-		AntStreamMonitor monitor = getMonitor(priority);
-		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 the hyperlinks for the task prefix. 
-	 *  
-	 * @param event build event
-	 * @param fullMessage buffer to place task prefix in
-	 */
-	private void adornMessage(BuildEvent event, StringBuffer fullMessage) {
-		String name = event.getTask().getTaskName();
-		if (name == null) {
-			name = "null"; //$NON-NLS-1$
-		}
-		Location location = event.getTask().getLocation();
-		StringBuffer column= new StringBuffer();
-		int size = IAntUIConstants.LEFT_COLUMN_SIZE - (name.length() + 3);
-		for (int i = 0; i < size; i++) {
-			column.append(' ');
-		}
-		StringBuffer labelBuff= new StringBuffer();
-		labelBuff.append('[');
-		labelBuff.append(name);
-		labelBuff.append("] "); //$NON-NLS-1$
-		
-		int offset = Math.max(size, 0) + 1;
-		String label= labelBuff.toString();
-		if (event.getMessage() == null) {
-			return;
-		}
-		try {
-			BufferedReader r = new BufferedReader(new StringReader(event.getMessage()));
-			String line = r.readLine();
-			fullMessage.append(column);
-			appendAndLink(fullMessage, location, label, offset, line);
-			line = r.readLine();
-			while (line != null) {
-				fullMessage.append(System.getProperty("line.separator")); //$NON-NLS-1$
-				fullMessage.append(column);
-				appendAndLink(fullMessage, location, label, offset, line);
-				line = r.readLine();
-			}
-		} catch (IOException e) {
-			if (event.getMessage() != null) {
-				fullMessage.append(label).append(event.getMessage());
-			}
-		}
-	}
-	
-	private void appendAndLink(StringBuffer fullMessage, Location location, String label, int offset, String line) {
-		fullMessage.append(label);
-		fullMessage.append(line);
-		if (location != null) {
-			String newLine= (label + line).trim();
-			IRegion region= new Region(offset, label.length() - 3); // only want the name length "[name] "
-			IConsoleHyperlink link= getTaskLink(location);
-			if (link != null) {
-				TaskLinkManager.addTaskHyperlink(getAntProcess(null), link, region, newLine);
-			}
-		}
-	}
-
-	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(Location location) {
-		if (location != null) {
-			return AntUtil.getTaskLink(location.toString(), fBuildFileParent);
-		}
-		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;
-	}
-
-	/* (non-Javadoc)
-	 * Set the start time.
-	 * 
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-		fStartTime= System.currentTimeMillis();
-	}
-	
-	/* (non-Javadoc)
-	 * @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$
-			}
-			
-			result.append(System.getProperty("line.separator")); //$NON-NLS-1$
-			return result.toString();
-		}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		if (event.getPriority() > getMessageOutputLevel()) {
-			return;
-		}
-		if (event.getMessage() != null && event.getMessage().length() > 0) {
-			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);	
-	}
-
-	/* (non-Javadoc)
-	 * @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);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/NullBuildLogger.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/antsupport/logger/NullBuildLogger.java
deleted file mode 100644
index 971a562..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/internal/ui/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.internal.ui.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.internal.ui.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);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.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/internal/ui/console/AntConsoleColorProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AntConsoleColorProvider.java
deleted file mode 100644
index e37a70e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/AntConsoleColorProvider.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.console;
-
-import org.eclipse.ant.internal.ui.launchConfigurations.AntProcess;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntStreamsProxy;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.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.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.IConsoleConstants;
-
-
-public class AntConsoleColorProvider extends ConsoleColorProvider implements IPropertyChangeListener {
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#getColor(java.lang.String)
-	 */
-	public Color getColor(String streamIdentifer) {
-		if (streamIdentifer.equals(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM)) {
-			return JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_INFO_COLOR);
-		}
-		if (streamIdentifer.equals(IDebugUIConstants.ID_STANDARD_ERROR_STREAM)) {
-			return JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_ERROR_COLOR);
-		}				
-		if (streamIdentifer.equals(AntStreamsProxy.ANT_DEBUG_STREAM)) {
-			return JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_DEBUG_COLOR);
-		}
-		if (streamIdentifer.equals(AntStreamsProxy.ANT_VERBOSE_STREAM)) {
-			return JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_VERBOSE_COLOR);
-		}
-		if (streamIdentifer.equals(AntStreamsProxy.ANT_WARNING_STREAM)) {
-			return JFaceResources.getColorRegistry().get(IAntUIPreferenceConstants.CONSOLE_WARNING_COLOR);
-		}
-		return super.getColor(streamIdentifer);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#connect(org.eclipse.debug.core.model.IProcess, org.eclipse.debug.ui.console.IConsole)
-	 */
-	public void connect(IProcess process, IConsole console) {
-		//Both remote and local Ant builds are guaranteed to have
-		//an AntStreamsProxy. The remote Ant builds make use of the
-		// org.eclipse.debug.core.processFactories extension point
-		AntStreamsProxy proxy = (AntStreamsProxy)process.getStreamsProxy();
-		if (process instanceof AntProcess) {
-			((AntProcess)process).setConsole(console);
-		}
-		if (proxy != null) {
-			console.connect(proxy.getDebugStreamMonitor(), AntStreamsProxy.ANT_DEBUG_STREAM);
-			console.connect(proxy.getWarningStreamMonitor(), AntStreamsProxy.ANT_WARNING_STREAM);
-			console.connect(proxy.getVerboseStreamMonitor(), AntStreamsProxy.ANT_VERBOSE_STREAM);
-		}
-		
-		JFaceResources.getColorRegistry().addListener(this);
-		super.connect(process, console);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#isReadOnly()
-	 */
-	public boolean isReadOnly() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		if (affectsAntConsole(event.getProperty())) {
-			AntUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
-				public void run() {
-					IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ;
-					if (window != null) {
-						IWorkbenchPage page = window.getActivePage();
-						if (page != null) {
-							IWorkbenchPart part = page.findView(IConsoleConstants.ID_CONSOLE_VIEW);
-							if (part != null) {
-								Widget textWidget = (Widget)part.getAdapter(Widget.class);
-								if (textWidget instanceof StyledText) {
-									((StyledText)textWidget).redraw();
-								}
-							}
-						}
-					}
-				}
-			});
-		}
-	}
-
-	private boolean affectsAntConsole(String property) {
-		if (IAntUIPreferenceConstants.CONSOLE_DEBUG_COLOR.equals(property)) {
-			return true;
-		} else if (IAntUIPreferenceConstants.CONSOLE_ERROR_COLOR.equals(property)) {
-			return true;
-		} else if (IAntUIPreferenceConstants.CONSOLE_INFO_COLOR.equals(property)) {
-			return true;
-		} else if (IAntUIPreferenceConstants.CONSOLE_VERBOSE_COLOR.equals(property)) {
-			return true;
-		} else if (IAntUIPreferenceConstants.CONSOLE_WARNING_COLOR.equals(property)) {
-			return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#disconnect()
-	 */
-	public void disconnect() {
-		JFaceResources.getColorRegistry().removeListener(this);
-		super.disconnect();
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/BuildFailedTracker.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/BuildFailedTracker.java
deleted file mode 100644
index 9662849..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/BuildFailedTracker.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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
- */
-public class BuildFailedTracker implements IConsoleLineTracker {
-	
-	private IConsole fConsole;
-	private StringMatcher fErrorMatcher;
-	private StringMatcher fErrorMatcher2;
-	private boolean fBuildFailed= false;
-	
-	/* (non-Javadoc)
-	 * @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: *.xml*", false, false); //$NON-NLS-1$
-		fErrorMatcher2= new StringMatcher("*.xml*", false, false); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @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;
-			int index= -1;
-			if (fErrorMatcher.match(text)) {
-				fBuildFailed= true;
-				index = text.indexOf("file:"); //$NON-NLS-1$
-				if (index > 0) {
-					fileStart = index + 5;
-				} else {
-					fileStart = text.indexOf("BUILD FAILED:") + 14; //$NON-NLS-1$
-					index= fileStart;
-				}
-			} else if (fBuildFailed && fErrorMatcher2.match(text)) {
-				//output resulting from failures which occurred in nested build from using the ant task:
-				//BUILD FAILED: C:\Darins\Debugger\20021213\eclipse\runtime-workspace\Mine\build.xml:4: Following error occured while executing this line
-				//C:\Darins\Debugger\20021213\eclipse\runtime-workspace\Mine\subbuild.xml:4: srcdir attribute must be set!
-				index= 0;
-				fileStart= 0;
-			}
-			if (index > -1) {
-				index = text.indexOf("xml", index); //$NON-NLS-1$
-				if (index > 0) {
-					int numberStart= index + 4;
-					int numberEnd= text.indexOf(':', numberStart);
-					int fileEnd = index + 3;
-					if (numberStart > 0 && fileEnd > 0) {
-						fileName = text.substring(fileStart, fileEnd).trim();
-						if (numberEnd > 0) {
-							lineNumber = text.substring(numberStart, numberEnd).trim();
-						}
-					}
-				}
-			} 
-			if (fileName != null) {
-				int num = -1;
-				try {
-					num = Integer.parseInt(lineNumber);
-				} catch (NumberFormatException e) {
-				}
-				IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(fileName));
-				IFile file= null;
-				if (files.length > 0) {
-					file= files[0];
-				}
-				if (file != null && file.exists()) {
-					FileLink link = new FileLink(file, null, -1, -1, num);
-					fConsole.addLink(link, lineOffset + fileStart, lineLength - fileStart);
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-		fConsole = null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacLineTracker.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacLineTracker.java
deleted file mode 100644
index 944d494..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/JavacLineTracker.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.console;
-
-
-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.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= null;
-				IPath filePath= new Path(fileName);
-				//first check if in the same file...faster
-				if (fLastFile != null && fLastFile.getLocation().equals(filePath)) {
-					file= fLastFile;
-				} else {
-					IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(filePath);
-					if (files.length != 0) {
-						file= files[0];
-					}
-				}
-				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/internal/ui/console/TaskLineTracker.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/TaskLineTracker.java
deleted file mode 100644
index 5ff6826..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/console/TaskLineTracker.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.internal.ui.console;
- 
-import org.eclipse.ant.internal.ui.launchConfigurations.TaskLinkManager;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Processes task hyperlinks as lines are appended to the console
- */
-public class TaskLineTracker implements IConsoleLineTrackerExtension {
-	
-	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() {
-		fConsole = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
-	 */
-	public void consoleClosed() {
-		TaskLinkManager.dispose(fConsole.getProcess());
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileImportWizard.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileImportWizard.java
deleted file mode 100644
index d3c9180..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileImportWizard.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.datatransfer;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class AntBuildfileImportWizard extends Wizard implements IImportWizard {
-
-	private ExternalAntBuildfileImportPage mainPage;
-
-	public AntBuildfileImportWizard() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	* Method declared on IWizard.
-	*/
-	public void addPages() {
-		super.addPages();
-		mainPage = new ExternalAntBuildfileImportPage();
-		addPage(mainPage);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		setWindowTitle(DataTransferMessages.getString("AntBuildfileImportWizard.0")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_IMPORT_WIZARD_BANNER));
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizard#performCancel()
-	 */
-	public boolean performCancel() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		return (mainPage.createProject() != null);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.java
deleted file mode 100644
index 89c72a4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.datatransfer;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class DataTransferMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.datatransfer.DataTransferMessages";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-	
-	private DataTransferMessages() {
-	}
-	
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.properties
deleted file mode 100644
index b3c1a9d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/DataTransferMessages.properties
+++ /dev/null

@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntBuildfileImportWizard.0=Import project from exiting Ant buildfile
-ExternalAntBuildfileImportPage.9=Import a Project from an Ant Buildfile
-ExternalAntBuildfileImportPage.10=Creates a new project based on the specification in the javac task of the Ant buildfile. This does not copy the source contents to the workspace.
-ExternalAntBuildfileImportPage.11=&Ant Buildfile:
-ExternalAntBuildfileImportPage.12=&Project Name:
-ExternalAntBuildfileImportPage.13=B&rowse...
-ExternalAntBuildfileImportPage.14=Ant Project
-ExternalAntBuildfileImportPage.15=No buildfile selected
-ExternalAntBuildfileImportPage.16=Location error
-ExternalAntBuildfileImportPage.17=Specified buildfile could not be parsed successfully
-ExternalAntBuildfileImportPage.18=Project name must be specified
-ExternalAntBuildfileImportPage.19=A project with the specified name already exists
-ExternalAntBuildfileImportPage.20=Currently only supports creating a project from a single javac declaration
-ExternalAntBuildfileImportPage.21=Error occurred creating project
-ExternalAntBuildfileImportPage.22=Error occurred importing buildfile

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ExternalAntBuildfileImportPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ExternalAntBuildfileImportPage.java
deleted file mode 100644
index da1c72d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ExternalAntBuildfileImportPage.java
+++ /dev/null

@@ -1,535 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.datatransfer;
-
-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.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.UnknownElement;
-import org.apache.tools.ant.taskdefs.Javac;
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTargetNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTaskNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.outline.LocationProvider;
-import org.eclipse.ant.internal.ui.editor.outline.XMLCore;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.wizard.WizardPage;
-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.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.internal.ide.IHelpContextIds;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-public class ExternalAntBuildfileImportPage extends WizardPage {
-	
-	private static class ImportOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String file) {
-			return ALL;
-		}	
-	}	
-
-	//private static String previouslyBrowsedDirectory = ""; //$NON-NLS-1$
-
-	private Text projectNameField;
-	private Text locationPathField;
-	private Button browseButton;
-	
-	private AntModel fAntModel;
-
-	private Listener locationModifyListener = new Listener() {
-		public void handleEvent(Event e) {
-			fAntModel= getAntModel(getBuildFile(getProjectLocationFieldValue()));
-			setProjectName();
-			setPageComplete(validatePage());
-		}
-	};
-	
-	private Listener nameModifyListener = new Listener() {
-		public void handleEvent(Event e) {
-			setPageComplete(validatePage());
-		}
-	};
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	
-	public ExternalAntBuildfileImportPage() {
-		super("externalAntBuildfilePage"); //$NON-NLS-1$
-		setPageComplete(false);
-		setTitle(DataTransferMessages.getString("ExternalAntBuildfileImportPage.9")); //$NON-NLS-1$
-		setDescription(DataTransferMessages.getString("ExternalAntBuildfileImportPage.10")); //$NON-NLS-1$
-
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		initializeDialogUnits(parent);
-		
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		WorkbenchHelp.setHelp(composite, IHelpContextIds.NEW_PROJECT_WIZARD_PAGE);
-
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
-
-		createProjectNameGroup(composite);
-		createProjectLocationGroup(composite);
-		validatePage();
-		// Show description on opening
-		setErrorMessage(null);
-		setMessage(null);
-		setControl(composite);
-	}
-
-	/**
-	 * Creates the project location specification controls.
-	 *
-	 * @param parent the parent composite
-	 */
-	private final void createProjectLocationGroup(Composite parent) {
-
-		// project specification group
-		Composite projectGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		projectGroup.setLayout(layout);
-		projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		projectGroup.setFont(parent.getFont());
-
-		// new project label
-		Label projectContentsLabel = new Label(projectGroup, SWT.NONE);
-		projectContentsLabel.setText(DataTransferMessages.getString("ExternalAntBuildfileImportPage.11")); //$NON-NLS-1$
-		projectContentsLabel.setFont(parent.getFont());
-
-		createUserSpecifiedProjectLocationGroup(projectGroup);
-	}
-	/**
-	 * Creates the project name specification controls.
-	 *
-	 * @param parent the parent composite
-	 */
-	private final void createProjectNameGroup(Composite parent) {
-		
-		Font dialogFont = parent.getFont();
-		
-		// project specification group
-		Composite projectGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		projectGroup.setFont(dialogFont);
-		projectGroup.setLayout(layout);
-		projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// new project label
-		Label projectLabel = new Label(projectGroup, SWT.NONE);
-		projectLabel.setText(DataTransferMessages.getString("ExternalAntBuildfileImportPage.12")); //$NON-NLS-1$
-		projectLabel.setFont(dialogFont);
-
-		// new project name entry field
-		projectNameField = new Text(projectGroup, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		projectNameField.setLayoutData(data);
-		projectNameField.setFont(dialogFont);
-		
-		projectNameField.addListener(SWT.Modify, nameModifyListener);
-	}
-	/**
-	 * Creates the project location specification controls.
-	 *
-	 * @param projectGroup the parent composite
-	 * @param boolean - the initial enabled state of the widgets created
-	 */
-	private void createUserSpecifiedProjectLocationGroup(Composite projectGroup) {
-		
-		Font dialogFont = projectGroup.getFont();
-
-		// project location entry field
-		this.locationPathField = new Text(projectGroup, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		this.locationPathField.setLayoutData(data);
-		this.locationPathField.setFont(dialogFont);
-
-		// browse button
-		this.browseButton = new Button(projectGroup, SWT.PUSH);
-		this.browseButton.setText(DataTransferMessages.getString("ExternalAntBuildfileImportPage.13")); //$NON-NLS-1$
-		this.browseButton.setFont(dialogFont);
-		setButtonLayoutData(this.browseButton);
-		
-		this.browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				handleBrowseButtonPressed();
-			}
-		});
-
-		locationPathField.addListener(SWT.Modify, locationModifyListener);
-	}
-
-	/**
-	 * Returns the current project name as entered by the user, or its anticipated
-	 * initial value.
-	 *
-	 * @return the project name, its anticipated initial value, or <code>null</code>
-	 *   if no project name is known
-	 */
-	private String getProjectName(AntProjectNode projectNode) {
-		String userSpecifiedName= getProjectNameFieldValue();
-		if (userSpecifiedName.length() > 0) {
-			return userSpecifiedName;
-		}
-		String projectName= projectNode.getLabel();
-		if (projectName == null) {
-			projectName= DataTransferMessages.getString("ExternalAntBuildfileImportPage.14"); //$NON-NLS-1$
-		}
-		return projectName;
-	}
-	/**
-	 * Returns the value of the project name field
-	 * with leading and trailing spaces removed.
-	 * 
-	 * @return the project name in the field
-	 */
-	private String getProjectNameFieldValue() {
-		if (projectNameField == null) {
-			return ""; //$NON-NLS-1$
-		} 
-		return projectNameField.getText().trim();
-	}
-	/**
-	 * Returns the value of the project location field
-	 * with leading and trailing spaces removed.
-	 * 
-	 * @return the project location directory in the field
-	 */
-	private String getProjectLocationFieldValue() {
-		return locationPathField.getText().trim();
-	}
-	
-	/**
-	 * Determine the buildfile the user wishes to operate from
-	 */
-	private void handleBrowseButtonPressed() {
-		
-			String lastUsedPath= null;
-			//lastUsedPath= dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTEXTFILE);
-			if (lastUsedPath == null) {
-				lastUsedPath= ""; //$NON-NLS-1$
-			}
-			FileDialog dialog = new FileDialog(getShell(), SWT.SINGLE);
-			dialog.setFilterExtensions(new String[] { "*.xml" }); //$NON-NLS-1$;
-			dialog.setFilterPath(lastUsedPath);
-
-			String result = dialog.open();
-			if (result == null) {
-				return;
-			}
-			IPath filterPath= new Path(dialog.getFilterPath());
-			String buildFileName= dialog.getFileName();
-			IPath path= filterPath.append(buildFileName).makeAbsolute();	
-			
-//			previouslyBrowsedDirectory = selectedDirectory;
-			locationPathField.setText(path.toOSString());
-	}
-
-	/**
-	 * Returns whether this page's controls currently all contain valid 
-	 * values.
-	 *
-	 * @return <code>true</code> if all controls are valid, and
-	 *   <code>false</code> if at least one is invalid
-	 */
-	private boolean validatePage() {
-
-		String locationFieldContents = getProjectLocationFieldValue();
-
-		if (locationFieldContents.equals("")) { //$NON-NLS-1$
-			setErrorMessage(null);
-			setMessage(DataTransferMessages.getString("ExternalAntBuildfileImportPage.15")); //$NON-NLS-1$
-			return false;
-		}
-
-		IPath path = new Path(""); //$NON-NLS-1$
-		if (!path.isValidPath(locationFieldContents)) {
-			setErrorMessage(DataTransferMessages.getString("ExternalAntBuildfileImportPage.16")); //$NON-NLS-1$
-			return false;
-		}
-
-		if (fAntModel == null) {
-			setErrorMessage(DataTransferMessages.getString("ExternalAntBuildfileImportPage.17")); //$NON-NLS-1$
-			return false;
-		}
-		
-		if (getProjectNameFieldValue().length() == 0) {
-			setErrorMessage(DataTransferMessages.getString("ExternalAntBuildfileImportPage.18")); //$NON-NLS-1$
-			return false;
-		} 
-		IProject existingProject= ResourcesPlugin.getWorkspace().getRoot().getProject(getProjectNameFieldValue());
-		if (existingProject.exists()) {
-			setErrorMessage(DataTransferMessages.getString("ExternalAntBuildfileImportPage.19")); //$NON-NLS-1$
-			return false;
-		}
-
-		setErrorMessage(null);
-		setMessage(null);
-		return true;
-	}
-
-	/**
-	 * Set the project name using either the name of the
-	 * parent of the file or the name entry in the xml for 
-	 * the file
-	 */
-	private void setProjectName() {
-
-		if (fAntModel == null) {
-			return;
-		}
-
-		AntProjectNode node= fAntModel.getProjectNode();
-		String projectName= getProjectName(node);
-		
-		projectNameField.setText(projectName);
-	}
-
-	/**
-	 * Return a .xml file from the specified location.
-	 * If there isn't one return null.
-	 */
-	private File getBuildFile(String locationFieldContents) {
-		File buildFile = new File(locationFieldContents);
-		if (!buildFile.isFile() && buildFile.exists()) { 
-			return null;
-		}
-
-		return buildFile;
-	}
-
-	/**
-	 * Creates a new project resource based on the Ant buildfile.
-	 *
-	 * @return the created project resource, or <code>null</code> if the project
-	 *    was not created
-	 */
-	protected IJavaProject createProject() {
-
-		AntProjectNode projectNode= fAntModel.getProjectNode();
-		
-		final List javacNodes= new ArrayList();
-		getJavacNodes(javacNodes, projectNode);
-		final IJavaProject[] result= new IJavaProject[1];
-		final String projectName= getProjectNameFieldValue();
-		final File buildFile= getBuildFile(getProjectLocationFieldValue());
-		if (javacNodes.size() > 1) {
-			setErrorMessage(DataTransferMessages.getString("ExternalAntBuildfileImportPage.20")); //$NON-NLS-1$
-			return null;
-		}
-		
-		WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				List javacTasks= resolveJavacTasks(javacNodes);
-				//TODO no javactasks...throw CoreException
-				ProjectCreator creator= new ProjectCreator();
-				Iterator iter= javacTasks.iterator();
-				while (iter.hasNext()) {
-					Javac javacTask = (Javac) iter.next();
-					IJavaProject javaProject= creator.createJavaProjectFromJavacNode(projectName, javacTask);
-					importBuildFile(monitor, javaProject.getPath(), buildFile);
-					result[0]= javaProject;
-				}
-			}
-		};
-		
-		//run the new project creation operation
-		try {
-			getContainer().run(true, true, op);
-		} catch (InterruptedException e) {
-			return null;
-		} catch (InvocationTargetException e) {
-			// ie.- one of the steps resulted in a core exception	
-			Throwable t = e.getTargetException();
-			if (t instanceof CoreException) {	
-				ErrorDialog.openError(getShell(), DataTransferMessages.getString("ExternalAntBuildfileImportPage.21"), //$NON-NLS-1$
-				null, ((CoreException) t).getStatus());
-			}
-		}
-		
-		return result[0];
-	}
-	
-	protected void importBuildFile(IProgressMonitor monitor, IPath destPath, File buildFile) {
-		IImportStructureProvider structureProvider = FileSystemStructureProvider.INSTANCE;
-		List files = new ArrayList(1);
-		
-		files.add(buildFile);
-		File rootDir= buildFile.getParentFile();
-		try {
-			ImportOperation op= new ImportOperation(destPath, rootDir, structureProvider, new ImportOverwriteQuery(), files);
-			op.setCreateContainerStructure(false);
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		} catch (InvocationTargetException e) {
-			Throwable t = e.getTargetException();
-			if (t instanceof CoreException) {	
-				ErrorDialog.openError(getShell(), DataTransferMessages.getString("ExternalAntBuildfileImportPage.22"), //$NON-NLS-1$
-				null, ((CoreException) t).getStatus());
-			}
-		}
-	}
-
-	private List resolveJavacTasks(List javacNodes) {
-		List resolvedJavacTasks= new ArrayList(javacNodes.size());
-		Iterator nodes= javacNodes.iterator();
-		while (nodes.hasNext()) {
-			AntTaskNode taskNode = (AntTaskNode) nodes.next();
-			Task javacTask= taskNode.getTask();
-			if (javacTask instanceof UnknownElement) {
-				if (((UnknownElement)javacTask).getRealThing() == null) {
-					javacTask.maybeConfigure();
-				}
-				
-				resolvedJavacTasks.add(((UnknownElement)javacTask).getRealThing());
-			} else {
-				resolvedJavacTasks.add(javacTask);
-			}
-			
-		}
-		return resolvedJavacTasks;
-	}
-	
-	private AntModel getAntModel(final File buildFile) {
-		IDocument doc= getDocument(buildFile);
-		if (doc == null) {
-			return null;
-		}
-		AntModel model= new AntModel(XMLCore.getDefault(), doc, null, new LocationProvider(null) {
-			/* (non-Javadoc)
-			 * @see org.eclipse.ant.internal.ui.editor.outline.ILocationProvider#getLocation()
-			 */
-			public IPath getLocation() {
-				return new Path(buildFile.getAbsolutePath());
-			}
-		});
-		model.reconcile(null);
-		return model;
-	}
-	
-	private IDocument getDocument(File buildFile) {
-		InputStream in;
-		try {
-			in = new FileInputStream(buildFile);
-		} catch (FileNotFoundException e) {
-			return null;
-		}
-		String initialContent= getStreamContentAsString(in);
-		return new Document(initialContent);
-	}
-	
-	private String getStreamContentAsString(InputStream inputStream) {
-		InputStreamReader reader;
-		try {
-			reader = new InputStreamReader(inputStream, ResourcesPlugin.getEncoding());
-		} catch (UnsupportedEncodingException e) {
-			AntUIPlugin.log(e);
-			return ""; //$NON-NLS-1$
-		}
-
-		return getReaderContentAsString( new BufferedReader(reader));
-	}
-	
-	private String getReaderContentAsString(BufferedReader bufferedReader) {
-		StringBuffer result = new StringBuffer();
-		try {
-			String line= bufferedReader.readLine();
-
-			while(line != null) {
-				if(result.length() != 0) {
-					result.append("\n"); //$NON-NLS-1$
-				}
-				result.append(line);
-				line = bufferedReader.readLine();
-			}
-		} catch (IOException e) {
-			AntUIPlugin.log(e);
-			return null;
-		}
-
-		return result.toString();
-	}
-	
-	private void getJavacNodes(List javacNodes, AntElementNode parent) {
-		if (!parent.hasChildren()) {
-			return;
-		}
-		List children= parent.getChildNodes();
-		for (Iterator iter = children.iterator(); iter.hasNext();) {
-			AntElementNode node = (AntElementNode) iter.next();
-			if (node instanceof AntTargetNode) {
-				getJavacNodes(javacNodes, node);
-			} else if (node instanceof AntTaskNode) {
-				AntTaskNode task= (AntTaskNode)node;
-				if (task.getName() == "javac") { //$NON-NLS-1$
-					javacNodes.add(task);
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if(visible)
-			this.locationPathField.setFocus();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
deleted file mode 100644
index f8e833a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.datatransfer;
-
-import java.io.File;
-
-import org.apache.tools.ant.taskdefs.Javac;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class ProjectCreator {
-		
-	public IJavaProject createJavaProjectFromJavacNode(String projectName, Javac javacTask) throws CoreException {
-		
-		IJavaProject javaProject = createJavaProject(projectName);
-		
-		File destDir= javacTask.getDestdir();
-		String destDirName= destDir.getName();
-		org.apache.tools.ant.types.Path sourceDirs= javacTask.getSrcdir();
-		createSourceDirectories(destDir, destDirName, sourceDirs, javaProject);
-		
-		// add rt.jar
-		addVariableEntry(javaProject, new Path(JavaRuntime.JRELIB_VARIABLE), new Path(JavaRuntime.JRESRC_VARIABLE), new Path(JavaRuntime.JRESRCROOT_VARIABLE));
-		
-		setClasspath(javacTask, javaProject);
-		
-		javaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-		return javaProject;
-	}
-	
-	private void setClasspath(Javac javacTask, IJavaProject javaProject) throws JavaModelException {
-		org.apache.tools.ant.types.Path classpath= javacTask.getClasspath();
-		if (classpath == null) {
-			return;
-		}
-		String[] classpaths= classpath.list();
-		for (int i = 0; i < classpaths.length; i++) {
-			String cp = classpaths[i];
-			File classpathEntry= new File(cp);
-			addLibrary(javaProject, new Path(classpathEntry.getAbsolutePath()));
-		}
-	}
-
-	private void createSourceDirectories(File destDir, String destDirName, org.apache.tools.ant.types.Path sourceDirs, IJavaProject javaProject) throws CoreException {
-		//create the source directories
-		String[] sourceDirectories= sourceDirs.list();
-		for (int i = 0; i < sourceDirectories.length; i++) {
-			String srcDir = sourceDirectories[i];
-			File srcDirectory= new File(srcDir);
-			addSourceContainer(javaProject, srcDirectory.getName(), srcDir, destDirName, destDir.getAbsolutePath());
-		}
-	}
-
-	private IJavaProject createJavaProject(String projectName) 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);
-		}
-		
-		if (!project.hasNature(JavaCore.NATURE_ID)) {
-			addNatureToProject(project, JavaCore.NATURE_ID);
-		}
-		
-		IJavaProject jproject= JavaCore.create(project);
-		
-		jproject.setRawClasspath(new IClasspathEntry[0], null);
-		
-		return jproject;	
-	}
-	
-	private void addNatureToProject(IProject proj, String natureId) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures= description.getNatureIds();
-		String[] newNatures= new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length]= natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, null);
-	}
-	
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	private IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String srcName, String srcPath, String outputName, String outputPath) throws CoreException {
-		IProject project= jproject.getProject();
-		IContainer container= null;
-		if (srcName == null || srcName.length() == 0) {
-			container= project;
-		} else {
-			IFolder folder= project.getFolder(srcName);
-			if (!folder.exists()) {
-				folder.createLink(new Path(srcPath), IResource.ALLOW_MISSING_LOCAL, null);
-			}
-			container= folder;
-		}
-		IPackageFragmentRoot root= jproject.getPackageFragmentRoot(container);
-
-		IFolder output = null;
-		if (outputName!= null) {
-			output = project.getFolder(outputName);
-			if (!output.exists()) {
-				output.createLink(new Path(outputPath), IResource.ALLOW_MISSING_LOCAL, null);
-			}
-		}
-				
-		IClasspathEntry cpe= JavaCore.newSourceEntry(root.getPath(), new IPath[0], output.getFullPath());
-		
-		addToClasspath(jproject, cpe);		
-		return root;
-	}	
-	
-	private void addToClasspath(IJavaProject jproject, IClasspathEntry cpe) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		for (int i= 0; i < oldEntries.length; i++) {
-			if (oldEntries[i].equals(cpe)) {
-				return;
-			}
-		}
-		int nEntries= oldEntries.length;
-		IClasspathEntry[] newEntries= new IClasspathEntry[nEntries + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, nEntries);
-		newEntries[nEntries]= cpe;
-		jproject.setRawClasspath(newEntries, null);
-	}
-	
-	/**
-	 * Adds a variable entry with source attachment to a IJavaProject if the path can be resolved.
-	 */			
-	private void addVariableEntry(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newVariableEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		IPath resolvedPath= JavaCore.getResolvedVariablePath(path);
-		if (resolvedPath != null) {
-			jproject.getPackageFragmentRoot(resolvedPath.toString());
-		}
-	}
-	
-	/**
-	 * Adds a library entry with source attchment to a IJavaProject.
-	 */			
-	private void addLibrary(IJavaProject jproject, IPath path) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newLibraryEntry(path, null, null);
-		addToClasspath(jproject, cpe);
-		jproject.getPackageFragmentRoot(path.toString());
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AddVariableStringAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AddVariableStringAction.java
deleted file mode 100644
index a028b47..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AddVariableStringAction.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class AddVariableStringAction extends RuntimeClasspathAction {
-	
-	public AddVariableStringAction(IClasspathViewer viewer) {
-		super(AntLaunchConfigurationMessages.getString("AddVariableStringAction.1"), viewer); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction#getActionType()
-	 */
-	protected int getActionType() {
-		return ADD;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		VariableInputDialog inputDialog = new VariableInputDialog(getShell());
-		inputDialog.open();
-		String variableString= inputDialog.getVariableString();
-		if (variableString != null && variableString.trim().length() > 0) {
-			IRuntimeClasspathEntry newEntry = JavaRuntime.newStringVariableClasspathEntry(variableString);
-			getViewer().addEntries(new IRuntimeClasspathEntry[] {newEntry});
-		}
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuildTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuildTab.java
deleted file mode 100644
index 8a647fa..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuildTab.java
+++ /dev/null

@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.Group;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * A launch configuration tab which allows the user to specify
- * which resources should be built before the Ant build (a build scope)
- * <p>
- * This class may be instantiated; this class is not intended
- * to be subclassed.
- * </p>
- * @since 3.0
- */
-public class AntBuildTab extends AbstractLaunchConfigurationTab {
-
-	/**
-	 * String attribute identifying the build scope for this launch configuration.
-	 * <code>null</code> indicates the default workspace build.
-	 */
-	public static final String ATTR_BUILD_SCOPE = AntUIPlugin.getUniqueIdentifier() + ".ATTR_BUILD_SCOPE"; //$NON-NLS-1$
-
-	/**
-	 * Attribute identifier specifying whether referenced projects should be 
-	 * considered when computing the projects to build. Default value is
-	 * <code>true</code>.
-	 */
-	public static final String ATTR_INCLUDE_REFERENCED_PROJECTS = AntUIPlugin.getUniqueIdentifier() + ".ATTR_INCLUDE_REFERENCED_PROJECTS"; //$NON-NLS-1$
-	
-	// Check Buttons
-	private Button fBuildButton;
-	
-	// Group box
-	private Group fGroup;
-	
-	// Radio Buttons
-	private Button fProjectButton;
-	private Button fSpecificProjectsButton;
-	private Button fWorkspaceButton;
-	
-	// Push Button
-	private Button fSelectButton;
-	
-	// whether to include referenced projects
-	private Button fReferencedProjects;
-	
-	// projects to build (empty if none)
-	private List fProjects = new ArrayList();
-	
-	class ProjectsContentProvider implements IStructuredContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return ((IWorkspace)inputElement).getRoot().getProjects();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/* (non-Javadoc)
-		 * @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) {
-		}
-		
-	}
-	/**
-	 * @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(getControl(), IAntUIHelpContextIds.ANT_BUILD_TAB);
-		
-		GridLayout layout = new GridLayout();
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		mainComposite.setLayout(layout);
-		mainComposite.setLayoutData(gd);
-		mainComposite.setFont(parent.getFont());
-		
-		createVerticalSpacer(mainComposite, 1);
-		
-		fBuildButton = createCheckButton(mainComposite, AntLaunchConfigurationMessages.getString("AntBuildTab.1")); //$NON-NLS-1$
-		fBuildButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateEnabledState();
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fGroup = new Group(mainComposite, SWT.NONE);
-		fGroup.setFont(mainComposite.getFont());
-		layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = false;
-		fGroup.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fGroup.setLayoutData(gd);
-
-		SelectionAdapter adapter = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button)e.getSource()).getSelection()) {
-					updateEnabledState();
-					updateLaunchConfigurationDialog();
-				}
-			}
-		};
-		
-		fWorkspaceButton = createRadioButton(fGroup, AntLaunchConfigurationMessages.getString("AntBuildTab.2")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fWorkspaceButton.setLayoutData(gd);
-		fWorkspaceButton.addSelectionListener(adapter);
-		
-		fProjectButton = createRadioButton(fGroup, AntLaunchConfigurationMessages.getString("AntBuildTab.3")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fProjectButton.setLayoutData(gd);		
-		fProjectButton.addSelectionListener(adapter);
-				
-		fSpecificProjectsButton = createRadioButton(fGroup, AntLaunchConfigurationMessages.getString("AntBuildTab.4")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 1;
-		fSpecificProjectsButton.setLayoutData(gd);
-		fSpecificProjectsButton.addSelectionListener(adapter);		
-		
-		fSelectButton = createPushButton(fGroup, AntLaunchConfigurationMessages.getString("AntBuildTab.5"), null); //$NON-NLS-1$
-		gd = (GridData)fSelectButton.getLayoutData();
-		gd.horizontalAlignment = GridData.HORIZONTAL_ALIGN_END;
-		fSelectButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				selectResources();
-			}
-		});
-		
-		createVerticalSpacer(mainComposite, 1);
-		fReferencedProjects = createCheckButton(mainComposite, AntLaunchConfigurationMessages.getString("AntBuildTab.6")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Prompts the user to select the projects to build.
-	 */
-	private void selectResources() {
-		ListSelectionDialog dialog = new ListSelectionDialog(getShell(), ResourcesPlugin.getWorkspace(), new ProjectsContentProvider(), new WorkbenchLabelProvider(), AntLaunchConfigurationMessages.getString("AntBuildTab.7")); //$NON-NLS-1$
-		dialog.setInitialElementSelections(fProjects);
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-		Object[] res = dialog.getResult();
-		fProjects = new ArrayList(res.length);
-		for (int i = 0; i < res.length; i++) {
-			fProjects.add(res[i]);
-		}
-		updateLaunchConfigurationDialog();
-	}
-	
-	/**
-	 * @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) {
-		updateScope(configuration);
-		updateReferencedProjects(configuration);
-		updateEnabledState();		
-	}
-	
-	private void updateReferencedProjects(ILaunchConfiguration configuration) {
-		boolean ref = false;
-		try {
-			ref = configuration.getAttribute(ATTR_INCLUDE_REFERENCED_PROJECTS, true);
-		} catch (CoreException e) {
-			AntUIPlugin.log(AntUIPlugin.newErrorStatus("Exception reading launch configuration", e)); //$NON-NLS-1$
-		}
-		fReferencedProjects.setSelection(ref);
-	}
-
-	/**
-	 * Updates the tab to display the build scope specified by the launch config
-	 */
-	private void updateScope(ILaunchConfiguration configuration) {
-		String scope = null;
-		try {
-			scope= configuration.getAttribute(ATTR_BUILD_SCOPE, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(AntUIPlugin.newErrorStatus("Exception reading launch configuration", ce)); //$NON-NLS-1$
-		}
-		fBuildButton.setSelection(scope != null);
-		fWorkspaceButton.setSelection(false);
-		fProjectButton.setSelection(false);
-		fSpecificProjectsButton.setSelection(false);
-		fProjects.clear();
-		if (scope == null) {
-			// select the workspace by default
-			fBuildButton.setSelection(true);
-			fWorkspaceButton.setSelection(true);
-		} else {
-			if (scope.equals("${none}")) { //$NON-NLS-1$
-				fBuildButton.setSelection(false);
-			} else if (scope.equals("${project}")) { //$NON-NLS-1$
-				fProjectButton.setSelection(true);
-			} else if (scope.startsWith("${projects:")) { //$NON-NLS-1$
-				fSpecificProjectsButton.setSelection(true);
-				IProject[] projects = getBuildProjects(scope);
-				fProjects = new ArrayList(projects.length);
-				for (int i = 0; i < projects.length; i++) {
-					fProjects.add(projects[i]);
-				}
-			}
-		}
-	}
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		String scope = generateScopeMemento();
-		configuration.setAttribute(ATTR_BUILD_SCOPE, scope);
-		if (fReferencedProjects.getSelection()) {
-			// default is true
-			configuration.setAttribute(ATTR_INCLUDE_REFERENCED_PROJECTS, (String)null);
-		} else {
-			configuration.setAttribute(ATTR_INCLUDE_REFERENCED_PROJECTS, false);
-		}
-	}
-
-	/**
-	 * Generates a memento for the build scope.
-	 */
-	private String generateScopeMemento() {
-		if (fBuildButton.getSelection()) {
-			if (fWorkspaceButton.getSelection()) {
-				return null;
-			}
-			if (fProjectButton.getSelection()) {
-				return "${project}"; //$NON-NLS-1$
-			}
-			if (fSpecificProjectsButton.getSelection()) {
-				return getBuildScopeAttribute(fProjects);
-			}
-			return null;
-			
-		}
-		return "${none}"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return AntLaunchConfigurationMessages.getString("AntBuildTab.8"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Updates the enablement state of the fields.
-	 */
-	private void updateEnabledState() {
-		boolean enabled= fBuildButton.getSelection();
-		fGroup.setEnabled(enabled);
-		fWorkspaceButton.setEnabled(enabled);
-		fProjectButton.setEnabled(enabled);
-		fSpecificProjectsButton.setEnabled(enabled);
-		fSelectButton.setEnabled(enabled && fSpecificProjectsButton.getSelection());
-		if (!enabled) {
-			super.setErrorMessage(null);
-		}
-		if (enabled) {
-			if (!fWorkspaceButton.getSelection() && !fProjectButton.getSelection() &&
-					!fSpecificProjectsButton.getSelection()) {
-				fWorkspaceButton.setSelection(true);
-			}
-		}
-		fReferencedProjects.setEnabled(fBuildButton.getSelection() && (fProjectButton.getSelection() || fSpecificProjectsButton.getSelection()));
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_ANT_BUILD_TAB);
-	}
-
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		setErrorMessage(null);
-		setMessage(null);
-		if (fSpecificProjectsButton.getSelection() && fProjects.isEmpty()) {
-			setErrorMessage(AntLaunchConfigurationMessages.getString("AntBuildTab.9")); //$NON-NLS-1$
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Returns a collection of projects referenced by a build scope attribute.
-	 * 
-	 * @param scope build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
-	 * @return collection of porjects referred to by the scope attribute
-	 */
-	public static IProject[] getBuildProjects(String scope) {
-		if (scope.startsWith("${projects:")) { //$NON-NLS-1$
-			String pathString = scope.substring(11, scope.length() - 1);
-			if (pathString.length() > 1) {
-				String[] names = pathString.split(","); //$NON-NLS-1$
-				IProject[] projects = new IProject[names.length];
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				for (int i = 0; i < names.length; i++) {
-					projects[i] = root.getProject(names[i]);
-				}
-				return projects;
-			}
-		} else if (scope.equals("${project}")) { //$NON-NLS-1$
-			IResource resource = DebugUITools.getSelectedResource();
-			if (resource != null) {
-				return new IProject[]{resource.getProject()};
-			}
-		}
-		return new IProject[0];
-	}
-	
-	/**
-	 * Returns the build scope attribute specified by the given launch configuration
-	 * or <code>null</code> if none.
-	 * 
-	 * @param configuration launch configuration
-	 * @return build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
-	 * @throws CoreException if unable to access the associated attribute
-	 */
-	public static String getBuildScope(ILaunchConfiguration configuration) throws CoreException {
-		return configuration.getAttribute(ATTR_BUILD_SCOPE, (String) null);
-	}
-	
-	/**
-	 * Whether referenced projects should be considered when building. Only valid
-	 * when a set of projects is to be built.
-	 * 
-	 * @param configuration
-	 * @return whether referenced projects should be considerd when building
-	 * @throws CoreException if unable to access the associated attribute
-	 */
-	public static boolean isIncludeReferencedProjects(ILaunchConfiguration configuration) throws CoreException {
-		return configuration.getAttribute(ATTR_INCLUDE_REFERENCED_PROJECTS, true);
-	}
-	
-	/**
-	 * Creates and returns a memento for the given project set, to be used as a
-	 * build scope attribute.
-	 * 
-	 * @param projects list of projects
-	 * @return an equivalent refresh attribute
-	 */
-	public static String getBuildScopeAttribute(List projects) {
-		StringBuffer buf = new StringBuffer();
-		buf.append("${projects:"); //$NON-NLS-1$
-		Iterator iterator = projects.iterator();
-		while (iterator.hasNext()) {
-			IProject project = (IProject) iterator.next();
-			buf.append(project.getName());
-			if (iterator.hasNext()) {
-				buf.append(","); //$NON-NLS-1$
-			}
-		}
-		buf.append("}"); //$NON-NLS-1$
-		return buf.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		// do nothing on activation
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
-		// do nothing on deactivation
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTabGroup.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTabGroup.java
deleted file mode 100644
index 20da9e5..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntBuilderTabGroup.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.RefreshTab;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsBuilderTab;
-
-public class AntBuilderTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @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(),
-			new RefreshTab(),
-			new AntTargetsTab(),
-			new AntClasspathTab(),
-			new AntPropertiesTab(),
-			new AntJRETab(),
-			new AntEnvironmentTab(),
-			new ExternalToolsBuilderTab(),
-		};
-		setTabs(tabs);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathProvider.java
deleted file mode 100644
index 71c5846..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathProvider.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.StandardClasspathProvider;
-
-public class AntClasspathProvider extends StandardClasspathProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
-		if (useDefault) {
-			List rtes = new ArrayList(10);
-			IVMInstall vm= null;
-			try {
-				vm= JavaRuntime.computeVMInstall(configuration);
-			} catch (CoreException ce) {
-				//likely in a non-Java project
-				vm= JavaRuntime.getDefaultVMInstall();
-			}
-			IPath containerPath = new Path(JavaRuntime.JRE_CONTAINER);
-			containerPath = containerPath.append(new Path(vm.getVMInstallType().getId()));
-			containerPath = containerPath.append(new Path(vm.getName()));
-			
-			rtes.add(JavaRuntime.newRuntimeContainerClasspathEntry(containerPath, IRuntimeClasspathEntry.STANDARD_CLASSES));
-			rtes.add(new AntHomeClasspathEntry());
-			rtes.add(new ContributedClasspathEntriesEntry());
-			return (IRuntimeClasspathEntry[]) rtes.toArray(new IRuntimeClasspathEntry[rtes.size()]);
-		}
-		return super.computeUnresolvedClasspath(configuration);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java
deleted file mode 100644
index b92e60c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.internal.debug.ui.actions.AddExternalJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddFolderAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveDownAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveUpAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RemoveAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RestoreDefaultEntriesAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.jdt.internal.debug.ui.classpath.ClasspathEntry;
-import org.eclipse.jdt.internal.debug.ui.classpath.ClasspathModel;
-import org.eclipse.jdt.internal.debug.ui.classpath.IClasspathEntry;
-import org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The Ant classpath tab
- */
-public class AntClasspathTab extends JavaClasspathTab {
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab#isShowBootpath()
-	 */
-	public boolean isShowBootpath() {
-		return false;
-	}
-	
-	/**
-	 * Creates actions to manipulate the classpath.
-	 * 
-	 * @param pathButtonComp composite buttons are contained in
-	 * @since 3.0
-	 */
-	protected void createPathButtons(Composite pathButtonComp) {		
-		createButton(pathButtonComp, new MoveUpAction(fClasspathViewer));
-		createButton(pathButtonComp, new MoveDownAction(fClasspathViewer));
-		createButton(pathButtonComp, new RemoveAction(fClasspathViewer));
-		createButton(pathButtonComp, new AddJarAction(fClasspathViewer));
-		createButton(pathButtonComp, new AddExternalJarAction(fClasspathViewer, DIALOG_SETTINGS_PREFIX));
-		createButton(pathButtonComp, new AddFolderAction(fClasspathViewer));
-		createButton(pathButtonComp, new AddVariableStringAction(fClasspathViewer));
-		RuntimeClasspathAction action= new RestoreDefaultEntriesAction(fClasspathViewer, this);
-		createButton(pathButtonComp, action);
-		action.setEnabled(true);
-		
-		action= new EditAntHomeEntryAction(fClasspathViewer, this);
-		createButton(pathButtonComp, action);
-		action.setEnabled(true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setDirty(boolean)
-	 */
-	public void setDirty(boolean dirty) {
-		super.setDirty(dirty);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			AntUtil.migrateToNewClasspathFormat(configuration);
-		} catch (CoreException e) {
-		}
-		super.initializeFrom(configuration);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.debug.ui.launcher.IEntriesChangedListener#entriesChanged(org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer)
-	 */
-	public void entriesChanged(IClasspathViewer viewer) {
-		super.entriesChanged(viewer);
-		ILaunchConfigurationTab[] tabs = getLaunchConfigurationDialog().getTabs();
-		for (int i = 0; i < tabs.length; i++) {
-			ILaunchConfigurationTab tab = tabs[i];
-			if (tab instanceof AntTargetsTab) {
-				((AntTargetsTab)tab).setDirty(true);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		
-		boolean valid= super.isValid(launchConfig);
-		if (!valid) {
-			return false;
-		}
-		
-		return validateAntHome();
-	}
-	
-	private boolean validateAntHome() {
-		ClasspathModel model= getModel();
-		IClasspathEntry userEntry= model.getUserEntry();
-		IClasspathEntry[] entries= userEntry.getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			ClasspathEntry entry = (ClasspathEntry) entries[i];
-			IRuntimeClasspathEntry runtimeEntry= entry.getDelegate();
-			if (runtimeEntry instanceof AntHomeClasspathEntry) {
-				try {
-					((AntHomeClasspathEntry)runtimeEntry).resolveAntHome();
-				} catch (CoreException ce) {
-					setErrorMessage(ce.getStatus().getMessage());
-					return false;
-				}
-				break;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntEnvironmentTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntEnvironmentTab.java
deleted file mode 100644
index d7b9851..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntEnvironmentTab.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.launchConfigurations;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * An environment tab for Ant launch configurations.
- * Environment variables are only supported when Ant is
- * run in a separate VM, so this tab adds a warning message
- * at the top and disables the widgets if the config isn't
- * set to run in a separate VM.
- */
-public class AntEnvironmentTab extends EnvironmentTab {
-	
-	protected Composite wrappingComposite;
-	protected Label warningLabel;
-	
-	public void createControl(Composite parent) {
-		wrappingComposite= new Composite(parent, SWT.NONE);
-		wrappingComposite.setLayout(new GridLayout());
-		wrappingComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		wrappingComposite.setFont(parent.getFont());
-		
-		warningLabel= new Label(wrappingComposite, SWT.NONE);
-		warningLabel.setText(AntLaunchConfigurationMessages.getString("AntEnvironmentTab.0")); //$NON-NLS-1$
-		
-		super.createControl(wrappingComposite);
-		setControl(wrappingComposite); // Overwrite setting in super method
-		Dialog.applyDialogFont(parent);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		updateWidgetsEnabled(workingCopy);
-	}
-	
-	protected void updateWidgetsEnabled(ILaunchConfigurationWorkingCopy workingCopy) {
-		if (wrappingComposite == null) {
-			return;
-		}
-		String vmName= null;
-		try {
-			vmName= workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String) null);
-		} catch (CoreException e) {
-		}
-		boolean enabled= true;
-		if (vmName == null) {
-			enabled= false;			
-		}
-		Color tableColor= enabled ? null : Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-		Color labelColor= enabled ? null : Display.getDefault().getSystemColor(SWT.COLOR_RED);
-		Table table = environmentTable.getTable();
-		table.setEnabled(enabled);
-		table.setBackground(tableColor);
-		warningLabel.setForeground(labelColor);
-		envAddButton.setEnabled(enabled);
-		envSelectButton.setEnabled(enabled);
-		updateAppendReplace();
-		//update the enabled state of the edit and remove buttons
-		environmentTable.setSelection(environmentTable.getSelection());
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntHomeClasspathEntry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntHomeClasspathEntry.java
deleted file mode 100644
index 65d8a2a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntHomeClasspathEntry.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import java.io.File;
-import java.text.MessageFormat;
-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.IAntClasspathEntry;
-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.internal.launching.AbstractRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A classpath entry that contains a set of archives for a particular
- * ANT_HOME.
- * 
- * @since 3.0 
- */
-public class AntHomeClasspathEntry extends AbstractRuntimeClasspathEntry {
-	
-	public static final String TYPE_ID = "org.eclipse.ant.ui.classpathentry.antHome"; //$NON-NLS-1$
-	
-	/**
-	 * Local path on disk where Ant Home is located or <code>null</code>
-	 * to indicate the use of the default Ant Home.
-	 */
-	private String antHomeLocation = null;
-	
-	/**
-	 * Creates an AntHome entry for the default AntHome installation.
-	 */
-	public AntHomeClasspathEntry() {
-		antHomeLocation = null;
-	}
-	
-	/**
-	 * Constructs an AntHome entry for the Ant installed at the specified
-	 * root directory.
-	 * 
-	 * @param antHome path in the local file system to an Ant installation
-	 */
-	public AntHomeClasspathEntry(String antHome) {
-		antHomeLocation = antHome;
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.launching.AbstractRuntimeClasspathEntry#buildMemento(org.w3c.dom.Document, org.w3c.dom.Element)
-	 */
-	protected void buildMemento(Document document, Element memento) throws CoreException {
-		if (antHomeLocation == null) {
-			memento.setAttribute("default", "true");  //$NON-NLS-1$//$NON-NLS-2$
-		} else {
-			memento.setAttribute("antHome", new Path(antHomeLocation).toString()); //$NON-NLS-1$
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.launching.IRuntimeClasspathEntry2#initializeFrom(org.w3c.dom.Element)
-	 */
-	public void initializeFrom(Element memento) throws CoreException {
-		String antHome = memento.getAttribute("antHome"); //$NON-NLS-1$
-		if (antHome != null && (antHome.length() > 0)) {
-			IPath path = new Path(antHome);
-			antHomeLocation = path.toOSString();
-		} else {
-			antHomeLocation = null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getTypeId()
-	 */
-	public String getTypeId() {
-		return TYPE_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException {
-		List libs = new ArrayList(40);
-		AntCorePreferences preferences = AntCorePlugin.getPlugin().getPreferences();
-		if (antHomeLocation == null) {
-			IAntClasspathEntry[] entries = preferences.getAntHomeClasspathEntries();
-			for (int i = 0; i < entries.length; i++) {
-				IAntClasspathEntry entry = entries[i];
-				libs.add(JavaRuntime.newStringVariableClasspathEntry(entry.getLabel()));
-			}
-		} else {
-			File lib= resolveAntHome();
-			IPath libDir = new Path(antHomeLocation).append("lib"); //$NON-NLS-1$
-			String[] fileNames = lib.list();
-			for (int i = 0; i < fileNames.length; i++) {
-				String name = fileNames[i];
-				IPath path = new Path(name);
-				String fileExtension = path.getFileExtension();
-				if ("jar".equalsIgnoreCase(fileExtension)) { //$NON-NLS-1$
-					libs.add(JavaRuntime.newArchiveRuntimeClasspathEntry(libDir.append(path)));
-				}
-			}
-		}
-		return (IRuntimeClasspathEntry[]) libs.toArray(new IRuntimeClasspathEntry[libs.size()]);
-	}
-	
-	public File resolveAntHome() throws CoreException {
-		if (antHomeLocation == null) { //using the default ant home
-			return null;
-		}
-		IPath libDir= new Path(antHomeLocation).append("lib"); //$NON-NLS-1$
-		File lib= libDir.toFile();
-		File parentDir= lib.getParentFile();
-		if (parentDir == null || !parentDir.exists()) {
-			abort(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntHomeClasspathEntry.10"), new String[] {antHomeLocation}), null); //$NON-NLS-1$
-		}
-		if (!lib.exists() || !lib.isDirectory()) {
-			abort(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntHomeClasspathEntry.11"), new String[] {antHomeLocation}), null); //$NON-NLS-1$
-		}
-		return lib;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getName()
-	 */
-	public String getName() {
-		if (antHomeLocation == null) {
-			return AntLaunchConfigurationMessages.getString("AntHomeClasspathEntry.8"); //$NON-NLS-1$
-		}
-		return MessageFormat.format(AntLaunchConfigurationMessages.getString("AntHomeClasspathEntry.9"), new String[]{antHomeLocation}); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
-	 */
-	public int getType() {
-		return IRuntimeClasspathEntry.OTHER;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#isComposite()
-	 */
-	public boolean isComposite() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		return obj instanceof AntHomeClasspathEntry &&
-		  equalsOrNull(antHomeLocation, ((AntHomeClasspathEntry)obj).antHomeLocation);
-	}
-	
-	/**
-	 * Return whether s1 is equivalent to s2.
-	 * 
-	 * @param s1
-	 * @param s2
-	 * @return whether s1 is equivalent to s2
-	 */
-	private boolean equalsOrNull(String s1, String s2) {
-		if (s1 == null || s2 == null) {
-			return s1 == s2;
-		} 
-		return s1.equalsIgnoreCase(s2);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getClass().hashCode();
-	}	
-	
-	/**
-	 * Sets the ant home to use.
-	 * 
-	 * @param path path to toor of an ant home installation
-	 */
-	protected void setAntHome(String path) {
-		antHomeLocation = path;
-	}
-	
-	/**
-	 * Returns the ant home location
-	 * 
-	 * @return path to root ant installation directory
-	 */
-	public String getAntHome() {
-		return antHomeLocation;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJRETab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJRETab.java
deleted file mode 100644
index 073c127..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJRETab.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.internal.ui.launchConfigurations;
-
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.internal.debug.ui.jres.JREDescriptor;
-import org.eclipse.jdt.internal.debug.ui.launcher.VMArgumentsBlock;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-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.Composite;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class AntJRETab extends JavaJRETab {
-
-	private static final String MAIN_TYPE_NAME= "org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"; //$NON-NLS-1$
-	
-	protected VMArgumentsBlock fVMArgumentsBlock=  new VMArgumentsBlock();
-	protected AntWorkingDirectoryBlock fWorkingDirectoryBlock= new AntWorkingDirectoryBlock();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Font font= parent.getFont();
-		WorkbenchHelp.setHelp(getControl(), IAntUIHelpContextIds.ANT_JRE_TAB);
-		Composite comp= (Composite)fJREBlock.getControl();
-		
-		Composite lowerComp = new Composite(comp, SWT.NONE);
-				
-		GridLayout updateLayout = new GridLayout();
-		updateLayout.numColumns = 2;
-		updateLayout.marginHeight=0;
-		updateLayout.marginWidth=0;
-		lowerComp.setLayout(updateLayout);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 3;
-		lowerComp.setLayoutData(gd);
-		lowerComp.setFont(font);
-		
-		createVerticalSpacer(lowerComp, 2);
-		
-		fVMArgumentsBlock.createControl(lowerComp);
-		((GridData)fVMArgumentsBlock.getControl().getLayoutData()).horizontalSpan= 2;
-		createVerticalSpacer(lowerComp, 2);
-						
-		fWorkingDirectoryBlock.createControl(lowerComp);		
-		((GridData)fWorkingDirectoryBlock.getControl().getLayoutData()).horizontalSpan= 2;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab#getDefaultJREDescriptor()
-	 */
-	protected JREDescriptor getDefaultJREDescriptor() {
-		return new JREDescriptor() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.jdt.internal.debug.ui.jres.JREDescriptor#getDescription()
-			 */
-			public String getDescription() {
-				return AntLaunchConfigurationMessages.getString("AntJRETab.2"); //$NON-NLS-1$
-			}
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab#getSpecificJREDescriptor()
-	 */
-	protected JREDescriptor getSpecificJREDescriptor() {
-		return new JREDescriptor() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.jdt.internal.debug.ui.jres.JREDescriptor#getDescription()
-			 */
-			public String getDescription() {
-				return AntLaunchConfigurationMessages.getString("AntJRETab.3"); //$NON-NLS-1$
-			}
-		};
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		fWorkingDirectoryBlock.setEnabled(!fJREBlock.isDefaultJRE());
-		fVMArgumentsBlock.setEnabled(!fJREBlock.isDefaultJRE());
-		if (fJREBlock.isDefaultJRE()) {
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);			
-		} else {
-			super.performApply(configuration);
-			applySeparateVMAttributes(configuration);
-			fVMArgumentsBlock.performApply(configuration);
-			fWorkingDirectoryBlock.performApply(configuration);
-		}
-		setLaunchConfigurationWorkingCopy(configuration);
-	}
-	
-	private void applySeparateVMAttributes(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, MAIN_TYPE_NAME);
-		configuration.setAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, IAntUIConstants.REMOTE_ANT_PROCESS_FACTORY_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-		fVMArgumentsBlock.initializeFrom(configuration);
-		fWorkingDirectoryBlock.initializeFrom(configuration);
-		boolean separateVM= !fJREBlock.isDefaultJRE();
-		fWorkingDirectoryBlock.setEnabled(separateVM);
-		fVMArgumentsBlock.setEnabled(separateVM);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		return fWorkingDirectoryBlock.isValid(config);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setLaunchConfigurationDialog(org.eclipse.debug.ui.ILaunchConfigurationDialog)
-	 */
-	public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) {
-		super.setLaunchConfigurationDialog(dialog);
-		fWorkingDirectoryBlock.setLaunchConfigurationDialog(dialog);
-		fVMArgumentsBlock.setLaunchConfigurationDialog(dialog);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		String m = super.getErrorMessage();
-		if (m == null) {
-			return fWorkingDirectoryBlock.getErrorMessage();
-		}
-		return m;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getMessage()
-	 */
-	public String getMessage() {
-		String m = super.getMessage();
-		if (m == null) {
-			return fWorkingDirectoryBlock.getMessage();
-		}
-		return m;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		setLaunchConfigurationWorkingCopy(workingCopy);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		super.setDefaults(config);
-		//by default set an Ant build to occur in a separate VM
-		IVMInstall defaultInstall= null;
-		try {
-			defaultInstall = JavaRuntime.computeVMInstall(config);
-		} catch (CoreException e) {
-			//core exception thrown for non-Java project
-			defaultInstall= JavaRuntime.getDefaultVMInstall();
-		}
-		if (defaultInstall != null) {
-			String vmName = defaultInstall.getName();
-			String vmTypeID = defaultInstall.getVMInstallType().getId();					
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, vmName);
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, vmTypeID);
-			applySeparateVMAttributes(config);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJavaLaunchDelegate.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJavaLaunchDelegate.java
deleted file mode 100644
index ec1e6b0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntJavaLaunchDelegate.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate;
-
-/**
- * Used by the AntLaunchDelegate for Ant builds in a separate VM
- * The subclassing is needed to be able to launch an Ant build from a non-Java project
- */
-public class AntJavaLaunchDelegate extends JavaLocalApplicationLaunchConfigurationDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean preLaunchCheck(ILaunchConfiguration configuration,String mode, IProgressMonitor monitor) throws CoreException {
-		try {
-			return super.preLaunchCheck(configuration, mode, monitor);
-		} catch (CoreException ce) {
-			//likely dealing with a non-Java project
-		}
-		//no need to check for breakpoints as always in run mode
-		return true;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.java
deleted file mode 100644
index bdfe3de..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.launchConfigurations;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntLaunchConfigurationMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties
deleted file mode 100644
index d787050..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchConfigurationMessages.properties
+++ /dev/null

@@ -1,93 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AddVariableStringAction.1=Add Varia&ble...
-AddVariableStringAction.2=&Classpath Entry Value:
-AddVariableStringAction.3=&Variables...
-AddVariableStringAction.4=Add Variable Classpath Entry
-
-AntBuildTab.1=&Build before launch
-AntBuildTab.2=The &entire workspace
-AntBuildTab.3=The &project containing the selected resource
-AntBuildTab.4=&Specific projects
-AntBuildTab.5=P&rojects...
-AntBuildTab.6=Include referenced pro&jects
-AntBuildTab.7=Select Projects
-AntBuildTab.8=Build
-AntBuildTab.9=No projects specified
-
-AntLaunchDelegate.Launching_{0}_1=Launching {0}
-AntLaunchDelegate.Running_{0}_2=Running {0}
-AntLaunchDelegate.Build_In_Progress=Ant build {0} already in progress. Concurrent Ant builds are possible if you specify to build in a separate JRE.
-AntLaunchDelegate.Failure=Failure of Background Ant Build
-AntLaunchDelegate.22=&Do not show error dialog when Ant build fails
-AntLaunchDelegate.23=Ant Build Failed
-AntLaunchDelegate.28=Waiting for virtual machine to exit...
-AntLaunchShortcut.0=A location could not be resolved for buildfile
-
-AntLaunchShortcut.Unable=Unable to find an Ant file to run.
-AntLaunchShortcut.2=An exception occurred while creating a default Ant launch configuration for {0}
-AntLaunchShortcut.3=An exception occurred while retrieving Ant launch configurations.
-AntLaunchShortcut.4=Ant Configuration Selection
-AntLaunchShortcut.5=&Choose an Ant configuration to run:
-AntLaunchShortcut.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}
-
-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
-AntPropertiesTab.6=Use &global properties as specified in the Ant runtime preferences
-
-AntTargetLabelProvider.default_target_1=default target
-
-AntJRETab.2=&Run in the same JRE as the workspace
-AntJRETab.3=Separate &JRE:
-
-AntHomeClasspathEntry.8=Ant Home (Default)
-AntHomeClasspathEntry.9=Ant Home ({0})
-AntHomeClasspathEntry.10=Ant Home {0} does not exist
-AntHomeClasspathEntry.11=Ant Home {0} does not contain a "lib" directory
-
-AntMainTab.&Select_a_build_file__1=&Select a buildfile:
-AntMainTab.Base_&Directory__3=Base &Directory:
-AntMainTab.Capture_&output_1=Capture o&utput
-AntMainTab.6=Buildfi&le:
-
-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
-AntTargetsTab.12=&Hide internal targets
-AntTargetsTab.13={0} out of {1} selected ({2} internal target(s) hidden)
-AntTargetsTab.14=&Sort targets
-AntTargetsTab.15=Buildfile does not exist
-AntTargetsTab.16=Buildfile specified is not a file
-AntTargetsTab.17=Target selection is not possible as buildfile location contains variable(s) that cannot be resolved until runtime.
-
-ContributedClasspathEntriesEntry.1=Additional Tasks & Support
-
-EditAntHomeEntryAction.1=Ant &Home...
-
-TargetOrderDialog.Order_Targets_1=Order Targets
-TargetOrderDialog.&Specify_target_execution_order__2=&Specify target execution order:
-TargetOrderDialog.&Up_3=&Up
-TargetOrderDialog.&Down_4=&Down
-
-AntEnvironmentTab.0=An environment can only be used when running in a separate JRE.\nThis setting can be configured on the JRE tab.

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java
deleted file mode 100644
index a42e701..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java
+++ /dev/null

@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-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.core.Task;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.ant.internal.ui.preferences.MessageDialogWithToggle;
-import org.eclipse.core.resources.IProject;
-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.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-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.IProcess;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.RefreshTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.SocketUtil;
-import org.eclipse.jface.preference.IPreferenceStore;
-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 extends LaunchConfigurationDelegate  {
-	
-	private static final String ANT_LOGGER_CLASS = "org.eclipse.ant.internal.ui.antsupport.logger.AntProcessBuildLogger"; //$NON-NLS-1$
-	private static final String NULL_LOGGER_CLASS = "org.eclipse.ant.internal.ui.antsupport.logger.NullBuildLogger"; //$NON-NLS-1$
-	private static final String REMOTE_ANT_LOGGER_CLASS = "org.eclipse.ant.internal.ui.antsupport.logger.RemoteAntBuildLogger"; //$NON-NLS-1$
-	private static final String BASE_DIR_PREFIX = "-Dbasedir="; //$NON-NLS-1$
-	private static final String INPUT_HANDLER_CLASS = "org.eclipse.ant.internal.ui.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;
-		}
-		
-		// migrate the config to the new classpath format if required
-		AntUtil.migrateToNewClasspathFormat(configuration);
-		
-		String vmTypeID= null;
-		try {
-			//check if set to run in a separate VM
-			vmTypeID = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(ce);			
-		}
-		
-		if (CommonTab.isLaunchInBackground(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);
-		StringBuffer idProperty = new StringBuffer("-D"); //$NON-NLS-1$
-		idProperty.append(AntProcess.ATTR_ANT_PROCESS_ID);
-		idProperty.append('=');
-		idProperty.append(idStamp);
-		
-		// resolve arguments
-		String[] arguments = ExternalToolsUtil.getArguments(configuration);
-		
-		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 = configureAntRunner(configuration, location, basedir, idProperty, arguments, userProperties, propertyFiles, targets, customClasspath, antHome);
-		}
-		 
-		monitor.worked(1);
-								
-		if (monitor.isCanceled()) {
-			return;
-		}
-		boolean captureOutput= ExternalToolsUtil.getCaptureOutput(configuration);
-		int port= -1;
-		if (vmTypeID != null && captureOutput) {
-			if (userProperties == null) {
-				userProperties= new HashMap();
-			}
-			port= SocketUtil.findFreePort();
-			userProperties.put(AntProcess.ATTR_ANT_PROCESS_ID, idStamp);
-			userProperties.put("eclipse.connect.port", Integer.toString(port)); //$NON-NLS-1$
-		}
-		StringBuffer commandLine= generateCommandLine(location, arguments, userProperties, propertyFiles, targets, antHome, basedir, vmTypeID != null, captureOutput);
-		
-		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, port, commandLine, captureOutput);
-		} else {
-			runInSameVM(configuration, launch, monitor, location, idStamp, runner, commandLine);
-		}
-		
-		monitor.done();	
-	}
-	
-	private void runInSameVM(ILaunchConfiguration configuration, ILaunch launch, IProgressMonitor monitor, IPath location, String idStamp, AntRunner runner, StringBuffer commandLine) throws CoreException {
-		Map attributes= new HashMap(2);
-		attributes.put(IProcess.ATTR_PROCESS_TYPE, IAntLaunchConfigurationConstants.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 (CommonTab.isLaunchInBackground(configuration)) {
-			final AntRunner finalRunner= runner;
-			Runnable r = new Runnable() {
-				public void run() {
-					try {
-						finalRunner.run(process);
-					} catch (CoreException e) {
-						handleException(e, AntLaunchConfigurationMessages.getString("AntLaunchDelegate.Failure")); //$NON-NLS-1$
-					}
-					process.terminated();
-				}
-			};
-			Thread background = new Thread(r);
-			background.start();
-			monitor.worked(1);
-			//refresh resources after process finishes
-			if (RefreshTab.getRefreshScope(configuration) != null) {
-				BackgroundResourceRefresher refresher = new BackgroundResourceRefresher(configuration, process);
-				refresher.startBackgroundRefresh();
-			}	
-		} else {
-			// execute the build 
-			try {
-				runner.run(monitor);
-			} catch (CoreException e) {
-				process.terminated();
-				monitor.done();
-				handleException(e,  AntLaunchConfigurationMessages.getString("AntLaunchDelegate.23")); //$NON-NLS-1$
-				return;
-			}
-			process.terminated();
-			
-			// refresh resources
-			RefreshTab.refreshResources(configuration, monitor);
-		}
-	}
-
-	private AntRunner configureAntRunner(ILaunchConfiguration configuration, IPath location, String baseDir, StringBuffer idProperty, String[] arguments, Map userProperties, String[] propertyFiles, String[] targets, URL[] customClasspath, String antHome) throws CoreException {
-		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.toString();
-		
-		AntRunner 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);
-		}
-		return runner;
-	}
-
-	private void handleException(final CoreException e, final String title) {
-		IPreferenceStore store= AntUIPlugin.getDefault().getPreferenceStore();
-		if (store.getBoolean(IAntUIPreferenceConstants.ANT_ERROR_DIALOG)) {
-			AntUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
-				public void run() {
-					MessageDialogWithToggle.openError(null, title, e.getMessage(), IAntUIPreferenceConstants.ANT_ERROR_DIALOG, AntLaunchConfigurationMessages.getString("AntLaunchDelegate.22"), AntUIPlugin.getDefault().getPreferenceStore()); //$NON-NLS-1$
-				}
-			});
-		}
-	}
-
-	private void setProcessAttributes(IProcess process, String idStamp, StringBuffer commandLine) {
-		// link the process to its build logger via a timestamp
-		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());
-		}
-		TaskLinkManager.registerAntBuild(process);
-	}
-
-	private StringBuffer generateCommandLine(IPath location, String[] arguments, Map userProperties, String[] propertyFiles, String[] targets, String antHome, String basedir, boolean separateVM, boolean captureOutput) {
-		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();
-		if (propertyFiles == null) { //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);
-				commandLine.append('\"');
-			}
-		} else {//"local" configuration
-			for (int i = 0; i < propertyFiles.length; i++) {
-				String path = propertyFiles[i];
-				commandLine.append(" -propertyfile \""); //$NON-NLS-1$
-				commandLine.append(path);
-				commandLine.append('\"');
-			}
-		}
-		//"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
-		List properties= null;
-		if (!separateVM) {
-			properties= prefs.getProperties();
-		} else {
-			properties= prefs.getRemoteAntProperties();
-		}
-		
-		String key;
-		for (Iterator iter = properties.iterator(); iter.hasNext();) {
-			Property property = (Property) iter.next();
-			key= property.getName();
-			String value= property.getValue();
-			//if we have user properties this means that the user has chosen to override the global properties
-			//if in a separate VM and have only two user properties these are really only Eclipse generated properties
-			//and the user is still using the global properties
-			if (value != null && (userProperties == null || (separateVM && userProperties.size() == 2))) {
-				appendProperty(commandLine, key, value);
-			}
-		}
-		
-		if (basedir != null && basedir.length() > 0) {
-			appendProperty(commandLine, "basedir", basedir); //$NON-NLS-1$
-		}
-		
-		if (antHome != null) {
-			commandLine.append(" \"-Dant.home="); //$NON-NLS-1$
-			commandLine.append(antHome);
-			commandLine.append('\"');
-		}
-		
-		if (separateVM) { 
-			if (commandLine.indexOf("-logger") == -1 && captureOutput) { //$NON-NLS-1$
-				commandLine.append(" -logger "); //$NON-NLS-1$
-				commandLine.append(REMOTE_ANT_LOGGER_CLASS);
-			}
-		} else {
-			commandLine.append(" -inputhandler "); //$NON-NLS-1$
-			commandLine.append(INPUT_HANDLER_CLASS);
-		
-			commandLine.append(" -logger "); //$NON-NLS-1$
-			if (captureOutput) {
-				commandLine.append(ANT_LOGGER_CLASS);
-			} else {
-				commandLine.append(NULL_LOGGER_CLASS);
-			}
-		}
-		
-		if (separateVM) {
-			appendTaskAndTypes(prefs, commandLine);
-		}
-		commandLine.append(" -buildfile \""); //$NON-NLS-1$
-		commandLine.append(location.toOSString());
-		commandLine.append('\"');
-		
-		if (targets != null) {
-			for (int i = 0; i < targets.length; i++) {
-				commandLine.append(" \""); //$NON-NLS-1$
-				commandLine.append(targets[i]);
-				commandLine.append('\"');
-			}
-		}
-		return commandLine;
-	}
-	
-	private void appendTaskAndTypes(AntCorePreferences prefs, StringBuffer commandLine) {
-		List tasks= prefs.getRemoteTasks();
-		Iterator itr= tasks.iterator();
-		while (itr.hasNext()) {
-			Task task = (Task) itr.next();
-			commandLine.append(" -eclipseTask "); //$NON-NLS-1$
-			commandLine.append(task.getTaskName());
-			commandLine.append(',');
-			commandLine.append(task.getClassName());
-		}
-		
-		List types= prefs.getRemoteTypes();
-		itr= types.iterator();
-		while (itr.hasNext()) {
-			Type type = (Type) itr.next();
-			commandLine.append(" -eclipseType "); //$NON-NLS-1$
-			commandLine.append(type.getTypeName());
-			commandLine.append(',');
-			commandLine.append(type.getClassName());
-		}
-	}
-
-	private void appendProperty(StringBuffer commandLine, String name, String value) {
-		commandLine.append(" \"-D"); //$NON-NLS-1$
-		commandLine.append(name);
-		commandLine.append('='); 
-		commandLine.append(value);
-		commandLine.append(" \""); //$NON-NLS-1$
-	}
-	
-	private void runInSeparateVM(ILaunchConfiguration configuration, ILaunch launch, IProgressMonitor monitor, String idStamp, int port, StringBuffer commandLine, boolean captureOutput) throws CoreException {
-		if (captureOutput) {
-			RemoteAntBuildListener client= new RemoteAntBuildListener(launch);
-			if (port != -1) {
-				client.startListening(port);
-			}
-		}
-		
-		ILaunchConfigurationWorkingCopy copy= configuration.getWorkingCopy();
-		copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, commandLine.toString());
-		
-		launch.setSourceLocator(new ISourceLocator() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(org.eclipse.debug.core.model.IStackFrame)
-			 */
-			public Object getSourceElement(IStackFrame stackFrame) {
-				return null;
-			}
-		});
-		//copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"); //$NON-NLS-1$
-		IProgressMonitor subMonitor= new SubProgressMonitor(monitor, 10);
-		AntJavaLaunchDelegate delegate= new AntJavaLaunchDelegate();
-		delegate.preLaunchCheck(copy, ILaunchManager.RUN_MODE, subMonitor);
-		delegate.launch(copy, ILaunchManager.RUN_MODE, launch, subMonitor);
-		final IProcess[] processes= launch.getProcesses();
-		for (int i = 0; i < processes.length; i++) {
-			setProcessAttributes(processes[i], idStamp, null);
-		}
-
-		if (CommonTab.isLaunchInBackground(configuration)) {
-			// refresh resources after process finishes
-			if (RefreshTab.getRefreshScope(configuration) != null) {
-				BackgroundResourceRefresher refresher = new BackgroundResourceRefresher(configuration, processes[0]);
-				refresher.startBackgroundRefresh();
-			}
-		} else {
-			final boolean[] terminated= new boolean[1];
-			terminated[0]= launch.isTerminated();
-			IDebugEventSetListener listener= new IDebugEventSetListener() {
-				public void handleDebugEvents(DebugEvent[] events) {
-					for (int i = 0; i < events.length; i++) {
-						DebugEvent event = events[i];
-						for (int j= 0, numProcesses= processes.length; j < numProcesses; j++) {
-							if (event.getSource() == processes[j] && event.getKind() == DebugEvent.TERMINATE) {
-								terminated[0]= true;
-								break;
-							}
-						}
-					}
-				}
-			};
-			DebugPlugin.getDefault().addDebugEventListener(listener);
-			monitor.subTask(AntLaunchConfigurationMessages.getString("AntLaunchDelegate.28")); //$NON-NLS-1$
-			while (!monitor.isCanceled() && !terminated[0]) {
-				try {
-					Thread.sleep(50);
-				} catch (InterruptedException e) {
-				}
-			}
-			DebugPlugin.getDefault().removeDebugEventListener(listener);
-			if (!monitor.isCanceled()) {
-				// refresh resources
-				RefreshTab.refreshResources(configuration, monitor);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getBuildOrder(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	protected IProject[] getBuildOrder(ILaunchConfiguration configuration, String mode) throws CoreException {
-		String scope = null;
-		try {
-			scope = configuration.getAttribute(AntBuildTab.ATTR_BUILD_SCOPE, (String)null);
-		} catch (CoreException e) {
-			return null;
-		}
-		if (scope == null) {
-			return null;
-		}
-		IProject[] projects = AntBuildTab.getBuildProjects(scope);
-		boolean isRef = AntBuildTab.isIncludeReferencedProjects(configuration);
-		if (isRef) {
-			return computeReferencedBuildOrder(projects);
-		}
-		return computeBuildOrder(projects);
-	}
-	
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java
deleted file mode 100644
index b1f7372..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java
+++ /dev/null

@@ -1,537 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     John-Mason P. Shackelford - bug 34548
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.launchConfigurations;
-
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.model.AntProjectNode;
-import org.eclipse.ant.internal.ui.editor.model.AntTargetNode;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-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.ui.CommonTab;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-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.jface.window.Window;
-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.editors.text.ILocationProvider;
-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;
-	private static final int MAX_TARGET_APPEND_LENGTH = 30;
-
-	/**
-	 * 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;
-				} else if (object instanceof AntElementNode){
-					launch((AntElementNode) object);
-					return;
-				}
-			}
-		}
-		antFileNotFound();
-	}
-	
-	/**
-	 * Launches the given Ant node, which can correspond to an Ant
-	 * target or an Ant project node.
-	 * 
-	 * @param node the Ant node to launch
-	 */
-	public void launch(AntElementNode node) {
-		String selectedTarget= null;
-		if (node instanceof AntTargetNode) {
-			AntTargetNode targetNode= (AntTargetNode) node;
-			if (targetNode.isDefaultTarget()) {
-				selectedTarget= ""; //$NON-NLS-1$
-			} else {
-				selectedTarget= targetNode.getTarget().getName();
-			}
-		} else if (node instanceof AntProjectNode) {
-			selectedTarget = ""; //$NON-NLS-1$
-		}
-	
-		if (selectedTarget == null) {
-			return;
-		}
-		IFile file= node.getIFile();
-		if (file != null) {
-			launch(file, ILaunchManager.RUN_MODE, selectedTarget);
-		} else { //external buildfile
-			String filePath= node.getFilePath();
-			if (filePath != null) {
-				launch(new Path(filePath), ILaunchManager.RUN_MODE, selectedTarget);
-			}
-		}
-	}
-	
-	/**
-	 * 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) {
-			antFileNotFound();
-		}
-		// ensure that the targets are selected in the launch configuration
-		try {
-			if (targetAttribute != null && ! targetAttribute.equals(configuration.getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, ""))) { //$NON-NLS-1$
-				String projectName= null;
-				try {
-					projectName= configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-				} catch (CoreException e) {
-				}
-				String newName= getNewLaunchConfigurationName(file.getFullPath(), projectName, targetAttribute);        
-				configuration= configuration.copy(newName);
-				((ILaunchConfigurationWorkingCopy) configuration).setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, targetAttribute);
-				if (fShowDialog) {
-					configuration= ((ILaunchConfigurationWorkingCopy) configuration).doSave();
-				}
-			}
-		} catch (CoreException exception) {
-			reportError(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Exception_launching"), new String[] {file.getName()}), exception); //$NON-NLS-1$
-			return;
-		}
-		if (fShowDialog) {
-			// Offer to save dirty editors before opening the dialog as the contents
-			// of an Ant editor often affect the contents of the dialog.
-			if (!DebugUITools.saveBeforeLaunch()) {
-				return;
-			}
-			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 {
-			DebugUITools.launch(configuration, mode);
-		}
-	}
-	
-	/**
-	 * Returns a unique name for a copy of the given launch configuration with the given
-	 * targets. The name seed is the same as the name for a new launch configuration with
-	 *   " [targetList]" appended to the end.
-	 * @param config
-	 * @param targetAttribute
-	 * @return
-	 */
-	public static String getNewLaunchConfigurationName(IPath filePath, String projectName, String targetAttribute) {
-		StringBuffer buffer = new StringBuffer();
-		if (projectName != null) {
-			buffer.append(projectName);
-			buffer.append(' ');
-			buffer.append(filePath.lastSegment());
-		} else {
-			buffer.append(filePath.toOSString());
-		}
-		
-		if (targetAttribute != null) {
-			buffer.append(" ["); //$NON-NLS-1$
-			if (targetAttribute.length() > MAX_TARGET_APPEND_LENGTH + 3) {
-				// The target attribute can potentially be a long, comma-separated list
-				// of target. Make sure the generated name isn't extremely long.
-				buffer.append(targetAttribute.substring(0, MAX_TARGET_APPEND_LENGTH));
-				buffer.append("..."); //$NON-NLS-1$
-			} else {
-				buffer.append(targetAttribute);
-			}
-			buffer.append(']');
-		}
-		
-		String name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(buffer.toString());
-		return name.toString();
-	}
-	
-	/**
-	 * Launch the given targets in the given build file. The targets are
-	 * launched in the given mode.
-	 * 
-	 * @param filePath the path to 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(IPath filePath, String mode, String targetAttribute) {
-		ILaunchConfiguration configuration= null;
-		if (verifyMode(mode)) {
-			List configurations = findExistingLaunchConfigurations(filePath);
-			if (configurations.isEmpty()) {
-				configuration = createDefaultLaunchConfiguration(filePath, null);
-			} else {
-				if (configurations.size() == 1) {
-					configuration= (ILaunchConfiguration)configurations.get(0);
-				} else {
-					configuration= chooseConfig(configurations);
-					if (configuration == null) {
-						// User cancelled selection
-						return;
-					}
-				}
-			}
-		}
-
-		if (configuration == null) {
-			antFileNotFound();
-		}
-		// ensure that the targets are selected in the launch configuration
-		try {
-			if (targetAttribute != null && ! targetAttribute.equals(configuration.getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, ""))) { //$NON-NLS-1$
-				String projectName= null;
-				try {
-					projectName= configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-				} catch (CoreException e) {
-				}
-				String newName= getNewLaunchConfigurationName(filePath, projectName, targetAttribute);		        
-				configuration= configuration.copy(newName);
-				((ILaunchConfigurationWorkingCopy) configuration).setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, targetAttribute);
-				if (fShowDialog) {
-					configuration= ((ILaunchConfigurationWorkingCopy) configuration).doSave();
-				}
-			}
-		} catch (CoreException exception) {
-			reportError(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Exception_launching"), new String[] {filePath.toFile().getName()}), exception); //$NON-NLS-1$
-			return;
-		}
-		if (fShowDialog) {
-			// Offer to save dirty editors before opening the dialog as the contents
-			// of an Ant editor often affect the contents of the dialog.
-			if (!DebugUITools.saveBeforeLaunch()) {
-				return;
-			}
-			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 {
-			DebugUITools.launch(configuration, mode);
-		}
-	}
-	
-	/**
-	 * 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() != IResource.FILE) {		
-			for (int i = 0; i < names.length; i++) {
-				String string = names[i];
-				file= parent.findMember(string);
-				if (file != null && file.getType() == IResource.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) {
-		return createDefaultLaunchConfiguration(file.getFullPath(), file.getProject());
-	}
-
-	/**
-	 * Creates and returns a default launch configuration for the given file path
-	 * and project.
-	 * 
-	 * @param filePath the path to the buildfile
-	 * @param project the project containing the buildfile or <code>null</code> if the
-	 * buildfile is not contained in a project (is external).
-	 * @return default launch configuration or <code>null</code> if one could not be created
-	 */
-	public static ILaunchConfiguration createDefaultLaunchConfiguration(IPath filePath, IProject project) {
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IAntLaunchConfigurationConstants.ID_ANT_LAUNCH_CONFIGURATION_TYPE);
-				
-		String projectName= project != null ? project.getName() : null;
-		String name = getNewLaunchConfigurationName(filePath, projectName, null);
-		try {
-			ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, name);
-			if (project != null) {
-				workingCopy.setAttribute(IExternalToolConstants.ATTR_LOCATION,
-						VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", filePath.toString())); //$NON-NLS-1$
-			} else {
-				workingCopy.setAttribute(IExternalToolConstants.ATTR_LOCATION, filePath.toString());
-			}
-			workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
-			// set default for common settings
-			CommonTab tab = new CommonTab();
-			tab.setDefaults(workingCopy);
-			tab.dispose();
-			
-			//set the project name so that the correct default VM install can be determined
-			if (project != null) {
-				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getName());
-			}
-			AntJRETab jreTab = new AntJRETab();
-			jreTab.setDefaults(workingCopy);
-			jreTab.dispose();
-			
-			return workingCopy.doSave();
-		} catch (CoreException e) {
-			reportError(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.2"), new String[]{filePath.toString()}), e); //$NON-NLS-1$
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a list of existing launch configuration for the given file.
-	 * 
-	 * @param file the buildfile resource
-	 * @return list of launch configurations
-	 */
-	public static List findExistingLaunchConfigurations(IFile file) {
-		IPath filePath = file.getLocation();
-		return findExistingLaunchConfigurations(filePath);
-	}
-	
-	/**
-	 * Returns a list of existing launch configuration for the given file.
-	 * 
-	 * @param filePath the fully qualified path for the buildfile
-	 * @return list of launch configurations
-	 */
-	public static List findExistingLaunchConfigurations(IPath filePath) {
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IAntLaunchConfigurationConstants.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.3"), e); //$NON-NLS-1$
-			}
-			if (configs != null && configs.length > 0) {
-				if (filePath == null) {
-					reportError(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.0"), 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 or <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(configs.toArray(new ILaunchConfiguration[configs.size()]));
-		dialog.setTitle(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.4")); //$NON-NLS-1$
-		dialog.setMessage(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.5")); //$NON-NLS-1$
-		dialog.setMultipleSelection(false);
-		int result = dialog.open();
-		labelProvider.dispose();
-		if (result == Window.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.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;
-		}
-		if (input instanceof ILocationProvider) {
-			IPath filePath= ((ILocationProvider)input).getPath(input);
-			if ("xml".equals(filePath.getFileExtension())) { //$NON-NLS-1$
-				launch(filePath, mode, null);
-				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;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcutWithDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcutWithDialog.java
deleted file mode 100644
index a6db727..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcutWithDialog.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-public class AntLaunchShortcutWithDialog extends AntLaunchShortcut {
-	
-	/**
-	 * Creates a new Ant launch shortcut that will open the
-	 * launch configuration dialog.
-	 */
-	public AntLaunchShortcutWithDialog() {
-		super();
-		setShowDialog(true);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntMainTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntMainTab.java
deleted file mode 100644
index 5e2f2b8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntMainTab.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.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;
-	private String currentLocation= null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-		try {
-			currentLocation= configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, (String)null);
-		} catch (CoreException e) {
-		}
-		updateCaptureOutput(configuration);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		super.performApply(configuration);
-		try {
-			//has the location changed
-			String newLocation= configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, (String)null);
-			if (newLocation != null) {
-				if (!newLocation.equals(currentLocation)) {
-					updateTargetsTab();
-					currentLocation= newLocation;
-				}
-			} else if (currentLocation != null){
-				updateTargetsTab();
-				currentLocation= newLocation;
-			}
-		} catch (CoreException e) {
-		}
-		setAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, configuration, captureOutputButton.getSelection(), true);
-	}
-
-	/* (non-Javadoc)
-	 * @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 = 1;
-		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);
-		createCaptureOutputComponent(mainComposite);
-		Dialog.applyDialogFont(parent);
-	}
-	
-	/**
-	 * 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 = createCheckButton(parent, AntLaunchConfigurationMessages.getString("AntMainTab.Capture_&output_1")); //$NON-NLS-1$
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		captureOutputButton.setLayoutData(data);
-		captureOutputButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-	
-	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);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsMainTab#handleWorkspaceLocationButtonSelected()
-	 */
-	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();
-		IStructuredSelection result = dialog.getResult();
-		if (result == null) {
-			return;
-		}
-		Object file= result.getFirstElement();
-		if (file instanceof IFile) {
-			locationField.setText(VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", ((IFile)file).getFullPath().toString())); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsMainTab#getWorkingDirectoryLabel()
-	 */
-	protected String getWorkingDirectoryLabel() {
-		return AntLaunchConfigurationMessages.getString("AntMainTab.Base_&Directory__3"); //$NON-NLS-1$
-	}
-	
-	private void updateTargetsTab() {
-		//the location has changed...set the targets tab to 
-		//need to be recomputed
-		ILaunchConfigurationTab[] tabs=  getLaunchConfigurationDialog().getTabs();
-		for (int i = 0; i < tabs.length; i++) {
-			ILaunchConfigurationTab tab = tabs[i];
-			if (tab instanceof AntTargetsTab) {
-				((AntTargetsTab)tab).setDirty(true);
-				break;
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsMainTab#getLocationLabel()
-	 */
-	protected String getLocationLabel() {
-		return AntLaunchConfigurationMessages.getString("AntMainTab.6"); //$NON-NLS-1$
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntProcess.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntProcess.java
deleted file mode 100644
index 13cedf0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntProcess.java
+++ /dev/null

@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugEvent;
-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() {
-		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() {
-		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
-	 */
-	public 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/internal/ui/launchConfigurations/AntPropertiesTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntPropertiesTab.java
deleted file mode 100644
index ada0ae7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntPropertiesTab.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.preferences.AntPropertiesBlock;
-import org.eclipse.ant.internal.ui.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.debug.ui.ILaunchConfigurationTab;
-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;
-
-/**
- * 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 Button useDefaultButton;
-	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);
-		
-		createChangeProperties(top);
-		antPropertiesBlock.createControl(top, AntLaunchConfigurationMessages.getString("AntPropertiesTab.&Properties__6"), AntLaunchConfigurationMessages.getString("AntPropertiesTab.Property_f&iles__7")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private void createChangeProperties(Composite top) {
-		Font font= top.getFont();
-		Composite changeProperties= new Composite(top, SWT.NONE);
-		changeProperties.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		changeProperties.setLayout(layout);
-		changeProperties.setFont(font);
-		
-		useDefaultButton= createCheckButton(changeProperties, AntLaunchConfigurationMessages.getString("AntPropertiesTab.6")); //$NON-NLS-1$
-		useDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				toggleUseDefaultProperties();
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}		
-		
-	private void toggleUseDefaultProperties() {
-		boolean enable= !useDefaultButton.getSelection();
-		antPropertiesBlock.setEnabled(enable);
-	}
-	
-	/**
-	 * @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(IAntLaunchConfigurationConstants.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(IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTY_FILES, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(AntLaunchConfigurationMessages.getString("AntPropertiesTab.Error_reading_configuration_9"), ce); //$NON-NLS-1$
-		}
-		
-		if (properties == null && propertyFiles == null) {
-			antPropertiesBlock.setTablesEnabled(false);
-			useDefaultButton.setSelection(true);
-		} else {
-			useDefaultButton.setSelection(false);
-			antPropertiesBlock.populatePropertyViewer(properties);
-		
-			String[] files= AntUtil.parseString(propertyFiles, ","); //$NON-NLS-1$
-			antPropertiesBlock.setPropertyFilesInput(files);
-		}
-		
-		toggleUseDefaultProperties();
-	}
-	
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		if (useDefaultButton.getSelection()) {
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTIES, (Map)null);
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTY_FILES, (String)null);
-			return;
-		}
-				
-		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(false));
-			}
-		}
-		
-		configuration.setAttribute(IAntLaunchConfigurationConstants.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(IAntLaunchConfigurationConstants.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.internal.ui.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.internal.ui.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.internal.ui.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.internal.ui.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public void update() {
-		updateTargetsTab();
-		updateLaunchConfigurationDialog();
-	}
-	
-	private void updateTargetsTab() {
-		//the properties have changed...set the targets tab to 
-		//need to be recomputed
-		ILaunchConfigurationTab[] tabs=  getLaunchConfigurationDialog().getTabs();
-		for (int i = 0; i < tabs.length; i++) {
-			ILaunchConfigurationTab tab = tabs[i];
-			if (tab instanceof AntTargetsTab) {
-				((AntTargetsTab)tab).setDirty(true);
-				break;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntStreamMonitor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntStreamMonitor.java
deleted file mode 100644
index 4508061..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/launchConfigurations/AntStreamsProxy.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntStreamsProxy.java
deleted file mode 100644
index b433728..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntStreamsProxy.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.internal.ui.launchConfigurations;
-
-
-import org.eclipse.ant.internal.ui.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) {
-	}
-
-	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/internal/ui/launchConfigurations/AntTabGroup.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTabGroup.java
deleted file mode 100644
index e7c2f91..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTabGroup.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.internal.ui.launchConfigurations;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.RefreshTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-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(),
-			new RefreshTab(),
-			new AntBuildTab(),
-			new AntTargetsTab(),
-			new AntClasspathTab(),
-			new AntPropertiesTab(),
-			new AntJRETab(),
-			new AntEnvironmentTab(),
-			new CommonTab()
-		};
-		setTabs(tabs);
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		//set default name for script
-		IResource resource = DebugUITools.getSelectedResource();
-		if (resource != null && resource instanceof IFile) {
-			IFile file = (IFile)resource;
-			String extension = file.getFileExtension();
-			if (extension != null && extension.equalsIgnoreCase("xml")) { //$NON-NLS-1$
-				String projectName= file.getProject().getName();
-				StringBuffer buffer = new StringBuffer(projectName);
-				buffer.append(' ');
-				buffer.append(file.getName());
-				String name = buffer.toString().trim();
-				name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name);
-				configuration.rename(name);
-				//set the project name so that the correct default VM install can be determined
-				configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
-				configuration.setAttribute(IExternalToolConstants.ATTR_LOCATION,
-						VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", file.getFullPath().toString())); //$NON-NLS-1$
-			}		
-		}
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
-		super.setDefaults(configuration);
-	}	
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetContentProvider.java
deleted file mode 100644
index 0e71bbd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetContentProvider.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.internal.ui.launchConfigurations;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.core.TargetInfo;
-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;
-	private boolean fFilterInternalTargets= false;
-	private int fNumFilteredTargets= 0;
-	private int fNumTotalTargets= 0;
-
-	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) {
-		fNumTotalTargets= elements.size();
-		fNumFilteredTargets= 0;
-		if (fNumTotalTargets == 0) {
-			return new Object[0];
-		}
-		if (!fFilterInternalTargets) {
-			return elements.toArray(new Object[fNumTotalTargets]);
-		}
-		Iterator iter= elements.iterator();
-		while (iter.hasNext()) { 
-			if (isInternal((TargetInfo) iter.next())) {
-				fNumFilteredTargets++;
-			}
-		}
-		Object[] targets= new Object[getNumTargets()];
-		iter= elements.iterator();
-		int i= 0;
-		while (iter.hasNext()) {
-			TargetInfo target= (TargetInfo) iter.next(); 
-			if (!isInternal(target)) {
-				targets[i++]= target;  
-			}
-		}
-		return targets;
-	}
-	
-	/**
-	 * Returns whether the given target is an internal target. Internal
-	 * targets are targets which has no description. The default target
-	 * is never considered internal.
-	 * @param target the target to examine
-	 * @return whether the given target is an internal target
-	 */
-	public boolean isInternal(TargetInfo target) {
-		return !target.isDefault() && target.getDescription() == null;
-	}
-
-	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);
-	}
-	
-	/**
-	 * Returns the number of targets filtered out of the list
-	 * of targets last returned by this content provider
-	 * @return the number of targets filtered out of the last request
-	 *  for targets
-	 */
-	public int getNumFiltered() {
-		return fNumFilteredTargets;
-	}
-	
-	/**
-	 * Returns the number of targets returned the last time this content
-	 * provider was queried. If targets were filtered out, those targets are
-	 * not included in this count.
-	 * @return the number of targets returned the last time targets
-	 *  were requested
-	 */
-	public int getNumTargets() {
-		return fNumTotalTargets - fNumFilteredTargets;
-	}
-	
-	/**
-	 * Sets whether this content provider should filter out internal targets.
-	 * Internal targets are targets which have no description. If set <code>true</code>,
-	 * targets with no description will not be returned when getElements() is called.
-	 * @param filter sets whether internal targets should be filtered out
-	 */
-	public void setFilterInternalTargets(boolean filter) {
-		fFilterInternalTargets= filter;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java
deleted file mode 100644
index 7e65ac2..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java
+++ /dev/null

@@ -1,766 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-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.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-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.model.IExternalToolConstants;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Launch configuration tab which allows the user to choose the targets
- * from an Ant buildfile that will be executed when the configuration is
- * launched.
- */
-public class AntTargetsTab extends AbstractLaunchConfigurationTab {
-	
-	private TargetInfo fDefaultTarget = null;
-	private TargetInfo[] fAllTargets= null;
-	private List fOrderedTargets = null;
-	
-	private CheckboxTableViewer fTableViewer = null;
-	private Label fSelectionCountLabel = null;
-	private Text fTargetOrderText = null;
-	private Button fOrderButton = null;
-	private Button fFilterInternalTargets;
-	private Button fSortButton;
-	
-	private ILaunchConfiguration fLaunchConfiguration;
-	private AntTargetContentProvider fTargetContentProvider;
-	private int fSortDirection= 0;
-	private boolean fInitializing= false;
-	
-	/**
-	 * Sort direction constants.
-	 */
-	public static int SORT_NONE= 0;
-	public static int SORT_NAME= 1;
-	public static int SORT_NAME_REVERSE= -1;
-	public static int SORT_DESCRIPTION= 2;
-	public static int SORT_DESCRIPTION_REVERSE= -2;
-	
-	/**
-	 * A sorter which can sort targets by name or description, in
-	 * forward or reverse order.
-	 */
-	private class AntTargetsSorter extends 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) {
-			if (!(e1 instanceof TargetInfo && e2 instanceof TargetInfo)) {
-				return super.compare(viewer, e1, e2);
-			}
-			if (fSortDirection == SORT_NONE) {
-				return 0;
-			}
-			String string1, string2;
-			int result= 0;
-			if (fSortDirection == SORT_NAME || fSortDirection == SORT_NAME_REVERSE) {
-				string1= ((TargetInfo) e1).getName();
-				string2= ((TargetInfo) e2).getName();
-			} else {
-				string1= ((TargetInfo) e1).getDescription();
-				string2= ((TargetInfo) e2).getDescription();
-			}
-			if (string1 != null && string2 != null) {
-				result= getCollator().compare(string1, string2);
-			} else if (string1 == null) {
-				result= 1;
-			} else if (string2 == null) {
-				result= -1;
-			}
-			if (fSortDirection < 0) { // reverse sort
-				if (result == 0) {
-					result= -1;
-				} else {
-					result= -result;
-				}
-			}
-			return result;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @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);
-		
-		createTargetsTable(comp);
-		createSelectionCount(comp);
-		
-		Composite buttonComposite= new Composite(comp, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.verticalSpacing = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonComposite.setLayout(layout);
-		buttonComposite.setFont(font);
-		
-		createSortTargets(buttonComposite);
-		createFilterInternalTargets(buttonComposite);
-		
-		createVerticalSpacer(comp, 1);
-		createTargetOrder(comp);
-		Dialog.applyDialogFont(parent);
-	}
-	
-	/**
-	 * Creates the selection count widget
-	 * @param parent the parent composite
-	 */
-	private void createSelectionCount(Composite parent) {
-		fSelectionCountLabel = new Label(parent, SWT.NONE);
-		fSelectionCountLabel.setFont(parent.getFont());
-		fSelectionCountLabel.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.0_out_of_0_selected_2")); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		fSelectionCountLabel.setLayoutData(gd);
-	}
-
-	/**
-	 * Creates the widgets that display the target order
-	 * @param parent the parent composite
-	 */
-	private void createTargetOrder(Composite parent) {
-		Font font= parent.getFont();
-		
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Target_execution_order__3")); //$NON-NLS-1$
-		label.setFont(font);
-		
-		Composite orderComposite = new Composite(parent, SWT.NONE);
-		GridData 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();
-			}
-		});
-	}
-
-	/**
-	 * Creates the toggle to filter internal targets from the table
-	 * @param parent the parent composite
-	 */
-	private void createFilterInternalTargets(Composite parent) {
-		fFilterInternalTargets= createCheckButton(parent, AntLaunchConfigurationMessages.getString("AntTargetsTab.12")); //$NON-NLS-1$
-		fFilterInternalTargets.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleFilterTargetsSelected();
-			}
-		});
-	}
-	
-	/**
-	 * Creates the toggle to sort targets in the table
-	 * @param parent the parent composite
-	 */
-	private void createSortTargets(Composite parent) {
-		fSortButton= createCheckButton(parent, AntLaunchConfigurationMessages.getString("AntTargetsTab.14")); //$NON-NLS-1$
-		fSortButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSortTargetsSelected();
-			}
-		});
-	}
-	
-	/**
-	 * The filter targets button has been toggled. If it's been
-	 * turned on, filter out internal targets. Else, restore internal
-	 * targets to the table.
-	 */
-	private void handleFilterTargetsSelected() {
-		boolean filter= fFilterInternalTargets.getSelection();
-		fTargetContentProvider.setFilterInternalTargets(filter);
-		if (filter) {
-			ListIterator iter= fOrderedTargets.listIterator();
-			while (iter.hasNext()) {
-				TargetInfo target= (TargetInfo) iter.next();
-				if (fTargetContentProvider.isInternal(target)) {
-					iter.remove();
-				}
-			}
-		}
-		fTableViewer.refresh();
-		// Must refresh before updating selection count because the selection
-		// count's "hidden" reporting needs the content provider to be queried
-		// first to count how many targets are hidden.
-		updateSelectionCount();
-		updateLaunchConfigurationDialog();
-	}
-	
-	/**
-	 * The button to sort targets has been toggled.
-	 * Set the tab's sorting as appropriate.
-	 */
-	private void handleSortTargetsSelected() {
-		setSort(fSortButton.getSelection() ? SORT_NAME : SORT_NONE);
-	}
-	
-	/**
-	 * Sets the sorting of targets in this tab. See the sort constants defined
-	 * above.
-	 * 
-	 * @param column the column which should be sorted on
-	 */
-	private void setSort(int column) {
-		fSortDirection= column;
-		fTableViewer.refresh();
-		if (!fInitializing) {
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	/**
-	 * The target order button has been pressed. Prompt the
-	 * user to reorder the selected targets. 
-	 */
-	private void handleOrderPressed() {
-		TargetOrderDialog dialog = new TargetOrderDialog(getShell(), fOrderedTargets.toArray());
-		int ok = dialog.open();
-		if (ok == Window.OK) {
-			fOrderedTargets.clear();
-			Object[] targets = dialog.getTargets();
-			for (int i = 0; i < targets.length; i++) {
-				fOrderedTargets.add(targets[i]);
-				updateSelectionCount();
-				updateLaunchConfigurationDialog();
-			}
-		}
-	}
-	
-	/**
-	 * Creates the table which displays the available targets
-	 * @param parent the parent composite
-	 */
-	private void createTargetsTable(Composite parent) {
-		Font font= parent.getFont();
-		Label label = new Label(parent, SWT.NONE);
-		label.setFont(font);
-		label.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Check_targets_to_e&xecute__1")); //$NON-NLS-1$
-				
-		Table table= new Table(parent, SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.RESIZE);
-		
-		GridData data= new GridData(GridData.FILL_BOTH);
-		int availableRows= availableRows(parent);
-		data.heightHint = table.getItemHeight() * (availableRows / 20);
-		data.widthHint= 250;
-		table.setLayoutData(data);
-		table.setFont(font);
-				
-		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());
-		fTargetContentProvider= new AntTargetContentProvider();
-		fTableViewer.setContentProvider(fTargetContentProvider);
-		fTableViewer.setSorter(new AntTargetsSorter());
-		
-		fTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				ISelection selection= event.getSelection();
-				if (!selection.isEmpty() && 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());
-			}
-		});
-		
-		TableColumn[] columns= fTableViewer.getTable().getColumns();
-		for (int i = 0; i < columns.length; i++) {
-			final int index= i;
-			columns[index].addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (fSortButton.getSelection()) {
-						// index 0 => sort_name (1)
-						// index 1 => sort_description (2)
-						int column= index + 1;
-						if (column == fSortDirection) {
-							column= -column; // invert the sort when the same column is selected twice in a row
-						}
-						setSort(column);
-					}
-				}
-			});
-		}
-	}
-	
-	/**
-	 * Return the number of rows available in the current display using the
-	 * current font.
-	 * @param parent The Composite whose Font will be queried.
-	 * @return int The result of the display size divided by the font size.
-	 */
-	private int availableRows(Composite parent) {
-
-		int fontHeight = (parent.getFont().getFontData())[0].getHeight();
-		int displayHeight = parent.getDisplay().getClientArea().height;
-
-		return displayHeight / fontHeight;
-	}
-	
-	/**
-	 * Updates the ordered targets list in response to an element being checked
-	 * or unchecked. When the element is checked, it's added to the list. When
-	 * unchecked, it's removed.
-	 * 
-	 * @param element the element in question
-	 * @param checked whether the element has been checked or unchecked
-	 */
-	private void updateOrderedTargets(Object element , boolean checked) {
-		if (checked) {
-			 fOrderedTargets.add(element);
-		} else {
-			fOrderedTargets.remove(element);
-		}	 
-		updateSelectionCount();
-		updateLaunchConfigurationDialog();	
-	}
-	
-	/**
-	 * Updates the selection count widget to display how many targets are
-	 * selected (example, "1 out of 6 selected").
-	 */
-	private void updateSelectionCount() {
-		Object[] checked = fTableViewer.getCheckedElements();
-		String numSelected = Integer.toString(checked.length);
-		int length= fTargetContentProvider.getNumTargets();
-		String total = Integer.toString(length);
-		int numHidden= fTargetContentProvider.getNumFiltered();
-		if (numHidden > 0) {
-			fSelectionCountLabel.setText(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntTargetsTab.13"), new String[]{numSelected, total, String.valueOf(numHidden)})); //$NON-NLS-1$
-		} else {
-			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());
-	}
-	
-	/**
-	 * Returns all targets in the buildfile.
-	 * @return all targets in the buildfile
-	 */
-	private TargetInfo[] getTargets() {
-		if (fAllTargets == null || isDirty()) {
-			fAllTargets= null;
-			setDirty(false);
-			setErrorMessage(null);
-			setMessage(null);
-			
-			final String expandedLocation= validateLocation();
-			if (expandedLocation == null) {
-				return fAllTargets;
-			}
-			final CoreException[] exceptions= new CoreException[1];
-			try {
-				final String[] arguments = AntUtil.parseString(fLaunchConfiguration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, (String) null), ","); //$NON-NLS-1$
-				IRunnableWithProgress operation= new IRunnableWithProgress() {
-					/* (non-Javadoc)
-					 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-					 */
-					public void run(IProgressMonitor monitor) {
-						try {
-							fAllTargets = AntUtil.getTargets(expandedLocation, arguments, fLaunchConfiguration);
-						} catch (CoreException ce) {
-							exceptions[0]= ce;
-						}
-					}
-				};
-				
-				getLaunchConfigurationDialog().run(false, false, operation);
-			} catch (CoreException ce) {
-				exceptions[0]= ce;
-			} catch (InvocationTargetException e) {
-			} catch (InterruptedException e) {
-			}
-			
-			if (exceptions[0] != null) {
-				IStatus exceptionStatus= exceptions[0].getStatus();
-				IStatus[] children= exceptionStatus.getChildren();
-				StringBuffer message= new StringBuffer(exceptions[0].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;
-				}
-			}
-		}
-		
-		return fAllTargets;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		fInitializing= true;
-		fLaunchConfiguration= configuration;
-		setErrorMessage(null);
-		setMessage(null);
-		setDirty(true);
-		boolean hideInternal= false;
-		try {
-			hideInternal = fLaunchConfiguration.getAttribute(IAntLaunchConfigurationConstants.ATTR_HIDE_INTERNAL_TARGETS, false);
-		} catch (CoreException e) {
-			AntUIPlugin.log(e);
-		}
-		fFilterInternalTargets.setSelection(hideInternal);
-		fTargetContentProvider.setFilterInternalTargets(hideInternal);
-		int sort= SORT_NONE;
-		try {
-			sort = fLaunchConfiguration.getAttribute(IAntLaunchConfigurationConstants.ATTR_SORT_TARGETS, sort);
-		} catch (CoreException e) {
-			AntUIPlugin.log(e);
-		}
-		fSortButton.setSelection(sort != SORT_NONE);
-		setSort(sort);
-		String configTargets= null;
-		String newLocation= null;
-		fOrderedTargets = new ArrayList();
-		try {
-			configTargets= configuration.getAttribute(IAntLaunchConfigurationConstants.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;
-			initializeForNoTargets();
-			return; 
-		}
-		
-		TargetInfo[] allInfos= getTargets();
-		if (allInfos == null) {
-			initializeForNoTargets();
-			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();
-				updateLaunchConfigurationDialog();
-			}
-			fInitializing= false;
-			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();
-		fInitializing= false;
-	}
-	
-	private void initializeForNoTargets() {
-		setExecuteInput(new TargetInfo[0]);
-		fTableViewer.setInput(new TargetInfo[0]);
-		fInitializing= false;
-	}
-
-	/**
-	 * Sets the execute table's input to the given input.
-	 */
-	private void setExecuteInput(Object input) {
-		fTableViewer.setInput(input);
-		updateSelectionCount();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		//	attribute added in 3.0, so null must be used instead of false for backwards compatibility
-		if (fFilterInternalTargets.getSelection()) {
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_HIDE_INTERNAL_TARGETS, true);
-		} else {
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_HIDE_INTERNAL_TARGETS, (String)null);
-		}
-		//attribute added in 3.0, so null must be used instead of 0 for backwards compatibility
-		if (fSortDirection != SORT_NONE) {
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_SORT_TARGETS, fSortDirection);
-		} else {
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_SORT_TARGETS, (String)null);
-		}
-		
-		if (fOrderedTargets.size() == 1) {
-			TargetInfo item = (TargetInfo)fOrderedTargets.get(0);
-			if (item.isDefault()) {
-				configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, (String)null);
-				return;
-			}
-		} else if (fOrderedTargets.size() == 0) {
-			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, (String)null);
-			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(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, targets);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return AntLaunchConfigurationMessages.getString("AntTargetsTab.Tar&gets_14"); //$NON-NLS-1$
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_TAB_ANT_TARGETS);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		if (fAllTargets == null || isDirty()) {
-			if (getErrorMessage() != null && !isDirty()) {
-				//error in parsing;
-				return false;
-			} 
-			//targets not up to date and no error message...we have not parsed recently
-			initializeFrom(launchConfig);
-			if (getErrorMessage() != null) {
-				//error in parsing;
-				return false;
-			}
-		}
-		
-		if (fAllTargets != null && fTableViewer.getCheckedElements().length == 0) {
-			setErrorMessage(AntLaunchConfigurationMessages.getString("AntTargetsTab.No_targets")); //$NON-NLS-1$
-			return false;
-		}
-		setErrorMessage(null);
-		return super.isValid(launchConfig);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setDirty(boolean)
-	 */
-	protected void setDirty(boolean dirty) {
-		//provide package visibility
-		super.setDirty(dirty);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		if (isDirty()) {
-			super.activated(workingCopy);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
-		if (fOrderedTargets.size() == 0) {
-			//set the dirty flag so that the state will be reinitialized on activation
-			setDirty(true);
-		}
-	}
-	
-	private String validateLocation() {
-		String expandedLocation= null;
-		String location= null;
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		try {
-			location= fLaunchConfiguration.getAttribute(IExternalToolConstants.ATTR_LOCATION, (String)null);
-			if (location == null) {
-				return null;
-			}
-			
-			expandedLocation= manager.performStringSubstitution(location);
-			if (expandedLocation == null) {
-				return null;
-			}
-			File file = new File(expandedLocation);
-			if (!file.exists()) {
-				setErrorMessage(AntLaunchConfigurationMessages.getString("AntTargetsTab.15")); //$NON-NLS-1$
-				return null;
-			}
-			if (!file.isFile()) {
-				setErrorMessage(AntLaunchConfigurationMessages.getString("AntTargetsTab.16")); //$NON-NLS-1$
-				return null;
-			}
-			
-			return expandedLocation;
-			
-		} catch (CoreException e1) {
-			if (location != null) {
-				try {
-					manager.validateStringVariables(location);
-					setMessage(AntLaunchConfigurationMessages.getString("AntTargetsTab.17")); //$NON-NLS-1$
-					return null;
-				} catch (CoreException e2) {//invalid variable
-					setErrorMessage(e2.getStatus().getMessage());
-					return null;
-				}
-			}
-			
-			setErrorMessage(e1.getStatus().getMessage());
-			return null;
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java
deleted file mode 100644
index bae0b28..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java
+++ /dev/null

@@ -1,119 +0,0 @@
-package org.eclipse.ant.internal.ui.launchConfigurations;
-
-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.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
-
-
-public class AntWorkingDirectoryBlock extends WorkingDirectoryBlock {
-	
-	private String fDefaultWorkingDirPath;
-
-	public String getDefaultWorkingDirPath() {
-		return fDefaultWorkingDirPath;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock#setDefaultWorkingDir()
-	 */
-	protected void setDefaultWorkingDir() {
-		if (fDefaultWorkingDirPath == null) {
-			super.setDefaultWorkingDir();
-			return;
-		}
-		fWorkingDirText.setText(fDefaultWorkingDirPath);
-		fLocalDirButton.setSelection(true);
-		fWorkspaceDirButton.setSelection(false);		
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		setLaunchConfiguration(configuration);
-		try {
-			try {
-				fDefaultWorkingDirPath= ExternalToolsUtil.getLocation(configuration).removeLastSegments(1).toOSString();
-			} catch (CoreException e) {
-				//no location
-			}
-			
-			String wd = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null); //$NON-NLS-1$
-			fWorkspaceDirText.setText(""); //$NON-NLS-1$
-			fWorkingDirText.setText(""); //$NON-NLS-1$
-			if (wd == null || isSameAsDefault(wd)) {
-				fUseDefaultWorkingDirButton.setSelection(true);
-			} else {
-				IPath path = new Path(wd);
-				if (path.isAbsolute()) {
-					fWorkingDirText.setText(wd);
-					fLocalDirButton.setSelection(true);
-					fWorkspaceDirButton.setSelection(false);
-				} else {
-					fWorkspaceDirText.setText(wd);
-					fWorkspaceDirButton.setSelection(true);
-					fLocalDirButton.setSelection(false);
-				}
-				fUseDefaultWorkingDirButton.setSelection(false);
-			}
-			handleUseDefaultWorkingDirButtonSelected();
-		} catch (CoreException e) {
-			setErrorMessage(LauncherMessages.getString("JavaArgumentsTab.Exception_occurred_reading_configuration___15") + e.getStatus().getMessage()); //$NON-NLS-1$
-			JDIDebugUIPlugin.log(e);
-		}
-	}
-	
-	private boolean isSameAsDefault(String workingDir) {
-		return workingDir == null || (workingDir.equals(fDefaultWorkingDirPath) || workingDir.equals(System.getProperty("user.dir"))); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		String wd = getCurrentWorkingDirectory();
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, wd);
-	}
-	
-	private String getCurrentWorkingDirectory() {
-		String wd = null;
-		if (isLocalWorkingDirectory()) {
-			wd = getAttributeValueFrom(fWorkingDirText);
-		} else {
-			IPath path = new Path(fWorkspaceDirText.getText());
-			path = path.makeRelative();
-			wd = path.toString();
-		} 
-		
-		return wd;
-	}
-
-	public void setEnabled(boolean enabled) {
-		fUseDefaultWorkingDirButton.setEnabled(enabled);
-		if(!isDefaultWorkingDirectory() && enabled) {
-			boolean local = isLocalWorkingDirectory();
-			fWorkingDirText.setEnabled(local);
-			fWorkingDirBrowseButton.setEnabled(local);
-			fLocalDirButton.setEnabled(true);
-			fWorkspaceDirText.setEnabled(!local);
-			fWorkspaceDirBrowseButton.setEnabled(!local);
-			fWorkspaceDirButton.setEnabled(true);
-		} else {
-			fWorkingDirText.setEnabled(false);
-			fWorkingDirBrowseButton.setEnabled(false);
-			fWorkspaceDirText.setEnabled(false);
-			fWorkspaceDirBrowseButton.setEnabled(false);
-			fLocalDirButton.setEnabled(false);
-			fWorkspaceDirButton.setEnabled(false);
-			fUseDefaultWorkingDirButton.setSelection(isSameAsDefault(getCurrentWorkingDirectory()));
-		}
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/ContributedClasspathEntriesEntry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/ContributedClasspathEntriesEntry.java
deleted file mode 100644
index cdc8aca..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/ContributedClasspathEntriesEntry.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-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.IAntClasspathEntry;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.internal.launching.AbstractRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A classpath entry that contains a contributed classpath entries
- * via the <code>extraClasspathEntries</code> extension point.
- * 
- * @since 3.0 
- */
-public class ContributedClasspathEntriesEntry extends AbstractRuntimeClasspathEntry {
-	
-	public static final String TYPE_ID = "org.eclipse.ant.ui.classpathentry.extraClasspathEntries"; //$NON-NLS-1$
-		
-	/**
-	 * Default contructor required to instantiate persisted extensions.
-	 */
-	public ContributedClasspathEntriesEntry() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.launching.AbstractRuntimeClasspathEntry#buildMemento(org.w3c.dom.Document, org.w3c.dom.Element)
-	 */
-	protected void buildMemento(Document document, Element memento) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.launching.IRuntimeClasspathEntry2#initializeFrom(org.w3c.dom.Element)
-	 */
-	public void initializeFrom(Element memento) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getTypeId()
-	 */
-	public String getTypeId() {
-		return TYPE_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException {
-		boolean separateVM= (null != configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null));
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		IAntClasspathEntry[] antClasspathEntries = prefs.getContributedClasspathEntries();
-		IAntClasspathEntry[] userEntries = prefs.getAdditionalClasspathEntries();
-		List rtes = new ArrayList(antClasspathEntries.length + userEntries.length);
-		IAntClasspathEntry entry;
-		for (int i = 0; i < antClasspathEntries.length; i++) {
-			 entry= antClasspathEntries[i];
-			if (!separateVM || (separateVM && !entry.isEclipseRuntimeRequired())) {
-				rtes.add(JavaRuntime.newStringVariableClasspathEntry(entry.getLabel()));
-			}
-		}
-		boolean haveToolsEntry= false;
-		String path;
-		for (int i = 0; i < userEntries.length; i++) {
-			entry = userEntries[i];
-			path= entry.getEntryURL().getPath();
-			if (path.endsWith("tools.jar")) { //$NON-NLS-1$
-				haveToolsEntry= true;
-				// replace with dynamically resolved tools.jar based on
-				// the JRE being used
-				addToolsJar(configuration, rtes, path);
-			} else {
-				rtes.add(JavaRuntime.newStringVariableClasspathEntry(entry.getLabel()));
-			}
-		}
-		if (!haveToolsEntry) {
-			addToolsJar(configuration, rtes, null);
-		}
-		return (IRuntimeClasspathEntry[]) rtes.toArray(new IRuntimeClasspathEntry[rtes.size()]);
-	}
-	
-	private void addToolsJar(ILaunchConfiguration configuration, List rtes, String path) {
-		IRuntimeClasspathEntry tools = getToolsJar(configuration);
-		if (tools == null) {
-			if (path != null) {
-				//use the global entry
-				rtes.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(path)));
-			} else {
-				//use the default vm install to try to find a tools.jar
-				IVMInstall install= JavaRuntime.getDefaultVMInstall();
-				if (install != null) {
-					IAntClasspathEntry entry = AntCorePlugin.getPlugin().getPreferences().getToolsJarEntry(new Path(install.getInstallLocation().getAbsolutePath()));
-					if (entry != null) {
-						rtes.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(entry.getEntryURL().getPath())));
-					}
-				}
-			}
-		} else {
-			rtes.add(tools);
-		}
-	}
-	
-	/**
-	 * Returns the tools.jar to use for this launch configuration, or <code>null</code>
-	 * if none.
-	 * 
-	 * @param configuration configuration to resolve a tools.jar for
-	 * @return associated tools.jar archive, or <code>null</code>
-	 */
-	private IRuntimeClasspathEntry getToolsJar(ILaunchConfiguration configuration) {
-		try {
-			IVMInstall install = JavaRuntime.computeVMInstall(configuration);
-			if (install != null) {
-				IAntClasspathEntry entry = AntCorePlugin.getPlugin().getPreferences().getToolsJarEntry(new Path(install.getInstallLocation().getAbsolutePath()));
-				if (entry != null) {
-					return JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(entry.getEntryURL().getPath()));
-				}
-			}
-		} catch (CoreException ce) {
-			//likely dealing with a non-Java project
-		}
-			
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getName()
-	 */
-	public String getName() {
-		return AntLaunchConfigurationMessages.getString("ContributedClasspathEntriesEntry.1"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
-	 */
-	public int getType() {
-		return IRuntimeClasspathEntry.OTHER;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#isComposite()
-	 */
-	public boolean isComposite() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		return obj instanceof ContributedClasspathEntriesEntry;
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getClass().hashCode();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/EditAntHomeEntryAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/EditAntHomeEntryAction.java
deleted file mode 100644
index 75f7c8e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/EditAntHomeEntryAction.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.preferences.AntPreferencesMessages;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.jdt.internal.debug.ui.classpath.ClasspathEntry;
-import org.eclipse.jdt.internal.debug.ui.launcher.IClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry2;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.DirectoryDialog;
-
-/**
- * Edits the Ant Home classpath entry.
- * 
- * @since 3.0
- */
-public class EditAntHomeEntryAction extends RuntimeClasspathAction {
-	
-	private AntClasspathTab fTab;
-	/**
-	 * Constructs an action to edit the Ant Home setting for a launch config.
-	 * 
-	 * @param viewer classpath viewer
-	 */
-	public EditAntHomeEntryAction(IClasspathViewer viewer, AntClasspathTab tab) {
-		super(AntLaunchConfigurationMessages.getString("EditAntHomeEntryAction.1"), viewer); //$NON-NLS-1$
-		fTab = tab;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IDialogSettings dialogSettings = AntUIPlugin.getDefault().getDialogSettings();
-		String lastUsedPath= dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTANTHOME);
-		if (lastUsedPath == null) {
-			lastUsedPath= ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
-		}
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setMessage(AntPreferencesMessages.getString("AntClasspathBlock.3")); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String path = dialog.open();
-		if (path == null) {
-			return;
-		}
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTANTHOME, path);
-		AntCorePreferences preferences = AntCorePlugin.getPlugin().getPreferences();
-		String defaultHome = preferences.getAntHome();
-		if (path.equalsIgnoreCase(defaultHome)) {
-			path = null;
-		}
-		fTab.setDirty(true);
-		// update existing entry or add a new one
-		IRuntimeClasspathEntry[] entries = getViewer().getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			if (entry.getType() == IRuntimeClasspathEntry.OTHER) {
-				IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2)((ClasspathEntry)entry).getDelegate();
-				if (entry2.getTypeId().equals(AntHomeClasspathEntry.TYPE_ID)) {
-					((AntHomeClasspathEntry)entry2).setAntHome(path);
-					getViewer().refresh(entry);
-					getViewer().notifyChanged();
-					return;
-				}
-			}
-		}				
-		// no entry found - add a new one
-		getViewer().addEntries(new IRuntimeClasspathEntry[]{new AntHomeClasspathEntry(path)});		
-	}
-	
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return true;
-	}	
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/IAntLaunchConfigurationConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/IAntLaunchConfigurationConstants.java
deleted file mode 100644
index fcd121c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/IAntLaunchConfigurationConstants.java
+++ /dev/null

@@ -1,95 +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.internal.ui.launchConfigurations;
-
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-
-/**
- * Constant definitions for Ant launch configurations.
- * <p>
- * Constant definitions only; not to be implemented.
- * </p>
- * @since 3.0
- */
-public interface IAntLaunchConfigurationConstants {
-
-	// ------- 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.
-	* @deprecated no longer supported
-	*/
-	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 
-	 * @deprecated no longer supported
-	 */
-	public static final String ATTR_ANT_HOME = IExternalToolConstants.PLUGIN_ID + ".ATTR_ANT_HOME"; //$NON-NLS-1$
-	/**
-	 * Boolean attribute indicating whether or not internal targets (targets with no
-	 * description) should be hidden from the user in the launch configuration dialog.
-	 * Default value is <code>false</code> which indicates that all targets will be
-	 * displayed.
-	 * 
-	 * @since 3.0
-	 */
-	public static final String ATTR_HIDE_INTERNAL_TARGETS = IExternalToolConstants.PLUGIN_ID + ".ATTR_HIDE_INTERNAL_TARGETS"; //$NON-NLS-1$
-	/**
-	 * Integer attribute indicating which column targets should be sorted on. A
-	 * value of 0 indicates target name, 1 indicates target description, and -1
-	 * indicates no sort. Default value is -1.
-	 * 
-	 * @since 3.0
-	 */
-	public static final String ATTR_SORT_TARGETS = IExternalToolConstants.PLUGIN_ID + "ATTR_SORT_TARGETS"; //$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$
-
-	/**
-	 * 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 created by the Ant launch delegate.
-	 */
-	public static final String ID_ANT_PROCESS_TYPE = "org.eclipse.ant.ui.antProcess"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/MessageIds.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/MessageIds.java
deleted file mode 100644
index d08e18e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/MessageIds.java
+++ /dev/null

@@ -1,20 +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.internal.ui.launchConfigurations;
-
-
-public class MessageIds {
-
-	public static String PROCESS_ID=   "processID"; //$NON-NLS-1$
-	public static String BUILD_CANCELLED= "cancelled"; //$NON-NLS-1$
-	public static String TASK= "task"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntBuildListener.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntBuildListener.java
deleted file mode 100644
index 9b2ecfb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntBuildListener.java
+++ /dev/null

@@ -1,295 +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.internal.ui.launchConfigurations;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tools.ant.Project;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchesListener;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jface.text.Region;
-
-/**
- * Parts adapted from org.eclipse.jdt.internal.junit.ui.RemoteTestRunnerClient
- * The client side of the RemoteAntBuildLogger. Handles the
- * marshalling of the different messages.
- */
-public class RemoteAntBuildListener implements ILaunchesListener{
-	public abstract class ListenerSafeRunnable implements ISafeRunnable {
-		public void handleException(Throwable exception) {
-			AntUIPlugin.log(exception);
-		}
-	}
-
-	/**
-	 * The server socket
-	 */
-	private ServerSocket fServerSocket;
-	private Socket fSocket;
-	private int fPort= -1;
-	private BufferedReader fBufferedReader;
-	private boolean fDebug= false;
-	private IProcess fProcess;
-	private String fProcessId;
-	private File fBuildFileParent= null;
-	private List fMessageQueue;
-	private ILaunch fLaunch;
-	
-	/**
-	 * Reads the message stream from the RemoteAntBuildLogger
-	 */
-	private class ServerConnection extends Thread {
-		private int fServerPort;
-		
-		public ServerConnection(int port) {
-			super("Ant Build Server Connection"); //$NON-NLS-1$
-			fServerPort= port;
-		}
-		
-		public void run() {
-			try {
-				if (fDebug) {
-					System.out.println("Creating server socket " + fServerPort); //$NON-NLS-1$
-				}
-				fServerSocket= new ServerSocket(fServerPort);
-				fSocket= fServerSocket.accept();			
-				if (fDebug) {
-					System.out.println("Connection"); //$NON-NLS-1$
-				}	
-				fBufferedReader= new BufferedReader(new InputStreamReader(fSocket.getInputStream()));
-				String message;
-				while(fBufferedReader != null && (message= fBufferedReader.readLine()) != null) {
-					receiveMessage(message);
-				}
-			} catch (SocketException e) {
-			} catch (IOException e) {
-				// fall through
-			}
-			shutDown();
-		}
-	}
-	
-	public RemoteAntBuildListener(ILaunch launch) {
-		super();
-		fLaunch= launch;
-		DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
-	}
-
-	/**
-	 * Start listening to an Ant build. Start a server connection that
-	 * the RemoteAntBuildLogger can connect to.
-	 * 
-	 * @param port The port number to create the server connection on
-	 */
-	public synchronized void startListening(int port) {
-		fPort = port;
-		ServerConnection connection = new ServerConnection(port);
-		connection.start();
-	}
-
-	private synchronized void shutDown() {
-		if (fDebug) {
-			System.out.println("shutdown " + fPort); //$NON-NLS-1$
-		}
-		fLaunch= null;
-		DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
-		try {
-			if (fBufferedReader != null) {
-				fBufferedReader.close();
-				fBufferedReader= null;
-			}
-		} catch(IOException e) {
-		}	
-		try{
-			if(fSocket != null) {
-				fSocket.close();
-				fSocket= null;
-			}
-		} catch(IOException e) {
-		}
-		try{
-			if(fServerSocket != null) {
-				fServerSocket.close();
-				fServerSocket= null;
-			}
-		} catch(IOException e) {
-		}
-	}
-		
-	private void receiveMessage(String message) {
-		if (fDebug) {
-			System.out.println(message);
-		}
-		if (message.startsWith(MessageIds.TASK)) {
-			message= message.substring(MessageIds.TASK.length());
-			
-			int index= message.indexOf(',');
-			int priority= Integer.parseInt(message.substring(0, index));
-			int index2= message.indexOf(',', index + 1);
-			String taskName= message.substring(index + 1, index2);
-			int index3= message.indexOf(',', index2 + 1);
-			int lineLength= Integer.parseInt(message.substring(index2 + 1, index3));
-			int finalIndex= index3 + 1 + lineLength;
-			String line= message.substring(index3 + 1, finalIndex);
-			String location= message.substring(finalIndex + 1);
-	
-			int size = IAntUIConstants.LEFT_COLUMN_SIZE - (taskName.length() + 3);
-			int offset = Math.max(size - 2, 1);
-			int length = IAntUIConstants.LEFT_COLUMN_SIZE - size - 3;
-			IConsoleHyperlink taskLink = AntUtil.getTaskLink(location, fBuildFileParent);
-			if (taskLink != null) {
-				TaskLinkManager.addTaskHyperlink(getProcess(), taskLink, new Region(offset, length), line);
-			}
-			
-			StringBuffer fullMessage= new StringBuffer();
-			adornMessage(taskName, line, fullMessage);
-			writeMessage(fullMessage.append(System.getProperty("line.separator")).toString(), priority); //$NON-NLS-1$
-		} else if (message.startsWith(MessageIds.PROCESS_ID)) {
-			message= message.substring(MessageIds.PROCESS_ID.length());
-			fProcessId= message;
-		} else {
-			int index= message.indexOf(',');
-			if (index > 0) {
-				int priority= Integer.parseInt(message.substring(0, index));
-				message= message.substring(index + 1);
-				writeMessage(message + System.getProperty("line.separator"), priority); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	/**
-	 * Returns the associated process, finding it if necessary.
-	 */
-	private IProcess getProcess() {
-		if (fProcess == null && fProcessId != null) {
-			IProcess[] all = DebugPlugin.getDefault().getLaunchManager().getProcesses();
-			for (int i = 0; i < all.length; i++) {
-				IProcess process = all[i];
-				if (fProcessId.equals(process.getAttribute(AntProcess.ATTR_ANT_PROCESS_ID))) {
-					fProcess = process;
-					break;
-				}
-			}
-		}
-		return fProcess;
-	}
-	
-	private AntStreamMonitor getMonitor(int priority) {
-		IProcess process= getProcess();
-		if (process == null) {
-			return null;
-		}
-		AntStreamsProxy proxy = (AntStreamsProxy)process.getStreamsProxy();
-		if (proxy == null) {
-			return null;
-		}
-		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;
-	}
-	
-	/**
-	 * Builds a right justified task prefix for the given build event, placing it
-	 * in the given string buffer.
-	 *  
-	 * @param event build event
-	 * @param fullMessage buffer to place task prefix in
-	 */
-	private void adornMessage(String taskName, String line, StringBuffer fullMessage) {
-		if (taskName == null) {
-			taskName = "null"; //$NON-NLS-1$
-		}
-		
-		int size = IAntUIConstants.LEFT_COLUMN_SIZE - (taskName.length() + 6);
-		for (int i = 0; i < size; i++) {
-			fullMessage.append(' ');
-		}
-		
-		fullMessage.append(line);
-	}
-	
-	private void writeMessage(String message, int priority) {
-		AntStreamMonitor monitor= getMonitor(priority);
-		if (monitor == null) {
-			if (fMessageQueue == null) {
-				fMessageQueue= new ArrayList();
-			}
-			fMessageQueue.add(message);
-			return;
-		}
-		if (fMessageQueue != null) {
-			for (Iterator iter = fMessageQueue.iterator(); iter.hasNext();) {
-				String oldMessage = (String) iter.next();
-				monitor.append(oldMessage);
-			}
-			fMessageQueue= null;
-		}
-		monitor.append(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
-	 */
-	public void launchesAdded(ILaunch[] launches) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
-	 */
-	public void launchesChanged(ILaunch[] launches) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
-	 */
-	public void launchesRemoved(ILaunch[] launches) {
-		for (int i = 0; i < launches.length; i++) {
-			ILaunch launch = launches[i];
-			if (launch.equals(fLaunch)) {
-				shutDown();
-				return;
-			}
-		}
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntProcessFactory.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntProcessFactory.java
deleted file mode 100644
index 2533cf0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntProcessFactory.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.internal.ui.launchConfigurations;
-
-import java.util.Map;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.IProcessFactory;
-import org.eclipse.debug.core.model.IProcess;
-
-public class RemoteAntProcessFactory implements IProcessFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IProcessFactory#newProcess(org.eclipse.debug.core.ILaunch, java.lang.Process, java.lang.String, java.util.Map)
-	 */
-	public IProcess newProcess(ILaunch launch, Process process, String label, Map attributes) {
-		attributes.put(IProcess.ATTR_PROCESS_TYPE, IAntLaunchConfigurationConstants.ID_ANT_PROCESS_TYPE);
-		return new RemoteAntRuntimeProcess(launch, process, label, attributes);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntRuntimeProcess.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntRuntimeProcess.java
deleted file mode 100644
index b5178c0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RemoteAntRuntimeProcess.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.ui.launchConfigurations;
-
-import java.util.Map;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.debug.core.model.RuntimeProcess;
-
-
-public class RemoteAntRuntimeProcess extends RuntimeProcess {
-
-	/**
-	 * Constructs a RuntimeProcess on the given system process
-	 * with the given name, adding this process to the given
-	 * launch.
-	 * Sets the streams proxy to an AntStreamsProxy.
-	 */
-	public RemoteAntRuntimeProcess(ILaunch launch, Process process, String name, Map attributes) {
-		super(launch, process, name, attributes);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.RuntimeProcess#createStreamsProxy()
-	 */
-	protected IStreamsProxy createStreamsProxy() {
-		return new AntStreamsProxy();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RunAntStatusHandler.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RunAntStatusHandler.java
deleted file mode 100644
index b1f3ef1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/RunAntStatusHandler.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.ui.launchConfigurations;
-
-
-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) {
-		ILaunchConfigurationDialog dialog = (ILaunchConfigurationDialog)source;
-		dialog.setActiveTab(3);
-		return null;
-	}
-
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java
deleted file mode 100644
index 18b6acc..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java
+++ /dev/null

@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.jface.dialogs.Dialog;
-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.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.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 = (Composite)super.createDialogArea(parent);
-		((GridLayout)comp.getLayout()).numColumns= 2;
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(AntLaunchConfigurationMessages.getString("TargetOrderDialog.&Specify_target_execution_order__2")); //$NON-NLS-1$
-		label.setFont(comp.getFont());
-		GridData 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();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		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();
-			}
-		});
-	}
-
-	private void handleDownPressed() {
-		List targets = getOrderedSelection();
-		if (targets.isEmpty()) {
-			return;
-		}
-		List list= new ArrayList(Arrays.asList(fContentProvider.getElements(null)));
-		int bottom = list.size() - 1;
-		int index = 0;
-		for (int i = targets.size() - 1; i >= 0; i--) {
-			Object target = targets.get(i);
-			index = list.indexOf(target);
-			if (index < bottom) {
-				bottom = index + 1;
-				Object temp = list.get(bottom);
-				list.set(bottom, target);
-				list.set(index, temp);
-			}
-			bottom = index;
-		} 
-		setEntries(list);
-	}
-
-	private void handleUpPressed() {
-		List targets = getOrderedSelection();
-		if (targets.isEmpty()) {
-			return;
-		}
-		int top = 0;
-		int index = 0;
-		List list= new ArrayList(Arrays.asList(fContentProvider.getElements(null)));
-		Iterator entries = targets.iterator();
-		while (entries.hasNext()) {
-			Object target = entries.next();
-			index = list.indexOf(target);
-			if (index > top) {
-				top = index - 1;
-				Object temp = list.get(top);
-				list.set(top, target);
-				list.set(index, temp);
-			}
-			top = index;
-		} 
-		setEntries(list);
-	}
-	
-	/**
-	 * Updates the entries to the entries in the given list
-	 */
-	private void setEntries(List list) {
-		fTargets= list.toArray();
-		fViewer.setInput(fTargets);
-		// update all selection listeners
-		fViewer.setSelection(fViewer.getSelection());
-	}
-	
-	/**
-	 * Returns the selected items in the list, in the order they are
-	 * displayed.
-	 * 
-	 * @return targets for an action
-	 */
-	private List getOrderedSelection() {
-		List targets = new ArrayList();
-		List selection = ((IStructuredSelection)fViewer.getSelection()).toList();
-		Object[] entries = fContentProvider.getElements(null);
-		for (int i = 0; i < entries.length; i++) {
-			Object target = entries[i];
-			if (selection.contains(target)) {
-				targets.add(target);
-			}
-		}
-		return targets;		
-	}
-
-	/**
-	 * 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);
-		table.setFont(comp.getFont());
-	}
-	
-	/**
-	 * 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, IAntUIHelpContextIds.TARGET_ORDER_DIALOG);
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetTableLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetTableLabelProvider.java
deleted file mode 100644
index 6110327..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetTableLabelProvider.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.internal.ui.model.AntImageDescriptor;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.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()) {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_DEFAULT_TARGET);
-		} else if (target.getDescription() == null) {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET_INTERNAL);
-		} 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/internal/ui/launchConfigurations/TaskLinkManager.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TaskLinkManager.java
deleted file mode 100644
index 158452e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TaskLinkManager.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.console.FileLink;
-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
- * buildfile. 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.
- * The new line is added to the console, information from that line 
- * may be stored to process future incoming tasks hyperlinks.
- */
-public class TaskLinkManager {
-	
-	/**
-	 * A map of processes to lists of queued task hyperlink entries
-	 */
-	private static Map fgProcessToLinks;
-	
-	/**
-	 * A map of processes to lists of queued new line regions
-	 */
-	private static Map fgProcessToNewLines;
-	
-	private static List fgAntBuilds;
-	
-	private static class HyperlinkEntry {
-		private IConsoleHyperlink fLink;
-		private IRegion fRegion;
-		private String fMessage;
-		
-		public HyperlinkEntry(IConsoleHyperlink link, IRegion region, String message) {
-			fLink = link;
-			fRegion = region;	
-			fMessage = message;
-		}
-		
-		public IRegion getRegion() {
-			return fRegion;
-		}
-		
-		public IConsoleHyperlink getLink() {
-			return fLink;
-		}
-		
-		public String getMessage() {
-			return fMessage;
-		}
-	}
-	
-	private static class LineEntry {
-		private IConsole fConsole;
-		private IRegion fRegion;
-	
-		public LineEntry(IConsole console, IRegion region) {
-			fConsole = console;
-			fRegion = region;	
-		}
-	
-		public IRegion getRegion() {
-			return fRegion;
-		}
-	
-		public IConsole getConsole() {
-			return fConsole;
-		}
-	}
-
-	/**
-	 * 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 the process associated with the link
-	 * @param link the link for the process
-	 * @param region The region within the line
-	 * @param message The message related to the link
-	 */
-	public static synchronized void addTaskHyperlink(IProcess process, IConsoleHyperlink link, IRegion region, String message) {
-		if (fgProcessToNewLines != null) {
-			List newLines = (List)fgProcessToNewLines.get(process);
-			if (newLines != null) {
-				for (int index= 0; index < newLines.size(); index++) {
-					LineEntry newLine = (LineEntry) newLines.get(index);
-					if (addLink(newLine.getConsole(), link, newLine.getRegion(), region, message)) {
-						newLines.subList(0, index + 1).clear();
-						return;
-					}
-				}
-			}
-		}
-				
-		if (fgProcessToLinks == null) {
-			fgProcessToLinks = new HashMap();
-			
-		}
-		List links = (List)fgProcessToLinks.get(process);
-		if (links == null) {
-			links = new ArrayList(10);
-			fgProcessToLinks.put(process, links);
-		}
-		
-		links.add(new HyperlinkEntry(link, region, message));
-	}
-	
-	private static boolean addLink(IConsole console, IConsoleHyperlink link, IRegion lineRegion, IRegion region, String message) {
-		
-		int length = region.getLength();
-		
-		String text;
-		try {
-			text = console.getDocument().get(lineRegion.getOffset(), lineRegion.getLength());
-		} catch (BadLocationException e) {
-			return false;
-		}
-		if (text.trim().equals(message)) {
-			int offset = lineRegion.getOffset() + region.getOffset();
-			console.addLink(link, offset, length);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A new line has been added to the given console. Adds any task hyperlink
-	 * associated with the line, to the console.
-	 * The new line may be stored to process future incoming tasks hyperlinks.
-	 * 
-	 * @param console
-	 * @param newLine
-	 */
-	public static synchronized void processNewLine(IConsole console, IRegion newLine) {
-		IProcess process = console.getProcess();
-		if (fgAntBuilds != null && fgAntBuilds.contains(process)) {
-			if (linkBuildFileMessage(console, newLine)) {
-				fgAntBuilds.remove(process);
-				return;
-			}
-		}
-		if (fgProcessToLinks == null) {
-			addNewLine(console, newLine, process);
-			return;
-		}
-		
-		List links = (List)fgProcessToLinks.get(process);
-		if (links == null) {
-			addNewLine(console, newLine, process);
-			return;
-		}
-		
-		for (int index= 0; index < links.size(); index++) {
-			HyperlinkEntry link = (HyperlinkEntry) links.get(index);
-			if (addLink(console, link.getLink(), newLine, link.getRegion(), link.getMessage())) {
-				links.subList(0, index + 1).clear();
-				return;
-			}
-		}
-	}
-	
-	private static void addNewLine(IConsole console, IRegion newLine, IProcess process) {
-		if (fgProcessToNewLines == null) {
-			fgProcessToNewLines = new HashMap();
-		}
-		List newLines = (List)fgProcessToNewLines.get(process);
-		if (newLines == null) {
-			newLines= new ArrayList();
-		}
-	
-		newLines.add(new LineEntry(console, newLine));
-		fgProcessToNewLines.put(process, newLines);
-	}
-
-	/**
-	 * Disposes any information stored for the given process.
-	 * 
-	 * @param process
-	 */
-	public static void dispose(IProcess process) {
-		if (fgProcessToLinks != null) {
-			fgProcessToLinks.remove(process);
-		}
-		if (fgProcessToNewLines != null) {
-			fgProcessToNewLines.remove(process);
-		}
-		if (fgAntBuilds != null) {
-			fgAntBuilds.remove(process);
-		}
-	}
-	
-	/**
-	 * Registers the specified process as an Ant build process.
-	 * Allows for the generation of the "Buildfile: somefile" link in the 
-	 * Ant output.
-	 * 
-	 * @param process
-	 */
-	public static synchronized void registerAntBuild(IProcess process) {
-		if (fgProcessToNewLines != null) {
-			List newLines = (List)fgProcessToNewLines.get(process);
-			if (newLines != null) {
-				for (Iterator iter = newLines.iterator(); iter.hasNext();) {
-					LineEntry newLine = (LineEntry) iter.next();
-					if (linkBuildFileMessage(newLine.getConsole(), newLine.getRegion())){
-						iter.remove();
-						return;
-					}
-				}
-			}
-		}
-		if (fgAntBuilds == null) {
-			fgAntBuilds= new ArrayList();
-		}
-		fgAntBuilds.add(process);
-	}
-	
-	private static boolean linkBuildFileMessage(IConsole console, IRegion region) {
-		
-		String message= ""; //$NON-NLS-1$
-		int offset= region.getOffset();
-		try {
-			message = console.getDocument().get(offset, region.getLength());
-		} catch (BadLocationException e) {
-		}
-		if (message.startsWith("Buildfile:")) { //$NON-NLS-1$
-			String fileName = message.substring(10).trim();
-			IFile file = AntUtil.getFileForLocation(fileName, null);
-			if (file != null) {
-				FileLink link = new FileLink(file, null,  -1, -1, -1);
-				console.addLink(link, offset + 11, fileName.length()); //$NON-NLS-1$
-				//fBuildFileParent= file.getLocation().toFile().getParentFile();
-				return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/VariableInputDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/VariableInputDialog.java
deleted file mode 100644
index cf9e847..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/VariableInputDialog.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.launchConfigurations;
-
-import org.eclipse.ant.internal.ui.preferences.DialogSettingsHelper;
-import org.eclipse.debug.internal.ui.stringsubstitution.StringVariableSelectionDialog;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-public class VariableInputDialog extends Dialog {
-	
-	private static String DIALOG_SETTINGS_SECTION = "RuntimeClasspathAction.VariableInputDialog"; //$NON-NLS-1$
-	private Text fText;
-	private String fVariableString;
-	
-	public VariableInputDialog(Shell shell) {
-		super(shell);
-		setShellStyle(SWT.RESIZE | getShellStyle());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite inner = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		inner.setLayout(layout);
-		inner.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Label label = new Label(inner, SWT.NONE);
-		label.setText(AntLaunchConfigurationMessages.getString("AddVariableStringAction.2")); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		label.setLayoutData(gd);
-
-		Composite inputComp = new Composite(inner, SWT.NONE);
-		layout = new GridLayout(2, false);
-		inputComp.setLayout(layout);
-		inputComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fText = new Text(inputComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		gd.widthHint = 200;
-		fText.setLayoutData(gd);
-		
-		Button button = new Button(inputComp, SWT.PUSH); 
-		button.setText(AntLaunchConfigurationMessages.getString("AddVariableStringAction.3")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		button.setLayoutData(gd);
-		
-		button.addSelectionListener(new SelectionAdapter() {
-			public  void widgetSelected(SelectionEvent se) {
-				getVariable();
-			}
-		});
-		
-		applyDialogFont(parent);
-		return inner;
-	}
-	
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(AntLaunchConfigurationMessages.getString("AddVariableStringAction.4")); //$NON-NLS-1$
-	}
-	
-	private void getVariable() {
-		StringVariableSelectionDialog variableDialog = new StringVariableSelectionDialog(getShell());
-		int returnCode = variableDialog.open();
-		if (returnCode == IDialogConstants.OK_ID) {
-			String variable = variableDialog.getVariableExpression();
-			if (variable != null) {
-				fText.append(variable);
-			}
-		}			
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		String variableString = fText.getText();
-		if (variableString != null && variableString.trim().length() > 0) {
-			fVariableString= variableString;
-		} else {
-			fVariableString= null;
-		}
-		super.okPressed();
-	}
-	
-	public String getVariableString() {
-		return fVariableString;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#close()
-	 */
-	public boolean close() {
-		DialogSettingsHelper.persistShellGeometry(getShell(), DIALOG_SETTINGS_SECTION);
-		return super.close();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#getInitialLocation(org.eclipse.swt.graphics.Point)
-	 */
-	protected Point getInitialLocation(Point initialSize) {
-		Point p = DialogSettingsHelper.getInitialLocation(DIALOG_SETTINGS_SECTION);
-		return p != null ? p : super.getInitialLocation(initialSize);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#getInitialSize()
-	 */
-	protected Point getInitialSize() {
-		Point p = super.getInitialSize();
-		return DialogSettingsHelper.getInitialSize(DIALOG_SETTINGS_SECTION, p);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntImageDescriptor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntImageDescriptor.java
deleted file mode 100644
index 013206c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntImageDescriptor.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49445
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.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 an error adornment */
-	public final static int HAS_ERRORS= 0x0001;
-
-	/** Flag to render an imported adornment */
-	public final static int IMPORTED= 0x0002;
-	
-	/** Flag to render an warning adornment */
-	public final static int HAS_WARNINGS= 0x0004;
-	
-	private ImageDescriptor fBaseImage;
-	private int fFlags;
-	private Point fSize;
-
-	/**
-	 * Create a new AntImageDescriptor.
-	 * 
-	 * @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 y= 0;
-		ImageData data= null;
-		if ((flags & IMPORTED) != 0) {
-			data= AntUIImages.getImageDescriptor(IAntUIConstants.IMG_OVR_IMPORT).getImageData();
-			drawImage(data, 0, 0);
-		}
-		if ((flags & HAS_ERRORS) != 0) {
-			y= getSize().y;
-			data= AntUIImages.getImageDescriptor(IAntUIConstants.IMG_OVR_ERROR).getImageData();
-			y -= data.height;
-			drawImage(data, 0, y);
-		} else if ((flags & HAS_WARNINGS) != 0) {
-			y= getSize().y;
-			data= AntUIImages.getImageDescriptor(IAntUIConstants.IMG_OVR_WARNING).getImageData();
-			y -= data.height;
-			drawImage(data, 0, 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;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIImages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIImages.java
deleted file mode 100644
index db67eab..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIImages.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49380, 49445, 53547
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.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$
-		ICON_BASE_URL= AntUIPlugin.getDefault().getBundle().getEntry(pathSuffix);
-	}
-
-	// Use IPath and toOSString to build the names to ensure they have the slashes correct
-	private final static String LOCALTOOL= "elcl16/"; //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$
-	private final static String WIZ= "wizban/"; //$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$
-		declareRegistryImage(IAntUIConstants.IMG_TEMPLATE_PROPOSAL, OBJECT + "template_obj.gif"); //$NON-NLS-1$
-		
-		// Ant View Actions
-		declareRegistryImage(IAntUIConstants.IMG_ANT, OBJECT + "ant.gif"); //$NON-NLS-1$
-		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_FILTER_INTERNAL_TARGETS, LOCALTOOL + "filter_internal_targets.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_FILTER_IMPORTED_ELEMENTS, LOCALTOOL + "filter_imported_elements.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_FILTER_PROPERTIES, LOCALTOOL + "filter_properties.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_FILTER_TOP_LEVEL, LOCALTOOL + "filter_top_level.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_LINK_WITH_EDITOR, LOCALTOOL + "synced.gif"); //$NON-NLS-1$
-		
-		declareRegistryImage(IAntUIConstants.IMG_SORT_OUTLINE, LOCALTOOL + "alpha_mode.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_REFRESH, LOCALTOOL + "refresh.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_INTERNAL, OBJECT + "targetinternal_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$
-		declareRegistryImage(IAntUIConstants.IMG_ANT_MACRODEF, OBJECT + "macrodef_obj.gif"); //$NON-NLS-1$
-        declareRegistryImage(IAntUIConstants.IMG_ANT_IMPORT, OBJECT + "import_obj.gif"); //$NON-NLS-1$
-        declareRegistryImage(IAntUIConstants.IMG_ANT_BUILD_TAB, OBJECT + "build_tab.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$
-		
-		declareRegistryImage(IAntUIConstants.IMG_IMPORT_WIZARD_BANNER, WIZ + "importbuildfile_wiz.gif"); //$NON-NLS-1$
-		
-		// Overlays
-		declareRegistryImage(IAntUIConstants.IMG_OVR_ERROR, OVR + "error_co.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_OVR_WARNING, OVR + "warning_co.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_OVR_IMPORT, OVR + "import_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 org.eclipse.jface.resource.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/internal/ui/model/AntUIModelMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIModelMessages.java
deleted file mode 100644
index e3f5c99..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntUIModelMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/model/AntUIModelMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIModelMessages.properties
deleted file mode 100644
index 7f6b184..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIModelMessages.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
-###############################################################################
-
-ImageDescriptorRegistry.Allocating_image_for_wrong_display_1=Allocating image for wrong display
-
-AntUtil.6=Invalid property file entry: {0}
-AntUtil.7=Unable to generate Ant classpath

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIPlugin.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIPlugin.java
deleted file mode 100644
index 9fc5a53..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUIPlugin.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 53547
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.model;
-
-
-import java.util.Locale;
-
-import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * 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>
-	 */
-	public AntUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		try {
-			AntUIImages.disposeImageDescriptorRegistry();
-		} finally {
-			super.stop(context);
-		}
-	}
-
-	/**
-	 * Returns this plug-in instance.
-	 *
-	 * @return the single instance of this plug-in runtime class
-	 */
-	public static AntUIPlugin getDefault() {
-		return plugin;
-	}
-	
-	/**
-	 * Convenience method which returns the unique identifier of this plugin.
-	 */
-	public static String getUniqueIdentifier() {
-		return PI_ANTUI;
-	}
-	
-	/**
-	 * 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 UI: ", t); //$NON-NLS-1$
-		log(status);
-	}
-	
-	/**
-	 * Logs the specified status with this plug-in's log.
-	 * 
-	 * @param status status 
-	 */
-	public static void log(IStatus status) {
-		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);
-		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(IStatus.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$
-		EditorsUI.useAnnotationsPreferencePage(prefs);
-		EditorsUI.useQuickDiffPreferencePage(prefs);
-		if (isMacOS()) {
-			//the mac does not have a tools.jar Bug 40778
-			prefs.setDefault(IAntUIPreferenceConstants.ANT_TOOLS_JAR_WARNING, false);
-		} else {
-			prefs.setDefault(IAntUIPreferenceConstants.ANT_TOOLS_JAR_WARNING, true);
-		}
-		
-		prefs.setDefault(IAntUIPreferenceConstants.ANT_ERROR_DIALOG, true);
-		
-		prefs.setDefault(IAntUIPreferenceConstants.ANTEDITOR_FILTER_INTERNAL_TARGETS, false);
-		prefs.setDefault(IAntUIPreferenceConstants.ANTEDITOR_FILTER_IMPORTED_ELEMENTS, false);
-		prefs.setDefault(IAntUIPreferenceConstants.ANTEDITOR_FILTER_PROPERTIES, false);
-		prefs.setDefault(IAntUIPreferenceConstants.ANTEDITOR_FILTER_TOP_LEVEL, false);
-		
-		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 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();
-   }
-   
-   /**
-	* Returns whether the current OS claims to be Mac
-	*/
-   public static boolean isMacOS() {
-		String osname= System.getProperty("os.name").toLowerCase(Locale.US); //$NON-NLS-1$
-		return osname.indexOf("mac") != -1; //$NON-NLS-1$
-   }
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUtil.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUtil.java
deleted file mode 100644
index 33cc73a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntUtil.java
+++ /dev/null

@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.model;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.FileUtils;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.internal.core.AntClasspathEntry;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntHomeClasspathEntry;
-import org.eclipse.ant.internal.ui.launchConfigurations.IAntLaunchConfigurationConstants;
-import org.eclipse.ant.internal.ui.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.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.console.FileLink;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry2;
-import org.eclipse.jdt.launching.JavaRuntime;
-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 ATTRIBUTE_SEPARATOR = ","; //$NON-NLS-1$;
-	public static final char ANT_CLASSPATH_DELIMITER= '*';
-	public static final String ANT_HOME_CLASSPATH_PLACEHOLDER= "G"; //$NON-NLS-1$
-	public static final String ANT_GLOBAL_USER_CLASSPATH_PLACEHOLDER= "UG"; //$NON-NLS-1$
-	/**
-	 * No instances allowed
-	 */
-	private AntUtil() {
-		super();
-	}
-	
-	/**
-	 * Returns a single-string of the strings for storage.
-	 * 
-	 * @param strings 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(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS, (String) null);
-		if (attribute == null) {
-			return null;
-		} 
-		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(IAntLaunchConfigurationConstants.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 {
-		IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedRuntimeClasspath(configuration);
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			if (entry.getType() == IRuntimeClasspathEntry.OTHER) {
-				IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2)entry;
-				if (entry2.getTypeId().equals(AntHomeClasspathEntry.TYPE_ID)) {
-					return ((AntHomeClasspathEntry)entry2).getAntHome();
-				}
-			}
-		}
-		return 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(IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTY_FILES, (String) null);
-		if (attribute == null) {
-			return null;
-		}
-		String[] propertyFiles= AntUtil.parseString(attribute, ","); //$NON-NLS-1$
-		for (int i = 0; i < propertyFiles.length; i++) {
-			String propertyFile = propertyFiles[i];
-			propertyFile= expandVariableString(propertyFile, AntUIModelMessages.getString("AntUtil.6")); //$NON-NLS-1$ //$NON-NLS-2$
-			propertyFiles[i]= propertyFile;
-		}
-		return propertyFiles;
-	}
-	
-	/**
-	 * 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));
-		
-		String antHome= getAntHome(config);
-		if (antHome != null) {
-			runner.setAntHome(antHome);
-		}
-		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 config 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 {
-		boolean useDefault = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
-		if (useDefault) {
-			return null;
-		}
-		IRuntimeClasspathEntry[] unresolved = JavaRuntime.computeUnresolvedRuntimeClasspath(config);
-		// don't consider bootpath entries
-		List userEntries = new ArrayList(unresolved.length);
-		for (int i = 0; i < unresolved.length; i++) {
-			IRuntimeClasspathEntry entry = unresolved[i];
-			if (entry.getClasspathProperty() == IRuntimeClasspathEntry.USER_CLASSES) {
-				userEntries.add(entry);
-			}
-		}
-		IRuntimeClasspathEntry[] entries = JavaRuntime.resolveRuntimeClasspath((IRuntimeClasspathEntry[])userEntries.toArray(new IRuntimeClasspathEntry[userEntries.size()]), config);
-		URL[] urls = new URL[entries.length];
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			try {
-				urls[i] = new URL("file:"+entry.getLocation()); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-				throw new CoreException(new Status(IStatus.ERROR, AntUIPlugin.getUniqueIdentifier(), AntUIPlugin.INTERNAL_ERROR, AntUIModelMessages.getString("AntUtil.7"), e)); //$NON-NLS-1$
-			}
-		}
-		return urls;		
-	}
-	
-	/**
-	 * Adds the Ant home entries and additional entries to the provided lists.
-	 * If no custom classpath is set, no entries are added to the lists.
-	 *
-	 * @param config launch configuration
-	 * @param antHomeEntries list to add the Ant home entries to
-	 * @param additionalEntries list to add the additional entries to
-	 * @deprecated this method is no longer supported (should be deleted with
-	 *  old classpath tab support)
-	 */
-	public static void getCustomClasspaths(ILaunchConfiguration config, List antHomeEntries, List additionalEntries) {
-		String classpathString= null;
-		try {
-			classpathString = config.getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String) null);
-		} catch (CoreException e) {
-		}
-		if (classpathString == null) {
-			return;
-		}
-		String antString= null;
-		String userString= null;
-		int delim= classpathString.indexOf(ANT_CLASSPATH_DELIMITER);
-
-		if (delim == -1) {
-			antString= classpathString;
-		} else {
-			antString= classpathString.substring(0, delim);
-			userString= classpathString.substring(delim+1);
-		}
-
-		getEntries(antHomeEntries, antString);
-		
-		if (userString != null) {
-			getEntries(additionalEntries, userString);
-		}
-	}
-	
-	private static void getEntries(List entries, String urlString) {
-		String[] entryStrings= AntUtil.parseString(urlString, AntUtil.ATTRIBUTE_SEPARATOR);
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		for (int i = 0; i < entryStrings.length; i++) {
-			String string = entryStrings[i];
-			if (string.equals(ANT_HOME_CLASSPATH_PLACEHOLDER)) {
-				entries.addAll(Arrays.asList(prefs.getAntHomeClasspathEntries()));
-			} else if (string.equals(ANT_GLOBAL_USER_CLASSPATH_PLACEHOLDER)) {
-				entries.addAll(Arrays.asList(prefs.getAdditionalClasspathEntries()));
-			} else {
-				if (string.charAt(0) == '?') {
-					string= string.substring(1);
-				}
-				entries.add(new AntClasspathEntry(string));
-			}
-		}
-	}
-
-	private static String expandVariableString(String variableString, String invalidMessage) throws CoreException {
-		String expandedString = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(variableString);
-		if (expandedString == null || expandedString.length() == 0) {
-			String msg = MessageFormat.format(invalidMessage, new String[] {variableString});
-			throw new CoreException(new Status(IStatus.ERROR, IAntUIConstants.PLUGIN_ID, 0, msg, null));
-		} 
-		
-		return expandedString;
-	}
-
-	/**
-	 * 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 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 delimString the String to be tokenized based on the delimiter
-	 * @return a list of Strings
-	 */
-	public static String[] parseString(String delimString, String delim) {
-		if (delimString == null) {
-			return new String[0];
-		}
-		
-		// Need to handle case where separator character is
-		// actually part of the target name!
-		StringTokenizer tokenizer = new StringTokenizer(delimString, 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 (relative to the workspace root).
-	 * 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));
-	}
-
-	public static FileLink getTaskLink(String path, File buildFileParent) {
-		path = path.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, buildFileParent);
-		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 workspace file associated with the given path in the
-	 * local file system, or <code>null</code> if none.
-	 * If the path happens to be a relative path, then the path is interpreted as
-	 * relative to the specified parent file.
-	 * 
-	 * Attempts to handle linked files; the first found linked file with the correct
-	 * path is returned.
-	 *   
-	 * @param path
-	 * @param buildFileParent
-	 * @return file or <code>null</code>
-	 * @see org.eclipse.core.resources.IWorkspaceRoot#findFilesForLocation(IPath)
-	 */
-	public static IFile getFileForLocation(String path, File buildFileParent) {
-		IPath filePath= new Path(path);
-		IFile file = null;
-		IFile[] files= ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(filePath);
-		if (files.length > 0) {
-			file= files[0];
-		}
-		if (file == null) {
-			//relative path
-			File relativeFile= null;
-			try {
-				//this call is ok if buildFileParent is null
-				relativeFile= FileUtils.newFileUtils().resolveFile(buildFileParent, path);
-				filePath= new Path(relativeFile.getAbsolutePath());
-				files= ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(filePath);
-				if (files.length > 0) {
-					file= files[0];
-				} else {
-					return null;
-				}
-			} catch (BuildException be) {
-				return null;
-			}
-		}
-		
-		if (file.exists()) {
-			return file;
-		}
-		return null;
-	}
-
-	/**
-	 * Migrates the classpath in the given configuration from the old format
-	 * to the new foramt. The old format is not preserved. Instead, the default
-	 * classpath will be used. However, ANT_HOME settings are preserved.
-	 * 
-	 * @param configuration a configuration to migrate
-	 * @throws CoreException if unable to migrate
-	 * @since 3.0
-	 */
-	public static void migrateToNewClasspathFormat(ILaunchConfiguration configuration) throws CoreException {
-		String oldClasspath = configuration.getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String)null);
-		String oldAntHome = configuration.getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_HOME, (String)null);
-		String provider = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, (String)null);
-		if (oldClasspath != null || oldAntHome != null || provider == null) {
-			ILaunchConfigurationWorkingCopy workingCopy = null;
-			if (configuration.isWorkingCopy()) {
-				workingCopy = (ILaunchConfigurationWorkingCopy) configuration;
-			} else {
-				workingCopy = configuration.getWorkingCopy();
-			}
-			workingCopy.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String)null);
-			workingCopy.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_HOME, (String)null);
-			workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
-			workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
-			if (oldAntHome != null) {
-				IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedRuntimeClasspath(workingCopy);
-				List mementos = new ArrayList(entries.length);
-				for (int i = 0; i < entries.length; i++) {
-					IRuntimeClasspathEntry entry = entries[i];
-					if (entry.getType() == IRuntimeClasspathEntry.OTHER) {
-						IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2) entry;
-						if (entry2.getTypeId().equals(AntHomeClasspathEntry.TYPE_ID)) {
-							AntHomeClasspathEntry homeEntry = new AntHomeClasspathEntry(oldAntHome);
-							mementos.add(homeEntry.getMemento());
-							continue;
-						}
-					}
-					mementos.add(entry.getMemento());
-				}
-				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, mementos);
-			}
-			workingCopy.doSave();
-		}
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIConstants.java
deleted file mode 100644
index 26448ce..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIConstants.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49380, 49445, bug 53547
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.model;
-
-/**
- * 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$
-
-	// ------- Images -------
-	/**
-	 * 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= PLUGIN_ID + ".ant"; //$NON-NLS-1$
-	 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_INTERNAL = 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$
-	 public static final String IMG_ANT_MACRODEF = PLUGIN_ID + ".antMacrodef"; //$NON-NLS-1$
-     public static final String IMG_ANT_IMPORT = PLUGIN_ID + ".antImport"; //$NON-NLS-1$
-     
-	/**
-	 * Icon for task proposal.
-	 */
-	public static final String IMG_TASK_PROPOSAL = PLUGIN_ID + ".html_tab_obj"; //$NON-NLS-1$
-	public static final String IMG_TEMPLATE_PROPOSAL= PLUGIN_ID + ".template_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_FILTER_INTERNAL_TARGETS= PLUGIN_ID + ".filterInternalTargets"; //$NON-NLS-1$
-	public static final String IMG_FILTER_IMPORTED_ELEMENTS= PLUGIN_ID + ".filterImportedElements"; //$NON-NLS-1$
-	public static final String IMG_FILTER_PROPERTIES= PLUGIN_ID + ".filterProperties"; //$NON-NLS-1$
-	public static final String IMG_FILTER_TOP_LEVEL= PLUGIN_ID + ".filterTopLevel"; //$NON-NLS-1$
-	public static final String IMG_SORT_OUTLINE= PLUGIN_ID + ".sortOutline"; //$NON-NLS-1$
-	public static final String IMG_LINK_WITH_EDITOR= PLUGIN_ID + ".linkWithEditor"; //$NON-NLS-1$
-	public static final String IMG_REFRESH = PLUGIN_ID + ".IMG_REFRESH"; //$NON-NLS-1$
-	public static final String IMG_ANT_BUILD_TAB = PLUGIN_ID + ".IMG_BUILD_TAB"; //$NON-NLS-1$
-	
-	public static final String IMG_IMPORT_WIZARD_BANNER = PLUGIN_ID + ".IMG_IMPORT_WIZARD_BANNER"; //$NON-NLS-1$
-	 
-	//	Overlays
-	public static final String IMG_OVR_ERROR = PLUGIN_ID + ".ovrError";  //$NON-NLS-1$
-	public static final String IMG_OVR_WARNING = PLUGIN_ID + ".ovrWarning";  //$NON-NLS-1$
-	public static final String IMG_OVR_IMPORT = PLUGIN_ID + ".ovrImport"; //$NON-NLS-1$
-	
-	public static final String IMG_ANT_TYPE= PLUGIN_ID + ".type"; //$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$
-	
-	/**
-	 * Size of left-hand column for right-justified task name.
-	 * Used for Ant Build logging.
-	 * @see org.eclipse.ant.internal.ui.antsupport.logger.AntProcessBuildLogger#logMessage(String, BuildEvent, int)
-	  */
-	public static final int LEFT_COLUMN_SIZE = 15;
-	
-	/**
-	 * Id of the IProcessFactory to use when creating processes for remote Ant builds.
-	 */
-	public static final String REMOTE_ANT_PROCESS_FACTORY_ID= "org.eclipse.ant.ui.remoteAntProcessFactory"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIHelpContextIds.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIHelpContextIds.java
deleted file mode 100644
index 5fd7291..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIHelpContextIds.java
+++ /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
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.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 ADD_TYPE_DIALOG = PREFIX + "add_type_dialog_context"; //$NON-NLS-1$
-	public static final String EDIT_TYPE_DIALOG = PREFIX + "edit_type_dialog_context"; //$NON-NLS-1$
-	public static final String ADD_TASK_DIALOG = PREFIX + "add_task_dialog_context"; //$NON-NLS-1$
-	public static final String EDIT_TASK_DIALOG = PREFIX + "edit_task_dialog_context"; //$NON-NLS-1$
-	public static final String ADD_PROPERTY_DIALOG = PREFIX + "add_property_dialog_context"; //$NON-NLS-1$
-	public static final String EDIT_PROPERTY_DIALOG = PREFIX + "edit_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$
-	
-	// 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_JRE_PAGE = PREFIX + "ant_jre_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$
-	public static final String ANT_JRE_TAB = "ant_jre_tab_context"; //$NON-NLS-1$
-	public static final String ANT_BUILD_TAB = PREFIX + "ant_build_tab_context"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIPreferenceConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIPreferenceConstants.java
deleted file mode 100644
index f435411..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/IAntUIPreferenceConstants.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 53547
- *******************************************************************************/
-package org.eclipse.ant.internal.ui.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$
-	
-	/**
-	 * The symbolic names for colors for displaying the content in the Console
-	 * @see org.eclipse.jface.resource.ColorRegistry
-	 */
-	public static final String CONSOLE_ERROR_COLOR = "org.eclipse.ant.ui.errorColor"; //$NON-NLS-1$
-	public static final String CONSOLE_WARNING_COLOR = "org.eclipse.ant.ui.warningColor"; //$NON-NLS-1$
-	public static final String CONSOLE_INFO_COLOR = "org.eclipse.ant.ui.informationColor"; //$NON-NLS-1$
-	public static final String CONSOLE_VERBOSE_COLOR = "org.eclipse.ant.ui.verboseColor"; //$NON-NLS-1$
-	public static final String CONSOLE_DEBUG_COLOR = "org.eclipse.ant.ui.debugColor"; //$NON-NLS-1$	
-	
-	public static final String ANT_TOOLS_JAR_WARNING= "toolsJAR"; //$NON-NLS-1$
-	
-	public static final String ANT_ERROR_DIALOG= "errorDialog"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant editor should
-	 * show internal targets in the Outline.
-	 */
-	public static final String ANTEDITOR_FILTER_INTERNAL_TARGETS= "anteditor.filterInternalTargets"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant editor should
-	 * show imported elements in the Outline.
-	 */
-	public static final String ANTEDITOR_FILTER_IMPORTED_ELEMENTS = "anteditor.filterImportedElements"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant editor should
-	 * show properties in the Outline.
-	 */
-	public static final String ANTEDITOR_FILTER_PROPERTIES= "anteditor.filterProperties"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant editor should
-	 * show top level tasks/types in the Outline.
-	 */
-	public static final String ANTEDITOR_FILTER_TOP_LEVEL= "anteditor.filterTopLevel"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant editor should
-	 * sort elements in the Outline.
-	 */
-	public static final String ANTEDITOR_SORT= "anteditor.sort"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant Outline page 
-	 * links its selection to the active Ant editor.
-	 */
-	public static final String OUTLINE_LINK_WITH_EDITOR= "outline.linkWithEditor"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/ImageDescriptorRegistry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/ImageDescriptorRegistry.java
deleted file mode 100644
index ba1bc56..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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 display 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/internal/ui/preferences/AbstractClasspathEntry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractClasspathEntry.java
deleted file mode 100644
index 2333c4a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractClasspathEntry.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ant.core.IAntClasspathEntry;
-
-public abstract class AbstractClasspathEntry implements IClasspathEntry {
-
-	protected List childEntries = new ArrayList();
-	protected IClasspathEntry parent = null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.IClasspathEntry#getEntries()
-	 */
-	public IAntClasspathEntry[] getEntries() {
-		return (IAntClasspathEntry[])childEntries.toArray(new IAntClasspathEntry[childEntries.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.IClasspathEntry#hasEntries()
-	 */
-	public boolean hasEntries() {
-		return !childEntries.isEmpty();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.IClasspathEntry#getParent()
-	 */
-	public IClasspathEntry getParent() {
-		return parent;
-	}
-	
-	/**
-	 * @param parent The parent to set.
-	 */
-	public void setParent(IClasspathEntry parent) {
-		this.parent = parent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#getEntryURL()
-	 */
-	public URL getEntryURL() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#getLabel()
-	 */
-	public String getLabel() {
-		return toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#isEclipseRuntimeRequired()
-	 */
-	public boolean isEclipseRuntimeRequired() {
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java
deleted file mode 100644
index 51f92ed..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java
+++ /dev/null

@@ -1,633 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import java.io.File;
-import java.io.IOException;
-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.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.VariablesPlugin;
-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.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 libraryEntries;
-	private List existingNames;
-	
-	private String noNameErrorMsg;
-	private String alreadyExistsErrorMsg;
-	
-	private TreeAndListGroup selectionGroup;
-	
-	private Text nameField;
-	
-	private String name=""; //$NON-NLS-1$
-	private IAntClasspathEntry library= null;
-	private String className=""; //$NON-NLS-1$
-	
-	private boolean editing= false;
-	
-	private String helpContext;
-
-	/**
-	 * Creates a new dialog with the given shell and title.
-	 */
-	public AddCustomDialog(Shell parent, List libraryEntries, List existingNames, String helpContext) {
-		super(parent);
-		this.libraryEntries = libraryEntries;
-		this.existingNames= existingNames;
-		this.helpContext= helpContext;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite topComposite= (Composite) super.createDialogArea(parent);
-		topComposite.setSize(topComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
-		createNameGroup(topComposite);
-		new Label(topComposite, SWT.NULL);
-		createRootDirectoryGroup(topComposite);
-		createFileSelectionGroup(topComposite);
-		
-		if (library != null) {
-			setSourceName(library.getLabel());
-		}
-		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)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		WorkbenchHelp.setHelp(newShell, helpContext);
-	}
-	
-	/**
-	 * 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= libraryEntries.iterator();
-		while (libraries.hasNext()) {
-			ClasspathEntry entry = (ClasspathEntry) libraries.next();
-			sourceNameField.add(entry.getLabel());
-		}
-
-		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 file 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, false);
-
-		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 <code>null</code> if this file does not exist or is not of valid format.
-	 */
-	private ZipFile getSpecifiedSourceFile() {
-		try {
-			String expanded = sourceNameField.getText();
-			expanded= VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(expanded);
-			return new ZipFile(expanded);
-		} 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);
-		} catch (CoreException e) {
-			StatusInfo status= new StatusInfo();
-			status.setError(AntPreferencesMessages.getString("AddCustomDialog.13")); //$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;
-					}
-					
-					//If we have not populated then wait until asked
-					return true;
-				}
-				return false;
-			}
-		};
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
-	 */
-	protected void cancelPressed() {
-		clearProviderCache();
-		super.cancelPressed();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		clearProviderCache();
-		name= nameField.getText().trim();
-		library= (ClasspathEntry)libraryEntries.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.getEntryURL().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 setLibraryEntry(IAntClasspathEntry library) {
-		this.library= library;
-		editing= true;
-	}
-	
-	protected IAntClasspathEntry getLibraryEntry() {
-		return this.library;
-	}
-	
-	protected String getClassName() {
-		return className;
-	}
-	
-	protected void setClassName(String className) {
-		this.className= className;
-	}
-	
-	/* (non-Javadoc)
-	 * @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;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddPropertyDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddPropertyDialog.java
deleted file mode 100644
index b47739b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddPropertyDialog.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.debug.internal.ui.stringsubstitution.StringVariableSelectionDialog;
-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.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.Text;
-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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite comp= (Composite) super.createDialogArea(parent);
-		((GridLayout) comp.getLayout()).numColumns = 2;
-		
-		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]);
-		GridData 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();
-			}
-		});		
-		
-		Button variablesButton = new Button(comp, SWT.PUSH);
-		variablesButton.setText(AntPreferencesMessages.getString("AddPropertyDialog.2")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.horizontalSpan = 2;
-		gd.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint = Math.max(widthHint, variablesButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		variablesButton.setLayoutData(gd);
-		variablesButton.setFont(comp.getFont());
-		
-		variablesButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent se) {
-				getVariable();
-			}
-		});
-		
-		return comp;
-	}
-	
-	protected void getVariable() {
-		StringVariableSelectionDialog variablesDialog = new StringVariableSelectionDialog(getShell());
-		int returnCode = variablesDialog.open();
-		if (returnCode == IDialogConstants.OK_ID) {
-			String variable = variablesDialog.getVariableExpression();
-			if (variable != null) {
-				fValueText.append(variable.trim());
-			}
-		}
-	}
-
-	/**
-	 * 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};
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.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);
-	}
-	
-	/* (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);
-		}
-		if (fInitialValues[0].length() == 0) {
-			WorkbenchHelp.setHelp(shell, IAntUIHelpContextIds.ADD_PROPERTY_DIALOG);
-		} else {
-			WorkbenchHelp.setHelp(shell, IAntUIHelpContextIds.EDIT_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.
-	 * @see org.eclipse.jface.window.Window#create()
-	 */
-	public void create() {
-		super.create();
-		updateButtons();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java
deleted file mode 100644
index 64b903f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java
+++ /dev/null

@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.ui.launchConfigurations.VariableInputDialog;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.jdt.internal.debug.ui.actions.ArchiveFilter;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ILabelProvider;
-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.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Tree;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceSorter;
-
-public class AntClasspathBlock {
-
-	private static final String[] TOOLS= new String[] {"tools.jar"}; //$NON-NLS-1$
-
-	private TreeViewer treeViewer;
-	private AntClasspathContentProvider antContentProvider;
-
-	private Button upButton;
-	private Button downButton;
-	private Button removeButton;
-
-	private AntClasspathLabelProvider labelProvider = new AntClasspathLabelProvider(this);
-	private Button addFolderButton;
-	private Button addJARButton;
-	private Button addExternalJARButton;
-	private Button addVariableButton;
-	private Button antHomeButton;
-	
-	private String antHome;
-
-	private IDialogSettings dialogSettings = AntUIPlugin.getDefault().getDialogSettings();
-	
-	private IAntBlockContainer container;
-	
-	private int validated= 2;
-	
-	private IClasspathEntry currentParent;
-	
-	private SelectionListener selectionListener= new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == addJARButton) {
-				addJars();
-			} else if (source == addExternalJARButton) {
-				addExternalJars();
-			} else if (source == addFolderButton) {
-				addFolder(); //$NON-NLS-1$
-			} else if (upButton == source) {
-					handleMoveUp();
-			} else if (downButton == source) {
-				handleMoveDown();
-			} else if (removeButton == source) {
-				remove();
-			} else if (addVariableButton == source) {
-				addVariable();
-			} else if (antHomeButton == source) {
-				browseAntHome();
-			}
-		}
-	};
-	
-	public void setContainer(IAntBlockContainer container) {
-		this.container= container; 
-	}
-	
-	private void addButtonsToButtonGroup(Composite parent) {
-	
-		upButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.upButtonTitle")); //$NON-NLS-1$;
-		upButton.addSelectionListener(selectionListener);
-		downButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.downButtonTitle")); //$NON-NLS-1$;
-		downButton.addSelectionListener(selectionListener);
-		removeButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.removeButtonTitle")); //$NON-NLS-1$;
-		removeButton.addSelectionListener(selectionListener);
-		
-		addJARButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.addJarButtonTitle")); //$NON-NLS-1$;
-		addJARButton.addSelectionListener(selectionListener);
-	
-		addExternalJARButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.42")); //$NON-NLS-1$
-		addExternalJARButton.addSelectionListener(selectionListener);
-		addFolderButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.addFolderButtonTitle")); //$NON-NLS-1$;
-		addFolderButton.addSelectionListener(selectionListener);
-		
-		addVariableButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.2")); //$NON-NLS-1$
-		addVariableButton.addSelectionListener(selectionListener);
-		
-		antHomeButton= container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.30")); //$NON-NLS-1$
-		antHomeButton.addSelectionListener(selectionListener);
-	}
-	
-	/**
-	 * Returns the selected items in the list, in the order they are
-	 * displayed.
-	 * 
-	 * @return targets for an action
-	 */
-	private List getOrderedSelection(IClasspathEntry parent) {
-		List targets = new ArrayList();
-		List selection = ((IStructuredSelection)treeViewer.getSelection()).toList();
-		IAntClasspathEntry[] entries = parent.getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			IAntClasspathEntry target = entries[i];
-			if (selection.contains(target)) {
-				targets.add(target);
-			}
-		}
-		return targets;		
-	}
-	
-	private void handleMoveDown() {
-		List targets = getOrderedSelection(currentParent);
-		List list= new ArrayList(Arrays.asList(currentParent.getEntries()));
-		int bottom = list.size() - 1;
-		int index = 0;
-		for (int i = targets.size() - 1; i >= 0; i--) {
-			Object target = targets.get(i);
-			index = list.indexOf(target);
-			if (index < bottom) {
-				bottom = index + 1;
-				Object temp = list.get(bottom);
-				list.set(bottom, target);
-				list.set(index, temp);
-			}
-			bottom = index;
-		} 
-		finishMove(list);
-	}
-	
-	private void finishMove(List list) {
-		AntClasspathContentProvider viewerContentProvider = (AntClasspathContentProvider) treeViewer.getContentProvider();
-		viewerContentProvider.setEntries(currentParent, list);
-		treeViewer.refresh();
-		treeViewer.setSelection(treeViewer.getSelection());
-		updateContainer();
-	}
-
-	private void handleMoveUp() {
-		List targets = getOrderedSelection(currentParent);
-		int top = 0;
-		int index = 0;
-		List list= new ArrayList(Arrays.asList(currentParent.getEntries()));
-		Iterator entries = targets.iterator();
-		while (entries.hasNext()) {
-			Object target = entries.next();
-			index = list.indexOf(target);
-			if (index > top) {
-				top = index - 1;
-				Object temp = list.get(top);
-				list.set(top, target);
-				list.set(index, temp);
-			}
-			top = index;
-		}
-		
-		finishMove(list);
-	}
-
-	private void remove() {
-		AntClasspathContentProvider viewerContentProvider = (AntClasspathContentProvider) treeViewer.getContentProvider();
-		IStructuredSelection sel = (IStructuredSelection) treeViewer.getSelection();
-		viewerContentProvider.remove(sel);
-		updateContainer();
-	}
-
-	/**
-	 * Allows the user to enter a folder as a classpath.
-	 */
-	private void addFolder() {
-		String lastUsedPath = dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTFOLDER);
-		if (lastUsedPath == null) {
-			lastUsedPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
-		}
-		DirectoryDialog dialog = new DirectoryDialog(treeViewer.getControl().getShell());
-		dialog.setMessage(AntPreferencesMessages.getString("AntClasspathBlock.1")); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String result = dialog.open();
-		if (result != null) {
-			try {
-				URL url = new URL("file:" + result + "/"); //$NON-NLS-2$;//$NON-NLS-1$;
-				((AntClasspathContentProvider)treeViewer.getContentProvider()).add(currentParent, url);
-			} catch (MalformedURLException e) {
-			}
-		}
-		treeViewer.setSelection(treeViewer.getSelection());
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTFOLDER, result);
-		updateContainer();
-	}
-
-	private void addExternalJars() {
-		String lastUsedPath = dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTEXTJAR);
-		if (lastUsedPath == null) {
-			lastUsedPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
-		}
-		FileDialog dialog = new FileDialog(treeViewer.getControl().getShell(), SWT.MULTI);
-		dialog.setFilterExtensions(new String[] { "*.jar;*.zip" }); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-
-		String result = dialog.open();
-		if (result == null) {
-			return;
-		}
-		IPath filterPath = new Path(dialog.getFilterPath());
-		String[] results = dialog.getFileNames();
-		AntClasspathContentProvider contentProvider= (AntClasspathContentProvider)treeViewer.getContentProvider();
-		contentProvider.setRefreshEnabled(false);
-		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$;
-				contentProvider.add(currentParent, url);
-			} catch (MalformedURLException e) {
-			}
-		}
-		contentProvider.setRefreshEnabled(true);
-
-		treeViewer.setSelection(treeViewer.getSelection());
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTEXTJAR, filterPath.toOSString());
-		updateContainer();
-	}
-	
-	private void addJars() {
-		List allEntries= new ArrayList();
-		if (currentParent != null) {
-			allEntries.addAll(Arrays.asList(currentParent.getEntries()));
-		} else {
-			Object[] entries= antContentProvider.getModel().getEntries(ClasspathModel.USER);
-			if (entries != null) {
-				allEntries.addAll(Arrays.asList(entries));
-			}
-		}
-		
-		ViewerFilter filter= new ArchiveFilter(allEntries);
-		
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(treeViewer.getControl().getShell(), lp, cp);
-		dialog.setTitle(AntPreferencesMessages.getString("AntClasspathBlock.44"));  //$NON-NLS-1$
-		dialog.setMessage(AntPreferencesMessages.getString("AntClasspathBlock.45")); //$NON-NLS-1$
-		dialog.addFilter(filter);
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());	
-		dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
-		
-		ISelectionStatusValidator validator= new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection.length == 0) {
-					return new Status(IStatus.ERROR, AntUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-				}
-				for (int i= 0; i < selection.length; i++) {
-					if (!(selection[i] instanceof IFile)) {
-						return new Status(IStatus.ERROR, AntUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-					}					
-				}
-				return new Status(IStatus.OK, AntUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-			}			
-		};
-		dialog.setValidator(validator);
-
-		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			AntClasspathContentProvider contentProvider= (AntClasspathContentProvider)treeViewer.getContentProvider();
-			contentProvider.setRefreshEnabled(false);
-			for (int i = 0; i < elements.length; i++) {
-				IFile file = (IFile)elements[i];
-				String varExpression= VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", file.getFullPath().toString()); //$NON-NLS-1$
-				contentProvider.add(currentParent, varExpression);
-			}
-			contentProvider.setRefreshEnabled(true);
-			updateContainer();
-		}
-	}
-		
-	private void updateContainer() {
-		validated= 0;
-		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 createClasspathTree(Composite parent) {
-		Tree tree = new Tree(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		data.heightHint = tree.getItemHeight();
-		tree.setLayoutData(data);
-		tree.setFont(parent.getFont());
-		
-		tree.addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					remove();
-				}
-			}
-		});	
-
-		antContentProvider = new AntClasspathContentProvider();
-		treeViewer = new TreeViewer(tree);
-		treeViewer.setContentProvider(antContentProvider);
-		treeViewer.setLabelProvider(labelProvider);
-		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				tableSelectionChanged((IStructuredSelection) event.getSelection(),
-					(AntClasspathContentProvider) treeViewer.getContentProvider());
-			}
-		});
-	}
-			
-	public void createContents(Composite parent) {
-		createClasspathTree(parent);
-		createButtonGroup(parent);
-		
-		tableSelectionChanged((IStructuredSelection)treeViewer.getSelection(), antContentProvider);
-	}
-	
-	private void tableSelectionChanged(IStructuredSelection selection, AntClasspathContentProvider contentProvider) {
-		
-		boolean notEmpty = !selection.isEmpty();
-		Iterator selected = selection.iterator();
-		boolean first = false;
-		boolean last = false;
-		boolean canRemove= true;
-		
-		while (selected.hasNext()) {
-			IClasspathEntry element = (IClasspathEntry) selected.next();
-			
-			if (element instanceof GlobalClasspathEntries) {
-				if (!((GlobalClasspathEntries)element).canBeRemoved()) {
-					canRemove= false;
-				}
-			}
-			IClasspathEntry parent= element.getParent();
-			Object[] childEntries = contentProvider.getChildren(parent);
-			List entries = Arrays.asList(childEntries);
-			int lastEntryIndex = entries.size() - 1;
-			if (!first && entries.indexOf(element) == 0) {
-				first = true;
-			}
-			if (!last && entries.indexOf(element) == lastEntryIndex) {
-				last = true;
-			}
-		}
-
-		boolean canAdd= resolveCurrentParent(selection) && notEmpty;	
-		
-		if (addJARButton != null) {
-			addJARButton.setEnabled(canAdd);
-		}
-		addExternalJARButton.setEnabled(canAdd);
-		addFolderButton.setEnabled(canAdd);
-		addVariableButton.setEnabled(canAdd);
-		removeButton.setEnabled(notEmpty && canRemove);
-		upButton.setEnabled((canRemove) && notEmpty && !first);
-		downButton.setEnabled((canRemove) && notEmpty && !last);
-		
-	}
-	
-	private boolean resolveCurrentParent(IStructuredSelection selection) {
-		currentParent= null;
-		Iterator selected= selection.iterator();
-		
-		while (selected.hasNext()) {
-			Object element = selected.next();
-			if (element instanceof ClasspathEntry) {
-				IClasspathEntry parent= ((IClasspathEntry)element).getParent();
-				if (currentParent != null) {
-					if (!currentParent.equals(parent)) {
-						return false;
-					}
-				} else {
-					currentParent= parent;
-				}
-			} else {
-				if (currentParent != null) {
-					if (!currentParent.equals(element)) {
-						return false;
-					}
-				} else {
-					currentParent= (IClasspathEntry)element;
-				}
-			}
-		}
-		return true;
-	}
-
-	private File validateAntHome(String path) {
-		File rootDir = null;
-		boolean invalid= true;
-		if (path.length() > 0) {
-			rootDir= new File(path, "lib"); //$NON-NLS-1$
-			File parentDir= rootDir.getParentFile();
-			if (parentDir == null || !parentDir.exists()) {
-				container.setErrorMessage(AntPreferencesMessages.getString("AntClasspathBlock.56")); //$NON-NLS-1$
-			} else if (!rootDir.exists()) {
-				container.setErrorMessage(AntPreferencesMessages.getString("AntClasspathBlock.7")); //$NON-NLS-1$
-			} else {
-				invalid= false;
-			}
-		} else {			
-			container.setErrorMessage(AntPreferencesMessages.getString("AntClasspathBlock.57")); //$NON-NLS-1$
-		}
-		if (invalid) {
-			setValidated();
-			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(treeViewer.getControl().getShell());
-		dialog.setMessage(AntPreferencesMessages.getString("AntClasspathBlock.3")); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String path = dialog.open();
-		if (path == null) {
-			return;
-		}
-		antHome= path;
-		if (path.length() > 0) {
-			File rootDir = new File(path, "lib"); //$NON-NLS-1$
-			setAntHome(rootDir);
-		} else {
-			updateContainer();
-		}
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTANTHOME, path);
-	}
-		
-	private void setAntHome(File rootDir) {
-		AntClasspathContentProvider contentProvider = (AntClasspathContentProvider) treeViewer.getContentProvider();
-		contentProvider.setRefreshEnabled(false);
-		contentProvider.removeAllGlobalAntClasspathEntries();
-		String[] names = rootDir.list();
-		if (names != null) {
-			Arrays.sort(names);
-			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 {
-						URL url = new URL("file:" +  file.getAbsolutePath()); //$NON-NLS-1$
-						contentProvider.add(ClasspathModel.ANT_HOME, url);
-					} catch (MalformedURLException e) {
-					}
-				}
-			}
-		}
-		
-		contentProvider.setRefreshEnabled(true);
-		updateContainer();
-	}
-	
-	public String getAntHome() {
-		return antHome;
-	}
-	
-	public void initializeAntHome(String antHomeString) {
-		antHome= antHomeString;
-	}
-	
-	public void setInput(ClasspathModel model) {
-		treeViewer.setInput(model);
-		validated= 0;
-	}
-	
-	public boolean validateAntHome() {
-		validated++;
-		return validateAntHome(antHome) != null;
-	}
-	
-	public Image getClasspathImage() {
-		return labelProvider.getClasspathImage();
-	}
-	
-	public boolean validateToolsJAR() {
-		validated++;
-		boolean check= AntUIPlugin.getDefault().getPreferenceStore().getBoolean(IAntUIPreferenceConstants.ANT_TOOLS_JAR_WARNING);
-		if (check && !AntUIPlugin.isMacOS()) {
-			Object[] entries= antContentProvider.getModel().getEntries(ClasspathModel.ANT_HOME);
-			boolean valid= !JARPresent(entries, TOOLS).isEmpty();
-			if (!valid) {
-				entries= antContentProvider.getModel().getEntries(ClasspathModel.GLOBAL_USER);
-				valid= !JARPresent(entries, TOOLS).isEmpty();
-				if (!valid) {
-					entries= antContentProvider.getModel().getEntries(ClasspathModel.USER);
-					valid= !JARPresent(entries, TOOLS).isEmpty();
-					if (!valid) {
-						valid= MessageDialogWithToggle.openQuestion(AntUIPlugin.getActiveWorkbenchWindow().getShell(), AntPreferencesMessages.getString("AntClasspathBlock.31"), AntPreferencesMessages.getString("AntClasspathBlock.32"), IAntUIPreferenceConstants.ANT_TOOLS_JAR_WARNING, AntPreferencesMessages.getString("AntClasspathBlock.33"), AntUIPlugin.getDefault().getPreferenceStore()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				}
-			}
-			if (!valid) {
-				container.setErrorMessage(AntPreferencesMessages.getString("AntClasspathBlock.34")); //$NON-NLS-1$
-				setValidated();
-			}
-			return valid;
-		}
-		return true;
-	}
-
-	private List JARPresent(Object[] classpathEntries, String[] suffixes) {
-		if (classpathEntries == null) {
-			return Collections.EMPTY_LIST;
-		}
-		List found= new ArrayList(2);
-		for (int i = 0; i < classpathEntries.length; i++) {
-			String file;
-			Object entry = classpathEntries[i];
-			if (entry instanceof URL) {
-				file= ((URL)entry).getFile();
-			} else {
-				file= entry.toString();
-			}
-			for (int j = 0; j < suffixes.length; j++) {
-				String suffix = suffixes[j];
-				if (file.endsWith(suffix)) {
-					found.add(suffix);
-				}
-			}
-		}
-		return found;
-	}
-	
-	public boolean isValidated() {
-		return validated >= 2;
-	}
-	
-	public void setValidated() {
-		validated= 2;
-	}
-	
-	private void addVariable() {
-		VariableInputDialog inputDialog = new VariableInputDialog(treeViewer.getControl().getShell());
-		inputDialog.open();
-		String variableString= inputDialog.getVariableString();
-		if (variableString != null && variableString.trim().length() > 0) {
-			((AntClasspathContentProvider)treeViewer.getContentProvider()).add(currentParent, variableString);
-			treeViewer.setSelection(treeViewer.getSelection());
-			updateContainer();
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathContentProvider.java
deleted file mode 100644
index 6198d85..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathContentProvider.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.ant.internal.ui.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * Content provider that maintains a list of classpath entries which are shown in a tree
- * viewer.
- */
-public class AntClasspathContentProvider implements ITreeContentProvider {
-	private TreeViewer treeViewer;
-	private ClasspathModel model= null;
-	private boolean refreshEnabled= false;
-	private boolean refreshRequested= false;
-		
-	public void add(IClasspathEntry parent, Object child) {
-		Object newEntry= null;
-		boolean added= false;
-		if (parent == null || parent == model) {
-			added= true;
-			newEntry= model.addEntry(child);
-			if (newEntry == null) {
-				//entry already exists
-				newEntry= model.createEntry(child, model);
-				added= false;
-			}
-			parent= model;
-		} else if (parent instanceof GlobalClasspathEntries) {
-			GlobalClasspathEntries globalParent= (GlobalClasspathEntries) parent;
-			newEntry= model.createEntry(child, globalParent);
-			ClasspathEntry newClasspathEntry= (ClasspathEntry) newEntry;
-			if (!globalParent.contains(newClasspathEntry)) {
-				added= true;
-				globalParent.addEntry(newClasspathEntry);
-			}
-		} 
-		if (newEntry != null) {
-			if (added) {
-				treeViewer.add(parent, newEntry);
-			}
-			treeViewer.setExpandedState(parent, true);
-			treeViewer.setSelection(new StructuredSelection(newEntry), true);
-			refresh();
-		}
-	}
-	
-	public void add(int entryType, Object child) {
-		Object newEntry= model.addEntry(entryType, child);
-		if (newEntry != null) {
-			treeViewer.add(getParent(newEntry), newEntry);
-			refresh();
-		}
-	}
-
-	public void removeAll() {
-		model.removeAll();
-		refresh();
-	}
-	
-	private void refresh() {
-		if (refreshEnabled) {
-			treeViewer.refresh();
-			refreshRequested= false;
-		} else {
-			refreshRequested= true;
-		}
-	}
-	
-	public void removeAllGlobalAntClasspathEntries() {
-		model.removeAll(ClasspathModel.ANT_HOME);
-		refresh();
-	}
-
-	/**
-	 * @see ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof ClasspathEntry) {
-			return ((ClasspathEntry)element).getParent();
-		}
-		if (element instanceof GlobalClasspathEntries) {
-			return model;
-		}
-		
-		return null;
-	}
-
-	/**
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof ClasspathEntry) {
-			return false;
-		}
-		if (element instanceof GlobalClasspathEntries) {
-			return ((GlobalClasspathEntries)element).hasEntries();
-			
-		} 
-		
-		if (element instanceof ClasspathModel) {
-			return ((ClasspathModel) element).hasEntries();
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-
-	}
-
-	/* (non-Javadoc)
-	 * @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) {
-		treeViewer = (TreeViewer) viewer;
-		
-		if (newInput != null) {
-			model= (ClasspathModel)newInput;
-		} else {
-			if (model != null) {
-				model.removeAll();
-			}
-			model= null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof GlobalClasspathEntries) {
-			return ((GlobalClasspathEntries)parentElement).getEntries();
-		}
-		if (parentElement instanceof ClasspathModel) {
-			return ((ClasspathModel)parentElement).getEntries();
-		}
-		if (parentElement == null) {
-			List all= new ArrayList();
-			Object[] topEntries= model.getEntries();
-			for (int i = 0; i < topEntries.length; i++) {
-				Object object = topEntries[i];
-				if (object instanceof ClasspathEntry) {
-					all.add(object);
-				} else if (object instanceof GlobalClasspathEntries) {
-					all.addAll(Arrays.asList(((GlobalClasspathEntries)object).getEntries()));
-				}
-			}
-			return all.toArray();
-		}
-		
-		return null;
-	}
-
-	public void remove(IStructuredSelection selection) {
-		Object[] array= selection.toArray();
-		model.removeAll(array);
-		treeViewer.remove(array);
-		refresh();
-	}
-
-	public ClasspathModel getModel() {
-		return model;
-	}
-
-	public void setRefreshEnabled(boolean refreshEnabled) {
-		this.refreshEnabled = refreshEnabled;
-		treeViewer.getTree().setRedraw(refreshEnabled);
-		if (refreshEnabled && refreshRequested) {
-			refresh();
-		}
-	}
-
-	/**
-	 * @param currentParent
-	 */
-	public void setEntries(IClasspathEntry currentParent, List entries) {
-		if (currentParent instanceof GlobalClasspathEntries) {
-			GlobalClasspathEntries group= (GlobalClasspathEntries) currentParent;
-			group.setEntries(entries);
-		}
-		
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathLabelProvider.java
deleted file mode 100644
index 667d501..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathLabelProvider.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-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;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Label provider for classpath elements
- */
-public class AntClasspathLabelProvider implements ILabelProvider, IColorProvider {
-
-
-	private AntClasspathBlock fBlock;
-	
-	public AntClasspathLabelProvider(AntClasspathBlock block) {
-		fBlock= block;
-	}
-
-	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);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		String file;
-		if (element instanceof ClasspathEntry) {
-			ClasspathEntry entry = (ClasspathEntry) element;
-			file= entry.toString();
-			if (file.endsWith("/")) { //$NON-NLS-1$
-				return getFolderImage();
-			} 
-			return getJarImage();
-		}
-		
-		return getClasspathImage();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		if (element instanceof IAntClasspathEntry) {
-			StringBuffer label= new StringBuffer(((IAntClasspathEntry)element).getLabel());
-			if (element instanceof GlobalClasspathEntries && ((GlobalClasspathEntries)element).getType() == ClasspathModel.ANT_HOME) {
-				AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-				String defaultAntHome= prefs.getDefaultAntHome();
-				String currentAntHome= fBlock.getAntHome();
-				label.append(" ("); //$NON-NLS-1$
-				if (defaultAntHome.equals(currentAntHome)) {
-					label.append(AntPreferencesMessages.getString("AntClasspathLabelProvider.0")); //$NON-NLS-1$
-				} else {
-					label.append(fBlock.getAntHome());	
-				}
-				label.append(')');
-			}
-			return label.toString();
-		}
-		return element.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
-	public Color getBackground(Object element) {
-		if (element instanceof GlobalClasspathEntries) {
-			Display display= Display.getCurrent();
-			return display.getSystemColor(SWT.COLOR_INFO_BACKGROUND);		
-		} else if (element instanceof ClasspathEntry) {
-			
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
-	public Color getForeground(Object element) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.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(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathPage.java
deleted file mode 100644
index 1c70548..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathPage.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.ui.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;
-	private ClasspathModel model;
-	
-	/**
-	 * Creates an instance.
-	 */
-	public AntClasspathPage(AntRuntimePreferencePage preferencePage) {
-		this.preferencePage = preferencePage;
-	}
-	
-	/**
-	 * Returns the specified user classpath entries
-	 * 
-	 * @return set of user classpath entries
-	 */
-	protected IAntClasspathEntry[] getAdditionalEntries() {
-		return model.getEntries(ClasspathModel.GLOBAL_USER);
-	}
-	
-	/**
-	 * Returns the specified ant home classpath entries
-	 */
-	protected IAntClasspathEntry[] getAntHomeEntries() {
-		return model.getEntries(ClasspathModel.ANT_HOME);
-	}
-	
-	protected String getAntHome() {
-		return antClasspathBlock.getAntHome();
-	}
-	
-	/**
-	 * Sets the contents of the tables on this page.
-	 */
-	protected void initialize() {
-		
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		createClasspathModel();
-		antClasspathBlock.initializeAntHome(prefs.getAntHome());
-		antClasspathBlock.setInput(model);
-		
-		preferencePage.setErrorMessage(null);
-		preferencePage.setValid(true);
-	}
-	
-	protected void createClasspathModel() {
-		model= new ClasspathModel();
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		model.setAntHomeEntries(prefs.getAntHomeClasspathEntries());
-		model.setGlobalEntries(prefs.getAdditionalClasspathEntries());
-	}
-	
-	protected void performDefaults() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		model= new ClasspathModel();
-		model.setAntHomeEntries(prefs.getDefaultAntHomeEntries());
-		IAntClasspathEntry toolsEntry= prefs.getToolsJarEntry();
-		IAntClasspathEntry[] additionalEntries;
-		if (toolsEntry == null) {
-			additionalEntries= new IAntClasspathEntry[0];
-		} else {
-			additionalEntries= new IAntClasspathEntry[] {toolsEntry};
-		}
-		model.setGlobalEntries(additionalEntries);
-		antClasspathBlock.initializeAntHome(prefs.getDefaultAntHome());
-		antClasspathBlock.setInput(model);
-		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.internal.ui.preferences.IAntBlockContainer#update()
-	 */
-	public void update() {
-		if (antClasspathBlock.isValidated()){
-			return;
-		}
-		setMessage(null);
-		setErrorMessage(null);
-		boolean valid= antClasspathBlock.validateAntHome();
-	
-		if (valid) {
-			valid= antClasspathBlock.validateToolsJAR();
-		}
-		
-		preferencePage.setValid(valid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.IAntBlockContainer#setMessage(java.lang.String)
-	 */
-	public void setMessage(String message) {
-		preferencePage.setMessage(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.IAntBlockContainer#setErrorMessage(java.lang.String)
-	 */
-	public void setErrorMessage(String message) {
-		preferencePage.setErrorMessage(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.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/internal/ui/preferences/AntCodeFormatterPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntCodeFormatterPreferencePage.java
deleted file mode 100644
index a143315..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntCodeFormatterPreferencePage.java
+++ /dev/null

@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IMessageProvider;
-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.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/*
- * The page to configure the code formatter options.
- */
-public class AntCodeFormatterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	
-	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 Map fNumberFields= new HashMap();
-	private ModifyListener fNumberFieldListener= new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			numberFieldChanged((Text) e.widget);
-		}
-	};
-	
-	public AntCodeFormatterPreferencePage() {
-		setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-		fOverlayStore= createOverlayStore();
-	}
-	
-	private OverlayPreferenceStore createOverlayStore() {
-		List overlayKeys= new ArrayList();
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.FORMATTER_WRAP_LONG));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.FORMATTER_ALIGN));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.FORMATTER_COMMENTS));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.FORMATTER_DELETE_BLANK_LINES));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AntEditorPreferenceConstants.FORMATTER_MAX_LINE_LENGTH));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.FORMATTER_TAB_CHAR));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AntEditorPreferenceConstants.FORMATTER_TAB_SIZE));
-		
-		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return new OverlayPreferenceStore(getPreferenceStore(), keys);
-	}
-	
-	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;
-	}
-	
-	/*
-	 * @see PreferencePage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		//TODO set help
-		//WorkbenchHelp.setHelp(getControl(), "ANT_FORMATTER_PREFERENCE_PAGE"); //$NON-NLS-1$
-	}
-
-	protected Control createContents(Composite parent) {
-		initializeDialogUnits(parent);
-		fOverlayStore.load();
-		fOverlayStore.start();
-		int numColumns= 2;
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth= 0;
-		layout.verticalSpacing= convertVerticalDLUsToPixels(10);
-		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		result.setLayout(layout);
-		
-		Group indentationGroup= createGroup(numColumns, result, AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.0")); //$NON-NLS-1$
-		
-		String labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.1"); //$NON-NLS-1$
-		String[] errorMessages= new String[]{AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.2"), AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.3")}; //$NON-NLS-1$ //$NON-NLS-2$
-		addTextField(indentationGroup, labelText, AntEditorPreferenceConstants.FORMATTER_TAB_SIZE, 3, 0, errorMessages);
-		
-		labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.4"); //$NON-NLS-1$
-		addCheckBox(indentationGroup, labelText, AntEditorPreferenceConstants.FORMATTER_TAB_CHAR, 1);
-		
-		Group wrappingGroup= createGroup(numColumns, result, AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.6")); //$NON-NLS-1$
-		labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.7"); //$NON-NLS-1$
-		errorMessages= new String[]{AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.8"), AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.9")}; //$NON-NLS-1$ //$NON-NLS-2$
-		addTextField(wrappingGroup, labelText, AntEditorPreferenceConstants.FORMATTER_MAX_LINE_LENGTH, 3, 0, errorMessages);
-		labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.10"); //$NON-NLS-1$
-		addCheckBox(wrappingGroup, labelText, AntEditorPreferenceConstants.FORMATTER_WRAP_LONG, 1);
-		labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.5"); //$NON-NLS-1$
-		addCheckBox(wrappingGroup, labelText, AntEditorPreferenceConstants.FORMATTER_ALIGN, 1);
-		
-		Group whiteSpaceGroup= createGroup(numColumns, result, AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.11")); //$NON-NLS-1$
-		labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.12"); //$NON-NLS-1$
-		addCheckBox(whiteSpaceGroup, labelText, AntEditorPreferenceConstants.FORMATTER_DELETE_BLANK_LINES, 1);
-		
-		Group commentsGroup= createGroup(numColumns, result, AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.13")); //$NON-NLS-1$
-		labelText= AntPreferencesMessages.getString("AntCodeFormatterPreferencePage.14"); //$NON-NLS-1$
-		addCheckBox(commentsGroup, labelText, AntEditorPreferenceConstants.FORMATTER_COMMENTS, 1);
-		
-		initializeFields();
-		
-		applyDialogFont(result);
-	
-		return result;
-	}
-	
-	private Control addTextField(Composite composite, String labelText, String key, int textLimit, int indentation, String[] errorMessages) {
-		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 (errorMessages != null) {
-			fNumberFields.put(textControl, errorMessages);
-			textControl.addModifyListener(fNumberFieldListener);
-		} else {
-			textControl.addModifyListener(fTextFieldListener);
-		}
-			
-		return textControl;
-	}
-	
- 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-	/**
-	 * Convenience method to create a GridData.
-	 */
-	private static GridData createGridData(int numColumns, int style, int widthHint) {
-		final GridData gd= new GridData(style);
-		gd.horizontalSpan= numColumns;
-		gd.widthHint= widthHint;
-		return gd;		
-	}
-	
-	/**
-	 * Convenience method to create a group
-	 */
-	private Group createGroup(int numColumns, Composite parent, String text ) {
-		final Group group= new Group(parent, SWT.NONE);
-		group.setLayoutData(createGridData(numColumns, GridData.FILL_HORIZONTAL, 0));
-		
-		final GridLayout layout= new GridLayout(numColumns, false);
-		layout.verticalSpacing=  convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		
-		group.setLayout(layout);//createGridLayout(numColumns, true));
-		group.setText(text);
-		return group;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		
-		fOverlayStore.loadDefaults();
-
-		initializeFields();
-
-		super.performDefaults();
-	}
-	
-	private void initializeFields() {
-		
-		Iterator iter= fCheckBoxes.keySet().iterator();
-		while (iter.hasNext()) {
-			Button b= (Button) iter.next();
-			String key= (String) fCheckBoxes.get(b);
-			b.setSelection(fOverlayStore.getBoolean(key));
-		}
-		
-		iter= fTextFields.keySet().iterator();
-		while (iter.hasNext()) {
-			Text t= (Text) iter.next();
-			String key= (String) fTextFields.get(t);
-			t.setText(fOverlayStore.getString(key));
-		}		
-	}
-	
-	private void numberFieldChanged(Text textControl) {
-		String number= textControl.getText();
-		IStatus status= validatePositiveNumber(number, (String[])fNumberFields.get(textControl));
-		if (!status.matches(IStatus.ERROR)) {
-			fOverlayStore.setValue((String) fTextFields.get(textControl), number);
-		}
-		updateStatus(status);
-	}
-	
-	private IStatus validatePositiveNumber(String number, String[] errorMessages) {
-		StatusInfo status= new StatusInfo();
-		if (number.length() == 0) {
-			status.setError(errorMessages[0]);
-		} else {
-			try {
-				int value= Integer.parseInt(number);
-				if (value < 0)
-					status.setError(MessageFormat.format(errorMessages[1], new String[]{number})); //$NON-NLS-1$
-			} catch (NumberFormatException e) {
-				status.setError(MessageFormat.format(errorMessages[1], new String[]{number})); //$NON-NLS-1$
-			}
-		}
-		return status;
-	}
-	
-	private void updateStatus(IStatus status) {
-		if (!status.matches(IStatus.ERROR)) {
-			Set keys= fNumberFields.keySet();
-			for (Iterator iter = keys.iterator(); iter.hasNext();) {
-				Text text = (Text) iter.next();
-				IStatus s= validatePositiveNumber(text.getText(), (String[])fNumberFields.get(text));
-				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.
-	 */
-	private void applyToStatusLine(DialogPage page, IStatus status) {
-		String message= status.getMessage();
-		switch (status.getSeverity()) {
-			case IStatus.OK:
-				page.setMessage(message, IMessageProvider.NONE);
-				page.setErrorMessage(null);
-				break;
-			case IStatus.WARNING:
-				page.setMessage(message, IMessageProvider.WARNING);
-				page.setErrorMessage(null);
-				break;				
-			case IStatus.INFO:
-				page.setMessage(message, IMessageProvider.INFORMATION);
-				page.setErrorMessage(null);
-				break;			
-			default:
-				if (message.length() == 0) {
-					message= null;
-				}
-				page.setMessage(null);
-				page.setErrorMessage(message);
-				break;		
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		fOverlayStore.propagate();
-		AntUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntContentProvider.java
deleted file mode 100644
index 149247d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntContentProvider.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.internal.ui.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-/**
- * Content provider that maintains a generic list of objects which are shown in
- * a table viewer.
- */
-public class AntContentProvider implements IStructuredContentProvider {
-	protected List elements = new ArrayList();
-	protected TableViewer tableViewer;
-	private ViewerSorter sorter= null;
-
-	public void add(Object o) {
-		if (elements.contains(o)) {
-			return;
-		}
-		elements.add(o);
-		tableViewer.add(o);
-		tableViewer.setSelection(new StructuredSelection(o), true);
-	}
-
-	public void dispose() {
-	}
-
-	public Object[] getElements(Object inputElement) {
-		return elements.toArray(new Object[elements.size()]);
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		tableViewer = (TableViewer) viewer;
-		elements.clear();
-		if (newInput != null) {
-			tableViewer.setSorter(getSorter());
-			List list;
-			if (newInput instanceof List) {
-				list= (List) newInput;
-			} else {
-				list= Arrays.asList((Object[]) newInput);	
-			}
-			elements.addAll(list);
-		}
-	}
-
-	public void remove(Object o) {
-		elements.remove(o);
-		tableViewer.remove(o);
-	}
-	
-	public void remove(IStructuredSelection selection) {
-		Object[] array= selection.toArray();
-		elements.removeAll(Arrays.asList(array));
-		tableViewer.remove(array);
-	}
-	
-	protected ViewerSorter getSorter() {
-		if (sorter == null) {
-			sorter= 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());
-				}
-			};
-		}
-		return sorter;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferenceConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferenceConstants.java
deleted file mode 100644
index a1d8bc2..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferenceConstants.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.editors.text.TextEditorPreferenceConstants;
-
-/**
- * Preference constants used for the Ant Editor
- */
-public class AntEditorPreferenceConstants {
-
-	private AntEditorPreferenceConstants() {
-	}
-	
-	/**
-	 * A named preference that controls if the Ant Editor 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 Ant editor 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$
-
-	/**
-	 * The symbolic names for colors for displaying code assist proposals
-	 * @see org.eclipse.jface.resource.ColorRegistry
-	 */
-	public final static String CODEASSIST_PROPOSALS_BACKGROUND= "org.eclipse.ant.ui.codeAssistProposalsBackgroundColor"; //$NON-NLS-1$
-	public final static String CODEASSIST_PROPOSALS_FOREGROUND= "org.eclipse.ant.ui.codeAssistProposalsForegroundColor"; //$NON-NLS-1$		
-	public static final String CURRENT_LINE_COLOR = "org.eclipse.ant.ui.currentLineHightlightColor"; //$NON-NLS-1$
-	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.ant.ui.lineNumberForegroundColor"; //$NON-NLS-1$
-	public static final String PRINT_MARGIN_COLOR = "org.eclipse.ant.ui.printMarginColor"; //$NON-NLS-1$	
-	
-	
-	/**
-	 * A named preference that specifies if the editor uses spaces for tabs.
-	 * <p>
-	 * Value is of type <code>Boolean</code>. If <code>true</code>spaces instead of tabs are used
-	 * in the editor. If <code>false</code> the editor inserts a tab character when pressing the tab
-	 * key.
-	 * </p>
-	 */
-	public final static String EDITOR_SPACES_FOR_TABS= "spaces_for_tabs"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies the tab size for the Ant formatter.
-	 * <p>
-	 * Value is of type <code>int</code>.
-	 * </p>
-	 */
-	public static final String FORMATTER_TAB_SIZE= "formatter_tab_size"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies if the Ant formatter uses spaces for tabs.
-	 * <p>
-	 * Value is of type <code>boolean</code>. If <code>true</code> spaces instead of tabs are used
-	 * when formatting. If <code>false</code> the formatter inserts a tab character for indenting.
-	 * </p>
-	 */
-	public static String FORMATTER_TAB_CHAR= "formatter_tab_char"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies if the Ant formatter aligns the final
-	 * &quote&gt&quote in multi-line element tags
-	 * <p>
-	 * Value is of type <code>Boolean</code>. If <code>true</code> the final
-	 * &quote&gt&quote in multi-line element tags are aligned by the formatter.
-	 * </p>
-	 */
-	public static final String FORMATTER_ALIGN= "formatter_align"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies the maximum line length for the Ant formatter.
-	 * <p>
-	 * Value is of type <code>int</code>.
-	 * </p>
-	 */
-	public static final String FORMATTER_MAX_LINE_LENGTH= "formatter_max_line_length"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies if the Ant formatter will delete blank lines.
-	 * <p>
-	 * Value is of type <code>Boolean</code>. If <code>true</code> blank lines are deleted
-	 * by the formatter.
-	 * </p>
-	 */
-	public static final String FORMATTER_DELETE_BLANK_LINES= "formatter_delete_blank_lines"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies if the Ant formatter should format comments.
-	 * <p>
-	 * Value is of type <code>Boolean</code>. If <code>true</code> comments are formatted
-	 * in the editor.
-	 * </p>
-	 */
-	public static final String FORMATTER_COMMENTS= "formatter_comments"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that specifies if the Ant formatter should wrap elements that are longer than
-	 * the maximum line length.
-	 * <p>
-	 * Value is of type <code>Boolean</code>. If <code>true</code> long elements are wrapped
-	 * when formatting in the editor.
-	 * </p>
-	 */
-	public static final String FORMATTER_WRAP_LONG= "formatter_wrap_long"; //$NON-NLS-1$
-	
-	/**
-	 * Boolean preference identifier constant which specifies whether the Ant editor should
-	 * format templates on insert.
-	 */
-	public static final String TEMPLATES_USE_CODEFORMATTER= "templates_use_codeformatter"; //$NON-NLS-1$
-
-	public static void initializeDefaultValues(IPreferenceStore store) {
-		TextEditorPreferenceConstants.initializeDefaultValues(store);
-	
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT, true);
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION, true);
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 500);
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS, "<${"); //$NON-NLS-1$
-		
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);
-		
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_TAB_CHAR, true);
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_TAB_SIZE, 4);
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_ALIGN, false);
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_MAX_LINE_LENGTH, 80);
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_DELETE_BLANK_LINES, false);
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_COMMENTS, false);
-		store.setDefault(AntEditorPreferenceConstants.FORMATTER_WRAP_LONG, false);
-		
-		store.setDefault(AntEditorPreferenceConstants.TEMPLATES_USE_CODEFORMATTER, true);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java
deleted file mode 100644
index 13a8d12..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java
+++ /dev/null

@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-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.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.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;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-
-
-/*
- * The page for setting the editor options.
- */
-public class AntEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	
-	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 Map fNumberFields= new HashMap();
-	private ModifyListener fNumberFieldListener= new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			numberFieldChanged((Text) e.widget);
-		}
-	};
-	
-	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= createOverlayStore();
-	}
-	
-	private OverlayPreferenceStore createOverlayStore() {
-		
-		ArrayList overlayKeys= new ArrayList();
-
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE));
-		
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN));
-	
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH));
-		
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS));
-		
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER));
-	
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER));
-		
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS));
-
-		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return new OverlayPreferenceStore(getPreferenceStore(), keys);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-	private Label getLabelControl(Control[] labelledTextField){
-		return (Label)labelledTextField[0];
-	}
-
-	private Text getTextControl(Control[] labelledTextField){
-		return (Text)labelledTextField[1];
-	}
-
-	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$
-		String[] errorMessages= new String[]{AntPreferencesMessages.getString("AntEditorPreferencePage.empty_input_print_margin"), AntPreferencesMessages.getString("AntEditorPreferencePage.invalid_input_print_margin")};  //$NON-NLS-1$//$NON-NLS-2$
-		addTextField(appearanceComposite, labelText, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 3, 0, errorMessages);
-		
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.37"); //$NON-NLS-1$
-		errorMessages= new String[]{AntPreferencesMessages.getString("AntEditorPreferencePage.38"), AntPreferencesMessages.getString("AntEditorPreferencePage.39")}; //$NON-NLS-1$ //$NON-NLS-2$
-		addTextField(appearanceComposite, labelText, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 3, 0, errorMessages);
-		
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.40"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AntEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, 1);
-		
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.showOverviewRuler"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, 0);
-				
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.showLineNumbers"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, 0);
-
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.highlightCurrentLine"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, 0);
-				
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.showPrintMargin"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, 0);
-
-		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, String[] errorMessages) {
-		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 (errorMessages != null) {
-			fNumberFields.put(textControl, errorMessages);
-			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= 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$
-		String[] errorMessages= new String[]{AntPreferencesMessages.getString("AntEditorPreferencePage.empty_input_auto_activation"), AntPreferencesMessages.getString("AntEditorPreferencePage.invalid_input_auto_activation")};  //$NON-NLS-1$//$NON-NLS-2$
-		labelledTextField= addLabelledTextField(contentAssistComposite, text, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 4, 0, errorMessages);
-		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, null);
-		fAutoInsertTriggerLabel= getLabelControl(labelledTextField);
-		fAutoInsertTriggerText= getTextControl(labelledTextField);
-		
-		return contentAssistComposite;
-	}
-		
-	private void updateAutoactivationControls() {
-	   boolean autoactivation= fOverlayStore.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION);
-	   fAutoInsertDelayText.setEnabled(autoactivation);
-	   fAutoInsertDelayLabel.setEnabled(autoactivation);
-
-	   fAutoInsertTriggerText.setEnabled(autoactivation);
-	   fAutoInsertTriggerLabel.setEnabled(autoactivation);
-   }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		WorkbenchHelp.setHelp(getControl(), IAntUIHelpContextIds.ANT_EDITOR_PREFERENCE_PAGE);
-		fOverlayStore.load();
-		fOverlayStore.start();
-		
-		TabFolder folder= new TabFolder(parent, SWT.NONE);
-		folder.setLayout(new TabFolderLayout());	
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		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));
-				
-		initialize();
-		
-		applyDialogFont(folder);
-		return folder;
-	}
-	
-	private void initialize() {
-		
-		initializeFields();
-		
-	}
-	
-	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));
-		}		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		fOverlayStore.propagate();
-		AntUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		fOverlayStore.loadDefaults();
-		initializeFields();
-		super.performDefaults();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#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, String[] errorMessages) {
-		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 (errorMessages != null) {
-			fNumberFields.put(textControl, errorMessages);
-			textControl.addModifyListener(fNumberFieldListener);
-		} else {
-			textControl.addModifyListener(fTextFieldListener);
-		}
-			
-		return textControl;
-	}
-	
-	private void numberFieldChanged(Text textControl) {
-		String number= textControl.getText();
-		IStatus status= validatePositiveNumber(number, (String[])fNumberFields.get(textControl));
-		if (!status.matches(IStatus.ERROR)) {
-			fOverlayStore.setValue((String) fTextFields.get(textControl), number);
-		}
-		updateStatus(status);
-	}
-	
-	private IStatus validatePositiveNumber(String number, String[] errorMessages) {
-		StatusInfo status= new StatusInfo();
-		if (number.length() == 0) {
-			status.setError(errorMessages[0]);
-		} else {
-			try {
-				int value= Integer.parseInt(number);
-				if (value < 0)
-					status.setError(MessageFormat.format(errorMessages[1], new String[]{number})); //$NON-NLS-1$
-			} catch (NumberFormatException e) {
-				status.setError(MessageFormat.format(errorMessages[1], new String[]{number})); //$NON-NLS-1$
-			}
-		}
-		return status;
-	}
-	
-	private void updateStatus(IStatus status) {
-		if (!status.matches(IStatus.ERROR)) {
-			Set keys= fNumberFields.keySet();
-			for (Iterator iter = keys.iterator(); iter.hasNext();) {
-				Text text = (Text) iter.next();
-				IStatus s= validatePositiveNumber(text.getText(), (String[])fNumberFields.get(text));
-				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.
-	 */
-	private void applyToStatusLine(DialogPage page, IStatus status) {
-		String message= status.getMessage();
-		switch (status.getSeverity()) {
-			case IStatus.OK:
-				page.setMessage(message, IMessageProvider.NONE);
-				page.setErrorMessage(null);
-				break;
-			case IStatus.WARNING:
-				page.setMessage(message, IMessageProvider.WARNING);
-				page.setErrorMessage(null);
-				break;				
-			case IStatus.INFO:
-				page.setMessage(message, IMessageProvider.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/internal/ui/preferences/AntObjectLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntObjectLabelProvider.java
deleted file mode 100644
index eed556a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntObjectLabelProvider.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.text.MessageFormat;
-
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.internal.core.AntObject;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-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;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * Label provider for type elements
- */
-public class AntObjectLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider {
-
-	/* (non-Javadoc)
-	 * Method declared on IBaseLabelProvider.
-	 */
-	public void dispose() {
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on ITableLabelProvider.
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		if (element instanceof Property) {
-			return getPropertyImage();
-		} else if (element instanceof Type){
-			return getTypeImage();
-		} else if (element instanceof Task) {
-			return getTaskImage();
-		}
-		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on ITableLabelProvider.
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		if (element instanceof Property) {
-			Property property= (Property) element;
-			if (property.isDefault()) {
-				return element.toString() + MessageFormat.format(AntPreferencesMessages.getString("AntObjectLabelProvider.10"), new String[]{property.getPluginLabel()}); //$NON-NLS-1$
-			} 
-		} else if (element instanceof AntObject) {	
-			AntObject object = (AntObject) element;
-			StringBuffer text= new StringBuffer(object.toString());
-			text.append(" ("); //$NON-NLS-1$
-			text.append(object.getLibraryEntry().getLabel());
-			text.append(": "); //$NON-NLS-1$
-			text.append(object.getClassName());
-			text.append(')');
-			if (object.isDefault()) {
-				text.append(MessageFormat.format(AntPreferencesMessages.getString("AntObjectLabelProvider.10"), new String[]{object.getPluginLabel()})); //$NON-NLS-1$
-			}
-			return text.toString();
-		}
-		 
-		return element.toString();	
-	}
-	
-	public Image getTypeImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_ANT_TYPE);
-	}
-	
-	public Image getTaskImage() {
-		return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJS_TASK_TSK);
-	}
-
-	public static Image getPropertyImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
-	public Color getForeground(Object element) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
-	public Color getBackground(Object element) {
-		if (element instanceof AntObject) {
-			if (((AntObject) element).isDefault()) {
-				Display display= Display.getCurrent();
-				return display.getSystemColor(SWT.COLOR_INFO_BACKGROUND);		
-			}
-		} else if (element instanceof Property) {
-			if (((Property) element).isDefault()) {
-				Display display= Display.getCurrent();
-				return display.getSystemColor(SWT.COLOR_INFO_BACKGROUND);		
-			}
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java
deleted file mode 100644
index 31ebb67..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPage.java
+++ /dev/null

@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-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.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Table;
-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 AntContentProvider 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 abstract 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 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) {
-				if (!event.getSelection().isEmpty() && editButton.isEnabled()) {
-					edit((IStructuredSelection)event.getSelection());
-				}
-			}
-		});
-		
-		table.addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (editButton.isEnabled() && event.character == SWT.DEL && event.stateMask == 0) {
-					remove(tableViewer);
-				}
-			}
-		});	
-	}
-
-	/**
-	 * Returns the content provider to use for the table viewer
-	 * 
-	 * @return AntPageContentProvider
-	 */
-	protected AntContentProvider getContentProvider() {
-		return new AntContentProvider();
-	}
-
-	/**
-	 * Returns the currently listed objects in the table if the library
-	 * for that entry is still included in the preferences.  Default objects
-	 * are included depending on the value of the <code>forDisplay</code> parameter.
-	 * Returns <code>null</code> if this widget has not yet been created
-	 * or has been disposed.
-	 * @param forDisplay Whether the result is to be displayed in the UI or stored in the preferences
-	 * @return The list of objects currently displayed in the table
-	 */
-	protected List getContents(boolean forDisplay) {
-		if (tableViewer == null || tableViewer.getControl().isDisposed()) {
-			return null;
-		}
-		List entries= getPreferencePage().getLibraryEntries();
-		
-		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() && !entries.contains(antObject.getLibraryEntry())) {
-						continue;
-					}
-				} else if (antObject.isDefault() || !entries.contains(antObject.getLibraryEntry())) {
-					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) {
-		AntContentProvider antContentProvider= (AntContentProvider)viewer.getContentProvider();
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		Iterator itr = sel.iterator();
-		while (itr.hasNext()) {
-			antContentProvider.remove(itr.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);
-	}
-	
-	/**
-	 * Allows the user to edit a custom Ant object.
-	 *
-	 * @param selection The selection containing the object to edit
-	 */
-	protected abstract 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/internal/ui/preferences/AntPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
deleted file mode 100644
index bfc4dfb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.model.IAntUIPreferenceConstants;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-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 BooleanFieldEditor toolsWarningEditor= null;
-
-	/**
- 	 * Create the Ant page.
-     */
-	public AntPreferencePage() {
-		super(GRID);
-		setDescription(AntPreferencesMessages.getString("AntPreferencePage.General")); //$NON-NLS-1$
-		setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
-	 */
-	protected void createFieldEditors() {
-
-		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);
-		
-		new Label(getFieldEditorParent(), SWT.NONE);
-	
-		if (!AntUIPlugin.isMacOS()) {
-			//the mac does not have a tools.jar Bug 40778
-			toolsWarningEditor= new BooleanFieldEditor(IAntUIPreferenceConstants.ANT_TOOLS_JAR_WARNING, AntPreferencesMessages.getString("AntPreferencePage.10"), getFieldEditorParent());  //$NON-NLS-1$
-			addField(toolsWarningEditor);
-		}
-		
-		addField(new BooleanFieldEditor(IAntUIPreferenceConstants.ANT_ERROR_DIALOG, AntPreferencesMessages.getString("AntPreferencePage.12"), getFieldEditorParent())); //$NON-NLS-1$
-		new Label(getFieldEditorParent(), SWT.NONE);
-				
-		getPreferenceStore().addPropertyChangeListener(this);
-	}
-	
-	/**
-	 * @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) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		getPreferenceStore().removePropertyChangeListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		if (event.getProperty().equals(IAntUIPreferenceConstants.ANT_TOOLS_JAR_WARNING)) {
-			if (toolsWarningEditor != null) {
-				toolsWarningEditor.load();
-			}
-		} else {
-			super.propertyChange(event);
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.java
deleted file mode 100644
index 69e832e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.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.internal.ui.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntPreferencesMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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 + '!';
-		}
-	}	
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.properties
deleted file mode 100644
index f459d15..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencesMessages.properties
+++ /dev/null

@@ -1,135 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntClasspathLabelProvider.0=Default
-
-AntClasspathBlock.1=Choose a folder to add to the classpath:
-AntClasspathBlock.2=Add &Variable...
-AntClasspathBlock.addFolderButtonTitle = Add &Folder...
-AntClasspathBlock.addJarButtonTitle = Add &JARs...
-AntClasspathBlock.upButtonTitle = &Up
-AntClasspathBlock.downButtonTitle = Do&wn
-AntClasspathBlock.removeButtonTitle = R&emove
-AntClasspathBlock.3=Choose a folder that will be used as the location of ANT_HOME
-AntClasspathBlock.7=Specified Ant home does not contain a \"lib\" directory
-AntClasspathBlock.31=No tools.jar
-AntClasspathBlock.32=The specified Ant runtime classpath does not include a tools.jar library. This may affect the ability to use various tasks. Ignore this possible problem?
-AntClasspathBlock.33=&Do not show this warning again
-AntClasspathBlock.34=No tools.jar is specified in the Ant runtime classpath
-AntClasspathBlock.42=Add E&xternal JARs...
-AntClasspathBlock.44=JAR Selection
-AntClasspathBlock.45=&Choose JARs and ZIPs to add:
-AntClasspathBlock.56=Specified Ant home does not exist
-AntClasspathBlock.57=An Ant home needs to be specified
-AntClasspathBlock.30=Ant &Home...
-
-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
-AddCustomDialog.13=Specified zip file could not be resolved
-
-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.10=&Warn when an Ant runtime classpath does not contain a tools.jar library (used for tasks such as javac)
-AntPreferencePage.12=&Show error dialog when Ant build fails
-
-AntTasksPage.1 = Add &Task...
-AntTasksPage.2 = &Edit Task...
-AntTasksPage.3 = Remo&ve
-AntTasksPage.addTaskDialogTitle = Add Task
-AntTasksPage.title = Tas&ks
-AntTasksPage.editTaskDialogTitle = Edit Task
-AntTasksPage.8=A task with the name {0} already exists
-AntTasksPage.9=A name must be provided for the new task
-
-AntObjectLabelProvider.10=\ [contributed by {0}]
-
-AntTypesPage.1 = Remo&ve
-AntTypesPage.2 = Add &Type...
-AntTypesPage.3 = &Edit Type...
-AntTypesPage.typesPageTitle = T&ypes
-AntTypesPage.addTypeDialogTitle = Add Type
-AntTypesPage.editTypeDialogTitle = Edit Type
-AntTypesPage.8=A type with the name {0} already exists
-AntTypesPage.9=A name must be provided for the new type
-
-AntPropertiesPage.title = Proper&ties
-AntPropertiesPage.&Global_properties__1=&Global properties:
-AntPropertiesPage.Glo&bal_property_files__2=Glo&bal property files:
-
-AntPropertiesBlock.1 = Add P&roperty...
-AntPropertiesBlock.2 = &Edit Property...
-AntPropertiesBlock.3 = Rem&ove
-AntPropertiesBlock.4 = Add F&iles...
-AntPropertiesBlock.removeFileButton = Re&move
-AntPropertiesBlock.Add_Property_2=Add Property
-AntPropertiesBlock.Edit_User_Property_5=Edit User Property
-AntPropertiesFileSelectionDialog.12=Property File Selection
-AntPropertiesFileSelectionDialog.13=&Choose the property files to add:
-AntPropertiesFileSelectionDialog.14=&Only show *.properties files
-AntPropertiesBlock.14=Add E&xternal...
-AntPropertiesBlock.15=Overwrite property?
-AntPropertiesBlock.16=A property named {0} already exists. Overwrite?
-AntPropertiesBlock.17=Cannot overwrite
-AntPropertiesBlock.18=A property named {0} is contributed from the {1} plug-in.
-
-AddPropertyDialog.&Name__1=&Name:
-AddPropertyDialog.&Value__2=&Value:
-AddPropertyDialog.2=Varia&bles...
-
-AntEditorPreferencePage.description=Ant Editor settings:
-AntEditorPreferencePage.invalid_input_print_margin= Invalid print margin column specified
-AntEditorPreferencePage.empty_input_print_margin= No print margin column specified
-AntEditorPreferencePage.invalid_input_auto_activation= Invalid auto activation delay specified
-AntEditorPreferencePage.empty_input_auto_activation= No auto activation delay specified
-
-AntEditorPreferencePage.codeAssistTab.title= &Code Assist
-
-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.Insert=Insert single &proposals automatically
-AntEditorPreferencePage.&Enable_auto_activation_2=&Enable auto activation
-AntEditorPreferencePage.Auto_activation_&delay__3=Auto activation de&lay:
-AntEditorPreferencePage.Auto_activation_tri&ggers__4=Auto activation tri&ggers:
-AntEditorPreferencePage.37=Displayed &tab width:
-AntEditorPreferencePage.38=No tab width specified
-AntEditorPreferencePage.39=Invalid tab width specified
-AntEditorPreferencePage.40=&Insert spaces for tabs when typing
-
-ClasspathModel.2=Ant Home Entries
-ClasspathModel.3=Global Entries
-
-AntCodeFormatterPreferencePage.0=Indentation
-AntCodeFormatterPreferencePage.1=Tab si&ze:
-AntCodeFormatterPreferencePage.2=No tab size specified
-AntCodeFormatterPreferencePage.3=Invalid tab size specified
-AntCodeFormatterPreferencePage.4=U&se tab character instead of spaces
-AntCodeFormatterPreferencePage.5=Ali&gn final '>' in multi-line element tags
-AntCodeFormatterPreferencePage.6=Line Wrapping
-AntCodeFormatterPreferencePage.7=Ma&ximum line width:
-AntCodeFormatterPreferencePage.8=No maximum line width specified
-AntCodeFormatterPreferencePage.9=Invalid maximum line width specified
-AntCodeFormatterPreferencePage.10=&Wrap long element tags
-AntCodeFormatterPreferencePage.11=White Space
-AntCodeFormatterPreferencePage.12=Delete &blank lines (work in progress)
-AntCodeFormatterPreferencePage.13=Comments
-AntCodeFormatterPreferencePage.14=&Format comments (work in progress)

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java
deleted file mode 100644
index 52307ad..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java
+++ /dev/null

@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-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.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-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.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class AntPropertiesBlock {
-	
-	private IAntBlockContainer container;
-	
-	private Button editButton;
-	private Button removeButton;
-	private Button addButton;
-	
-	private Button addFileButton;
-	private Button addExternalFileButton;
-	private Button removeFileButton;
-
-	private TableViewer propertyTableViewer;
-	private TableViewer fileTableViewer;
-
-	private final AntObjectLabelProvider labelProvider = new AntObjectLabelProvider();
-
-	private IDialogSettings dialogSettings;
-	
-	private boolean tablesEnabled= true;
-	
-	/**
-	 * 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 == addExternalFileButton) {
-				addExternalPropertyFile();
-			} else if (event.widget == removeFileButton) {
-				remove(fileTableViewer);
-			} 
-		}
-	};
-	
-	/**
-	 * Key listener that delegates for key pressed events.
-	 */
-	private KeyAdapter keyListener= new KeyAdapter() {
-		public void keyPressed(KeyEvent event) {
-			if (event.getSource() == propertyTableViewer) {
-				if (removeButton.isEnabled() && event.character == SWT.DEL && event.stateMask == 0) {
-					remove(propertyTableViewer);
-				}
-			} else if (event.getSource() == fileTableViewer) {
-				if (removeFileButton.isEnabled() && event.character == SWT.DEL && event.stateMask == 0) {
-					remove(fileTableViewer);
-				}
-			}
-		}	
-	};
-	
-	/**
-	 * Selection changed listener that delegates selection events.
-	 */
-	private ISelectionChangedListener tableListener= new ISelectionChangedListener() {
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (tablesEnabled) {
-				if (event.getSource() == propertyTableViewer) {
-					propertyTableSelectionChanged((IStructuredSelection) event.getSelection());
-				} else if (event.getSource() == fileTableViewer) {
-					fileTableSelectionChanged((IStructuredSelection) event.getSelection());
-				}
-			}
-		}
-	};
-	
-	public AntPropertiesBlock(IAntBlockContainer container) {
-		this.container= container; 
-	}
-
-	private void addPropertyFile() {
-		
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		AntPropertiesFileSelectionDialog dialog= new AntPropertiesFileSelectionDialog(propertyTableViewer.getControl().getShell(), lp, cp, Arrays.asList(getPropertyFiles()));
-		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			for (int i = 0; i < elements.length; i++) {
-				IFile file = (IFile)elements[i];
-				String varExpression= VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", file.getFullPath().toString()); //$NON-NLS-1$
-				((AntContentProvider)fileTableViewer.getContentProvider()).add(varExpression);
-			}
-			container.update();
-		}
-	}
-	
-	public void createControl(Composite top, String propertyLabel, String propertyFileLabel) {
-		Font font= top.getFont();
-		dialogSettings= AntUIPlugin.getDefault().getDialogSettings();
-
-		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) {
-				if (!event.getSelection().isEmpty() && editButton.isEnabled()) {
-					edit();
-				}
-			}
-		});
-		
-		propertyTableViewer.getTable().addKeyListener(keyListener);	
-		
-		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);
-		fileTableViewer.getTable().addKeyListener(keyListener);	
-		createButtonGroup(top);
-	}
-	
-	/**
-	 * 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 | GridData.HORIZONTAL_ALIGN_FILL));
-		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 AntContentProvider());
-		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.1")); //$NON-NLS-1$
-			editButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.2"));  //$NON-NLS-1$
-			removeButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.3"));  //$NON-NLS-1$
-		} else {
-			addFileButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.4")); //$NON-NLS-1$
-			addExternalFileButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.14")); //$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);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
-		button.setLayoutData(gridData);
-		return button;
-	}
-	
-	/**
-	 * Allows the user to enter external property files
-	 */
-	private void addExternalPropertyFile() {
-		String lastUsedPath;
-		lastUsedPath= dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTEXTFILE);
-		if (lastUsedPath == null) {
-			lastUsedPath= ""; //$NON-NLS-1$
-		}
-		FileDialog dialog = new FileDialog(fileTableViewer.getControl().getShell(), SWT.MULTI);
-		dialog.setFilterExtensions(new String[] { "*.properties", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$;
-		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();	
-			((AntContentProvider)fileTableViewer.getContentProvider()).add(path.toOSString());
-		}
-	
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTEXTFILE, filterPath.toOSString());
-		container.update();
-	}
-	
-	private void remove(TableViewer viewer) {
-		AntContentProvider antContentProvider= (AntContentProvider)viewer.getContentProvider();
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		antContentProvider.remove(sel);
-		container.update();
-	}
-	
-	/**
-	 * Allows the user to enter a 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() == Window.CANCEL) {
-			return;
-		}
-		
-		String[] pair= dialog.getNameValuePair();
-		String name= pair[0];
-		if (!overwrite(name)) {
-			return;
-		}
-		Property prop = new Property();
-		prop.setName(name);
-		prop.setValue(pair[1]);
-		((AntContentProvider)propertyTableViewer.getContentProvider()).add(prop);
-		container.update();
-	}
-
-	private void edit() {
-		IStructuredSelection selection= (IStructuredSelection) propertyTableViewer.getSelection();
-		Property prop = (Property) selection.getFirstElement();
-		
-		String originalName= prop.getName();
-		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(false)});
-	
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-
-		String[] pair= dialog.getNameValuePair();
-		String name= pair[0];
-		if (!name.equals(originalName)) {
-			if (!overwrite(name)){
-				return;
-			}
-		}
-		prop.setName(name);
-		prop.setValue(pair[1]);
-		//trigger a resort
-		propertyTableViewer.refresh();
-		container.update();
-	}
-	
-	private boolean overwrite(String name) {
-		Object[] properties= getProperties();
-		for (int i = 0; i < properties.length; i++) {
-			Property property = (Property)properties[i];
-			String propertyName = property.getName();
-			if (propertyName.equals(name)) {
-				if (property.isDefault()) {
-					MessageDialog.openError(propertyTableViewer.getControl().getShell(), AntPreferencesMessages.getString("AntPropertiesBlock.17"), MessageFormat.format(AntPreferencesMessages.getString("AntPropertiesBlock.18"), new String[]{propertyName, property.getPluginLabel()})); //$NON-NLS-1$ //$NON-NLS-2$
-					return false;
-				} 
-				boolean overWrite= MessageDialog.openQuestion(propertyTableViewer.getControl().getShell(), AntPreferencesMessages.getString("AntPropertiesBlock.15"), MessageFormat.format(AntPreferencesMessages.getString("AntPropertiesBlock.16"), new String[] {name}));  //$NON-NLS-1$ //$NON-NLS-2$
-				if (!overWrite) {
-					return false;
-				}
-				((AntContentProvider)propertyTableViewer.getContentProvider()).remove(property);
-				break;
-			}					
-		}
-		return true;
-	}
-	
-	/**
-	 * 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 table viewer.
-	 */
-	private void propertyTableSelectionChanged(IStructuredSelection newSelection) {
-		int size = newSelection.size();
-		boolean enabled= true;
-
-		Iterator itr= newSelection.iterator();
-		while (itr.hasNext()) {
-			Object element = itr.next();
-			if (element instanceof Property) {
-				Property property= (Property)element;
-				if (property.isDefault()) {
-					enabled= false;
-					break;
-				}
-			}
-		}
-		editButton.setEnabled(enabled && size == 1);
-		removeButton.setEnabled(enabled && 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 ((AntContentProvider)propertyTableViewer.getContentProvider()).getElements(null);
-	}
-	
-	public Object[] getPropertyFiles() {
-		return ((AntContentProvider)fileTableViewer.getContentProvider()).getElements(null);
-	}
-	
-	public void setEnabled(boolean enable) {
-		setTablesEnabled(enable);
-		addButton.setEnabled(enable);
-		addExternalFileButton.setEnabled(enable);
-		addFileButton.setEnabled(enable);
-		editButton.setEnabled(enable);
-		removeButton.setEnabled(enable);
-		removeFileButton.setEnabled(enable);
-		
-		if (enable) {
-			propertyTableViewer.setSelection(propertyTableViewer.getSelection());
-			fileTableViewer.setSelection(fileTableViewer.getSelection());
-		} else {
-			AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-			List properties= prefs.getProperties();
-			propertyTableViewer.setInput(properties);
-			fileTableViewer.setInput(prefs.getCustomPropertyFiles(false));
-		}
-	}
-	
-	public void setTablesEnabled(boolean tablesEnabled) {
-		this.tablesEnabled= tablesEnabled;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesFileSelectionDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesFileSelectionDialog.java
deleted file mode 100644
index 84e951a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesFileSelectionDialog.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.util.List;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerFilter;
-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;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.views.navigator.ResourceSorter;
-
-public class AntPropertiesFileSelectionDialog extends ElementTreeSelectionDialog {
-	
-	private ViewerFilter fFilter;
-	private boolean fShowAll= false;
-	private final static String DIALOG_SETTING= "AntPropertiesFileSelectionDialog.showAll";  //$NON-NLS-1$
-	
-	public AntPropertiesFileSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider, List propertyFiles) {
-		super(parent, labelProvider, contentProvider);
-		
-		setTitle(AntPreferencesMessages.getString("AntPropertiesFileSelectionDialog.12"));  //$NON-NLS-1$
-		setMessage(AntPreferencesMessages.getString("AntPropertiesFileSelectionDialog.13")); //$NON-NLS-1$
-		fFilter= new PropertyFileFilter(propertyFiles);
-		
-		setInput(ResourcesPlugin.getWorkspace().getRoot());	
-		setSorter(new ResourceSorter(ResourceSorter.NAME));
-		
-		ISelectionStatusValidator validator= new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection.length == 0) {
-					return new Status(IStatus.ERROR, AntUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-				}
-				for (int i= 0; i < selection.length; i++) {
-					if (!(selection[i] instanceof IFile)) {
-						return new Status(IStatus.ERROR, AntUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-					}
-				}
-				return new Status(IStatus.OK, AntUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-			}			
-		};
-		setValidator(validator);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		
-		Composite result= (Composite)super.createDialogArea(parent);
-		final Button button = new Button(result, SWT.CHECK);
-		button.setText(AntPreferencesMessages.getString("AntPropertiesFileSelectionDialog.14")); //$NON-NLS-1$
-		
-		button.setFont(parent.getFont());
-		GridData data= new GridData();
-		data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-		button.setLayoutData(data);
-		IDialogSettings settings= AntUIPlugin.getDefault().getDialogSettings();
-		fShowAll= settings.getBoolean(DIALOG_SETTING);
-		if (!fShowAll) {
-			getTreeViewer().addFilter(fFilter);
-			button.setSelection(true);
-		}
-		
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if (button.getSelection()) {
-					fShowAll= false;
-					getTreeViewer().addFilter(fFilter);
-				} else {
-					fShowAll= true;
-					getTreeViewer().removeFilter(fFilter);
-				}
-			}
-		});
-		applyDialogFont(result);		
-		return result;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#close()
-	 */
-	public boolean close() {
-		IDialogSettings settings= AntUIPlugin.getDefault().getDialogSettings();
-		settings.put(DIALOG_SETTING, fShowAll);
-		return super.close();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesPage.java
deleted file mode 100644
index ed44b6d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesPage.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.internal.ui.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(AntObjectLabelProvider.getPropertyImage());
-		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() {
-		List allProperties= AntCorePlugin.getPlugin().getPreferences().getDefaultProperties();
-		allProperties.addAll(Arrays.asList(AntCorePlugin.getPlugin().getPreferences().getCustomProperties()));
-		antPropertiesBlock.setPropertiesInput((Property[]) allProperties.toArray(new Property[allProperties.size()]));
-		antPropertiesBlock.setPropertyFilesInput(AntCorePlugin.getPlugin().getPreferences().getCustomPropertyFiles(false));
-		antPropertiesBlock.update();
-	}
-	
-	protected void performDefaults() {
-		List defaultProperties= AntCorePlugin.getPlugin().getPreferences().getDefaultProperties();
-		antPropertiesBlock.setPropertiesInput((Property[]) defaultProperties.toArray(new Property[defaultProperties.size()]));
-		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.internal.ui.preferences.IAntBlockContainer#setMessage(java.lang.String)
-	 */
-	public void setMessage(String message) {
-		preferencePage.setMessage(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.IAntBlockContainer#setErrorMessage(java.lang.String)
-	 */
-	public void setErrorMessage(String message) {
-		preferencePage.setErrorMessage(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.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.internal.ui.preferences.IAntBlockContainer#update()
-	 */
-	public void update() {
-	}
-	
-	protected List getProperties() {
-		Object[] allProperties= antPropertiesBlock.getProperties();
-		List properties= new ArrayList(allProperties.length);
-		for (int i = 0; i < allProperties.length; i++) {
-			Property property = (Property)allProperties[i];
-			if (!property.isDefault()) {
-				properties.add(property);
-			}
-		}
-		return properties;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java
deleted file mode 100644
index f263f66..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.core.Property;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.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, 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)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	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)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		tasksPage.setInput(prefs.getDefaultTasks());
-		typesPage.setInput(prefs.getDefaultTypes());
-		classpathPage.performDefaults();
-		propertiesPage.performDefaults();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		
-		prefs.setAntHomeClasspathEntries(classpathPage.getAntHomeEntries());
-		
-		
-		prefs.setAdditionalClasspathEntries(classpathPage.getAdditionalEntries());
-		
-		String antHome= classpathPage.getAntHome();
-		prefs.setAntHome(antHome);
-		
-		List 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();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.DialogPage#setButtonLayoutData(org.eclipse.swt.widgets.Button)
-	 */
-	protected GridData setButtonLayoutData(Button button) {
-		return super.setButtonLayoutData(button);
-	}
-	
-	protected List getLibraryEntries() {
-		List urls= new ArrayList();
-		urls.addAll(Arrays.asList(classpathPage.getAntHomeEntries()));
-		urls.addAll(Arrays.asList(classpathPage.getAdditionalEntries()));
-		return urls;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTasksPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTasksPage.java
deleted file mode 100644
index 090e378..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTasksPage.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-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 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 AntObjectLabelProvider labelProvider = new AntObjectLabelProvider();
-	/**
-	 * Creates an instance.
-	 */
-	public AntTasksPage(AntRuntimePreferencePage preferencePage) {
-		super(preferencePage);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#addButtonsToButtonGroup(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addButtonsToButtonGroup(Composite parent) {
-		createPushButton(parent, AntPreferencesMessages.getString("AntTasksPage.1"), ADD_TASK_BUTTON); //$NON-NLS-1$
-		editButton = createPushButton(parent, AntPreferencesMessages.getString("AntTasksPage.2"), EDIT_TASK_BUTTON); //$NON-NLS-1$
-		removeButton = createPushButton(parent, AntPreferencesMessages.getString("AntTasksPage.3"), REMOVE_BUTTON); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Allows the user to enter a custom task.
-	 */
-	private void addTask() {
-		String title = AntPreferencesMessages.getString("AntTasksPage.addTaskDialogTitle"); //$NON-NLS-1$
-		AddCustomDialog dialog = getCustomDialog(title, IAntUIHelpContextIds.ADD_TASK_DIALOG);
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-
-		Task task = new Task();
-		task.setTaskName(dialog.getName());
-		task.setClassName(dialog.getClassName());
-		task.setLibraryEntry(dialog.getLibraryEntry());
-		addContent(task);
-	}
-	
-	private AddCustomDialog getCustomDialog(String title, String helpContext) {
-		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().getLibraryEntries(), names, helpContext);
-		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)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#buttonPressed(int)
-	 */
-	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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#edit(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void edit(IStructuredSelection selection) {
-		Task task= (Task)selection.getFirstElement();
-		String title = AntPreferencesMessages.getString("AntTasksPage.editTaskDialogTitle"); //$NON-NLS-1$
-		AddCustomDialog dialog = getCustomDialog(title, IAntUIHelpContextIds.EDIT_TASK_DIALOG);
-		dialog.setClassName(task.getClassName());
-		dialog.setName(task.getTaskName());
-		dialog.setLibraryEntry(task.getLibraryEntry());
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-
-		task.setTaskName(dialog.getName());
-		task.setClassName(dialog.getClassName());
-		task.setLibraryEntry(dialog.getLibraryEntry());
-		updateContent(task);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#getLabelProvider()
-	 */
-	protected ITableLabelProvider getLabelProvider() {
-		return labelProvider;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#initialize()
-	 */
-	protected void initialize() {
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		setInput(prefs.getTasks());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.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/internal/ui/preferences/AntTypesPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTypesPage.java
deleted file mode 100644
index 18adbce..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntTypesPage.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.internal.ui.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.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-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 AntObjectLabelProvider labelProvider = new AntObjectLabelProvider();
-	/**
-	 * Creates an instance.
-	 */
-	public AntTypesPage(AntRuntimePreferencePage preferencePage) {
-		super(preferencePage);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#addButtonsToButtonGroup(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addButtonsToButtonGroup(Composite parent) {
-		createPushButton(parent, AntPreferencesMessages.getString("AntTypesPage.2"), ADD_TYPE_BUTTON); //$NON-NLS-1$
-		editButton = createPushButton(parent, AntPreferencesMessages.getString("AntTypesPage.3"), EDIT_TYPE_BUTTON); //$NON-NLS-1$
-		removeButton = createPushButton(parent, AntPreferencesMessages.getString("AntTypesPage.1"), REMOVE_BUTTON); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Allows the user to enter a custom type.
-	 */
-	private void addType() {
-		String title = AntPreferencesMessages.getString("AntTypesPage.addTypeDialogTitle"); //$NON-NLS-1$
-		AddCustomDialog dialog = getCustomDialog(title, IAntUIHelpContextIds.ADD_TYPE_DIALOG);
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-
-		Type type = new Type();
-		type.setTypeName(dialog.getName());
-		type.setClassName(dialog.getClassName());
-		type.setLibraryEntry(dialog.getLibraryEntry());
-		addContent(type);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#buttonPressed(int)
-	 */
-	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;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#edit(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void edit(IStructuredSelection selection) {
-		Type type = (Type) selection.getFirstElement();
-		String title = AntPreferencesMessages.getString("AntTypesPage.editTypeDialogTitle"); //$NON-NLS-1$
-		AddCustomDialog dialog = getCustomDialog(title, IAntUIHelpContextIds.EDIT_TYPE_DIALOG);
-		dialog.setClassName(type.getClassName());
-		dialog.setName(type.getTypeName());
-		dialog.setLibraryEntry(type.getLibraryEntry());
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-
-		type.setTypeName(dialog.getName());
-		type.setClassName(dialog.getClassName());
-		type.setLibraryEntry(dialog.getLibraryEntry());
-		updateContent(type);
-	}
-	
-	private AddCustomDialog getCustomDialog(String title, String helpContext) {
-		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().getLibraryEntries(), names, helpContext);
-		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)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#getLabelProvider()
-	 */
-	protected ITableLabelProvider getLabelProvider() {
-		return labelProvider;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#initialize()
-	 */
-	protected void initialize() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		setInput(prefs.getTypes());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.internal.ui.preferences.AntPage#getHelpContextId()
-	 */
-	protected String getHelpContextId() {
-		return IAntUIHelpContextIds.ANT_TYPES_PAGE;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathEntry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathEntry.java
deleted file mode 100644
index 9b6636d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathEntry.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.variables.VariablesPlugin;
-
-public class ClasspathEntry extends AbstractClasspathEntry {
-
-	private URL url= null;
-	private String variableString= null;
-	private IAntClasspathEntry entry= null;
-	
-	public ClasspathEntry(Object o, IClasspathEntry parent) {
-		this.parent= parent;
-		if (o instanceof URL) {
-			url= (URL)o;
-		} else if (o instanceof String) {
-			variableString= (String)o;
-		} else if (o instanceof IAntClasspathEntry) {
-			entry= (IAntClasspathEntry)o;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof IAntClasspathEntry) {
-			IAntClasspathEntry other= (IAntClasspathEntry)obj;
-			return other.getLabel().equals(getLabel());
-		}
-		return false;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getLabel().hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (entry != null) {
-			return entry.getLabel();
-		}
-		if (getURL() != null) {
-			return getURL().getFile();
-		} 
-
-		return getVariableString();
-	}
-	
-	protected URL getURL() {
-		return url;
-	}
-	
-	protected String getVariableString() {
-		return variableString;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#getLabel()
-	 */
-	public String getLabel() {
-		if (entry == null) {
-			return toString();
-		}
-		return entry.getLabel();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.core.IAntClasspathEntry#getEntryURL()
-	 */
-	public URL getEntryURL() {
-		if (entry != null) {
-			return entry.getEntryURL();
-		}
-		if (url != null) {
-			return url;
-		} 
-			
-		try {
-			String expanded = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(variableString);
-			return new URL("file:" + expanded); //$NON-NLS-1$
-		} catch (CoreException e) {
-			AntUIPlugin.log(e);
-		} catch (MalformedURLException e) {
-			AntUIPlugin.log(e);
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathModel.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathModel.java
deleted file mode 100644
index d37bff4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ClasspathModel.java
+++ /dev/null

@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-
-public class ClasspathModel extends AbstractClasspathEntry {
-	
-	public static final int ANT_HOME= 0;
-	public static final int GLOBAL_USER= 1;
-	public static final int USER= 2;
-	
-	private GlobalClasspathEntries antHomeEntry;
-	private GlobalClasspathEntries userGlobalEntry;
-	
-	public Object addEntry(Object entry) {
-		if (entry instanceof GlobalClasspathEntries) {
-			if (!childEntries.contains(entry)) {
-				childEntries.add(entry);
-				return entry;
-			}
-			return null;
-		} 
-		ClasspathEntry newEntry= createEntry(entry, null);
-		Iterator entries= childEntries.iterator();
-		while (entries.hasNext()) {
-			Object element = entries.next();
-			if (element instanceof GlobalClasspathEntries) {
-				if(((GlobalClasspathEntries)element).contains(newEntry)) {
-					return null;
-				}
-			} else if (element.equals(newEntry)) {
-				return null;
-			}
-		}
-		childEntries.add(newEntry);
-		return newEntry;
-	}
-	
-	public Object addEntry(int entryType, Object entry) {
-		IClasspathEntry entryParent= null;
-		switch (entryType) {
-			case ANT_HOME :
-				if (antHomeEntry == null) {
-					String name= AntPreferencesMessages.getString("ClasspathModel.2"); //$NON-NLS-1$
-					antHomeEntry= createGlobalEntry(new IAntClasspathEntry[0], name, false, true, ANT_HOME);
-				}
-				entryParent= antHomeEntry;
-				break;
-			case GLOBAL_USER :
-				if (userGlobalEntry == null) {
-					String name= AntPreferencesMessages.getString("ClasspathModel.3"); //$NON-NLS-1$
-					userGlobalEntry= createGlobalEntry(new IAntClasspathEntry[0], name, true, true, GLOBAL_USER);
-				}
-				entryParent= userGlobalEntry;
-				break;
-			default :
-				break;
-		}
-			
-		ClasspathEntry newEntry= createEntry(entry, entryParent);
-		Iterator entries= childEntries.iterator();
-		while (entries.hasNext()) {
-			Object element = entries.next();
-			if (element instanceof GlobalClasspathEntries) {
-				if(((GlobalClasspathEntries)element).contains(newEntry)) {
-					return null;
-				}
-			} else if (element.equals(newEntry)) {
-				return null;
-			}
-		}
-		if (entryParent != null) {
-			((GlobalClasspathEntries)entryParent).addEntry(newEntry);
-		} else {
-			childEntries.add(newEntry);
-		}
-		return newEntry;		
-	}
-	
-	/**
-	 * Returns entries of the specified kind, possibly empty.
-	 * 
-	 * @param entryType kind of entries to retrieve
-	 * @return entries of the specified kind, possibly empty
-	 */
-	public IAntClasspathEntry[] getEntries(int entryType) {
-		switch (entryType) {
-			case ANT_HOME :
-				if (antHomeEntry != null) {
-					return antHomeEntry.getEntries();
-				}
-				break;
-			case GLOBAL_USER :
-				if (userGlobalEntry != null) {
-					return userGlobalEntry.getEntries();
-				}
-				break;
-			case USER : 
-				return getUserEntries();
-		}
-		return new IAntClasspathEntry[0];
-	}
-	
-	public void remove(Object entry) {
-		childEntries.remove(entry);
-		if (entry == userGlobalEntry) {
-			userGlobalEntry= null;
-		}
-	}
-	
-	public ClasspathEntry createEntry(Object entry, IClasspathEntry entryParent) {
-		if (entryParent == null) {
-			entryParent= this;
-		} 
-		return new ClasspathEntry(entry, entryParent);
-	}
-
-	public void removeAll() {
-		if (antHomeEntry != null) {
-			antHomeEntry.removeAll();
-		} 
-		if (userGlobalEntry != null) {
-			userGlobalEntry.removeAll();
-		}
-	}
-	
-	public void removeAll(int entryType) {
-		switch (entryType) {
-			case ANT_HOME :
-				if (antHomeEntry != null) {
-					antHomeEntry.removeAll();
-				}
-				break;
-			case GLOBAL_USER :
-				if (userGlobalEntry != null) {
-					userGlobalEntry.removeAll();
-				}
-				break;
-			default :
-				break;
-		}
-	}
-	
-	public void removeAll(Object[] entries) {
-		
-		for (int i = 0; i < entries.length; i++) {
-			Object object = entries[i];
-			if (object instanceof ClasspathEntry) {
-				IClasspathEntry entryParent= ((ClasspathEntry)object).getParent();
-				if (entryParent instanceof GlobalClasspathEntries) {
-					((GlobalClasspathEntries)entryParent).removeEntry((ClasspathEntry) object);
-				} else {
-					remove(object);
-				}
-			} else {
-				remove(object);
-			}
-		}
-	}
-
-	public void setAntHomeEntries(IAntClasspathEntry[] entries) {
-		if (antHomeEntry == null) {
-			String name= AntPreferencesMessages.getString("ClasspathModel.2"); //$NON-NLS-1$
-			antHomeEntry= createGlobalEntry(entries, name, false, true, ANT_HOME);
-		} else {
-			antHomeEntry.removeAll();
-			for (int i = 0; i < entries.length; i++) {
-				antHomeEntry.addEntry(new ClasspathEntry(entries[i], antHomeEntry));
-			}
-		}
-	}
-
-	private GlobalClasspathEntries createGlobalEntry(IAntClasspathEntry[] entries, String name, boolean canBeRemoved, boolean addEntry, int type) {
-		
-		GlobalClasspathEntries global= new GlobalClasspathEntries(name, this, canBeRemoved, type);
-		
-		for (int i = 0; i < entries.length; i++) {
-			global.addEntry(new ClasspathEntry(entries[i], global));
-		}
-		
-		if (addEntry) {
-			addEntry(global);
-		}
-		return global;
-	}
-
-	public void setGlobalEntries(IAntClasspathEntry[] entries) {
-		if (userGlobalEntry == null) {
-			String name= AntPreferencesMessages.getString("ClasspathModel.3"); //$NON-NLS-1$
-			userGlobalEntry= createGlobalEntry(entries, name, true, true, GLOBAL_USER);
-		} else {
-			userGlobalEntry.removeAll();
-			for (int i = 0; i < entries.length; i++) {
-				userGlobalEntry.addEntry(new ClasspathEntry(entries[i], userGlobalEntry));
-			}
-		}
-	}
-	
-	private IAntClasspathEntry[] getUserEntries() {
-		List userEntries= new ArrayList(childEntries.size());
-		Iterator itr= childEntries.iterator();
-		while (itr.hasNext()) {
-			IClasspathEntry element = (IClasspathEntry) itr.next();
-			if (element instanceof GlobalClasspathEntries) {
-				continue;
-			}
-			userEntries.add(element);
-		}
-		return (IAntClasspathEntry[])userEntries.toArray(new IAntClasspathEntry[userEntries.size()]);
-	}
-	
-	public String serializeClasspath(boolean defaultAntHome) {
-		Iterator itr= childEntries.iterator();
-		StringBuffer buff= new StringBuffer();
-		while (itr.hasNext()) {
-			IClasspathEntry element = (IClasspathEntry) itr.next();
-			if (element instanceof GlobalClasspathEntries) {
-				if (element == antHomeEntry) {
-					if (!defaultAntHome || !isSameAsDefaultAntHome()) {
-						IAntClasspathEntry[] antHomeEntries= antHomeEntry.getEntries();
-						for (int i = 0; i < antHomeEntries.length; i++) {
-							IAntClasspathEntry entry = antHomeEntries[i];
-							buff.append('?');
-							buff.append(entry.toString());
-							buff.append(AntUtil.ATTRIBUTE_SEPARATOR);
-						}
-					} else {
-						buff.append(AntUtil.ANT_HOME_CLASSPATH_PLACEHOLDER);
-					}
-				} else {
-					buff.append(AntUtil.ANT_GLOBAL_USER_CLASSPATH_PLACEHOLDER);
-				}
-			} else {
-				buff.append(element.toString());
-			}
-			buff.append(AntUtil.ATTRIBUTE_SEPARATOR);
-		}
-		if (buff.length() > 0) {
-			return buff.substring(0, buff.length() - 1);
-		}
-		return ""; //$NON-NLS-1$
-	}
-	
-	private boolean isSameAsDefaultAntHome() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		IAntClasspathEntry[] defaultAntHomeEntries= prefs.getAntHomeClasspathEntries();
-		IAntClasspathEntry[] antHomeEntries= antHomeEntry.getEntries();
-		if (antHomeEntries.length != defaultAntHomeEntries.length) {
-			return false;
-		}
-		
-		for (int i = 0; i < antHomeEntries.length; i++) {
-			IAntClasspathEntry entry = antHomeEntries[i];
-			IAntClasspathEntry defaultEntry= defaultAntHomeEntries[i];
-			if (!sameURL(entry, defaultEntry)) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	private boolean sameURL(IAntClasspathEntry first, IAntClasspathEntry second) {
-		if (first == null || second == null) {
-			return false;
-		}
-		File newFile= new File(first.getEntryURL().getFile());
-		File existingFile= new File(second.getEntryURL().getFile());
-		if (existingFile.equals(newFile)) {
-			return true;
-		}
-		return false;
-	}
-	
-	public ClasspathModel(String serializedClasspath, boolean customAntHome) {
-		StringTokenizer tokenizer= new StringTokenizer(serializedClasspath, AntUtil.ATTRIBUTE_SEPARATOR);
-		
-		while (tokenizer.hasMoreTokens()) {
-			String string = tokenizer.nextToken().trim();
-			if (string.equals(AntUtil.ANT_HOME_CLASSPATH_PLACEHOLDER)) {
-				IAntClasspathEntry[] antHomeEntries= new IAntClasspathEntry[0];
-				if (!customAntHome) {
-					antHomeEntries= AntCorePlugin.getPlugin().getPreferences().getAntHomeClasspathEntries();
-				} 
-				setAntHomeEntries(antHomeEntries);
-			} else if (string.equals(AntUtil.ANT_GLOBAL_USER_CLASSPATH_PLACEHOLDER)) {
-				setGlobalEntries(AntCorePlugin.getPlugin().getPreferences().getAdditionalClasspathEntries());
-			} else {
-				boolean isAntHomeEntry= false;
-				Object entry= null;
-				if (string.charAt(0) == '*') {
-					//old customclasspath
-					string= string.substring(1);
-				}
-				if (string.charAt(0) == '?') {
-					//ant home entry
-					string= string.substring(1);
-					isAntHomeEntry= true;
-				}
-				try {
-					entry=  new URL("file:" + string); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					entry= string;
-				}
-				if (isAntHomeEntry) {
-					addEntry(ANT_HOME, entry);
-				} else {
-					addEntry(entry);
-				}
-			}
-		}
-	}
-	
-	public ClasspathModel() {
-		super();
-	}
-
-	/**
-	 * @return
-	 */
-	public Object[] getRemovedGlobalEntries() {
-		if (userGlobalEntry == null) {
-			String name= AntPreferencesMessages.getString("ClasspathModel.3"); //$NON-NLS-1$
-			return new Object[] {createGlobalEntry(new IAntClasspathEntry[0], name, true, false, GLOBAL_USER)};
-		}
-		return new Object[] {};
-	}
-
-	/**
-	 * @return
-	 */
-	public Object getAntHomeEntry() {
-		return antHomeEntry;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ColorEditor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/ColorEditor.java
deleted file mode 100644
index b558cb9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/preferences/DialogSettingsHelper.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/DialogSettingsHelper.java
deleted file mode 100644
index 5a55b92..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/DialogSettingsHelper.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Helper class for dealing with setting and restoring dialog settings.
- */
-public class DialogSettingsHelper {
-	public static final String DIALOG_ORIGIN_X = AntUIPlugin.PI_ANTUI + ".ATTR_ANT_DIALOG_X_ORIGIN"; //$NON-NLS-1$
-	public static final String DIALOG_ORIGIN_Y = AntUIPlugin.PI_ANTUI + ".ATTR_ANT_DIALOG_Y_ORIGIN"; //$NON-NLS-1$
-	public static final String DIALOG_WIDTH = AntUIPlugin.PI_ANTUI + ".ATTR_ANT_DIALOG_WIDTH"; //$NON-NLS-1$
-	public static final String DIALOG_HEIGHT = AntUIPlugin.PI_ANTUI + ".ATTR_ANT_DIALOG_HEIGHT"; //$NON-NLS-1$
-	
-	/**
-	 * Persists the location and dimensions of the shell in the
-	 * Debug UI Plugin dialog settings under the provided dialog settings section name
-	 * 
-	 * @param shell The shell whose geometry is to be stored
-	 * @param dialogSettingsSectionName The name of the dialog settings section
-	 */
-	public static void persistShellGeometry(Shell shell, String dialogSettingsSectionName) {
-		Point shellLocation = shell.getLocation();
-		Point shellSize = shell.getSize();
-		IDialogSettings settings = getDialogSettings(dialogSettingsSectionName);
-		settings.put(DIALOG_ORIGIN_X, shellLocation.x);
-		settings.put(DIALOG_ORIGIN_Y, shellLocation.y);
-		settings.put(DIALOG_WIDTH, shellSize.x);
-		settings.put(DIALOG_HEIGHT, shellSize.y);
-	}
-	
-	private static IDialogSettings getDialogSettings(String dialogSettingsSectionName) {
-		IDialogSettings settings = AntUIPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = settings.getSection(dialogSettingsSectionName);
-		if (section == null) {
-			section = settings.addNewSection(dialogSettingsSectionName);
-		} 
-		return section;
-	}
-	
-	/**
-	 * Returns the initial size which is the larger of the <code>initialSize</code> or
-	 * the size persisted in the Debug UI Plugin dialog settings under the provided dialog setttings section name.
-	 * If no size is persisted in the settings, the <code>initialSize</code> is returned. 
-	 * 
-	 * @param initialSize The initialSize to compare against
-	 * @param dialogSettingsSectionName The name of the dialog settings section
-	 * @return the initial size
-	 */
-	public static Point getInitialSize(String dialogSettingsSectionName, Point initialSize) {
-		IDialogSettings settings = getDialogSettings(dialogSettingsSectionName);
-		try {
-			int x, y;
-			x = settings.getInt(IDebugPreferenceConstants.DIALOG_WIDTH);
-			y = settings.getInt(IDebugPreferenceConstants.DIALOG_HEIGHT);
-			return new Point(Math.max(x, initialSize.x), Math.max(y, initialSize.y));
-		} catch (NumberFormatException e) {
-		}
-		return initialSize;
-	}
-	
-	/**
-	 * Returns the initial location which is persisted in the Debug UI Plugin dialog settings
-	 * under the provided dialog setttings section name.
-	 * If location is not persisted in the settings, the <code>null</code> is returned. 
-	 * 
-	 * @param dialogSettingsSectionName The name of the dialog settings section
-	 * @return The initial location or <code>null</code>
-	 */
-	public static Point getInitialLocation(String dialogSettingsSectionName) {
-		IDialogSettings settings = getDialogSettings(dialogSettingsSectionName);
-		try {
-			int x= settings.getInt(IDebugPreferenceConstants.DIALOG_ORIGIN_X);
-			int y= settings.getInt(IDebugPreferenceConstants.DIALOG_ORIGIN_Y);
-			return new Point(x,y);
-		} catch (NumberFormatException e) {
-		}
-		return null;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/GlobalClasspathEntries.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/GlobalClasspathEntries.java
deleted file mode 100644
index eb9516e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/GlobalClasspathEntries.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.ant.internal.ui.preferences;
-
-import java.util.List;
-
-public class GlobalClasspathEntries extends AbstractClasspathEntry {
-	private String name;
-	private int type;
-	
-	private boolean canBeRemoved= true;
-	
-	public GlobalClasspathEntries(String name, IClasspathEntry parent, boolean canBeRemoved, int type) {
-		this.parent= parent;
-		this.name= name;
-		this.canBeRemoved= canBeRemoved;
-		this.type= type;
-	}
-		
-	public void addEntry(ClasspathEntry entry) {
-		childEntries.add(entry);
-	}
-	
-	public void removeEntry(ClasspathEntry entry) {
-		childEntries.remove(entry);
-	}
-	
-	public boolean contains(ClasspathEntry entry) {
-		return childEntries.contains(entry);
-	}
-	
-	public String toString() {
-		return name;
-	}
-
-	public void removeAll() {
-		childEntries.clear();
-	}
-	
-	public boolean canBeRemoved() {
-		return canBeRemoved;
-	}
-
-	/**
-     * Set the child entries of this classpath entry.
-	 * @param entries The child entries.
-	 */
-	public void setEntries(List entries) {
-		childEntries= entries;
-	}
-	/**
-	 * @return Returns the type of this global classpath entry.
-	 * @see ClasspathModel#ANT_HOME
-	 * @see ClasspathModel#GLOBAL_USER
-	 */
-	public int getType() {
-		return type;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/IAntBlockContainer.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/IAntBlockContainer.java
deleted file mode 100644
index 5d3a88a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/preferences/IClasspathEntry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/IClasspathEntry.java
deleted file mode 100644
index e425699..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/IClasspathEntry.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.ant.internal.ui.preferences;
-
-import org.eclipse.ant.core.IAntClasspathEntry;
-
-public interface IClasspathEntry extends IAntClasspathEntry {
-	
-	/**
-	 * Returns the classpath entries that are the children of this classpath entry
-	 * 
-	 * @return the child classpath entries of this entry
-	 */
-	public IAntClasspathEntry[] getEntries();
-	
-	/**
-	 * Returns whether this classpath entries has child entries.
-	 * 
-	 * @return whether <code>true</code> if this classpath entry has childern, <code>false</code> otherwise.
-	 */
-	public boolean hasEntries();
-	
-	/**
-	 * Returns the parent of this classpath entry
-	 * 
-	 * @return the parent of this classpath entry, or <code>null</code> if none.
-	 */
-	public IClasspathEntry getParent();
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageDialogWithToggle.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageDialogWithToggle.java
deleted file mode 100644
index fb19a31..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageDialogWithToggle.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.preferences;
-
-
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-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.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * A message dialog which allows the user to set a boolean preference.
- * 
- * This is typically used to set a preference that determines if the dialog
- * should be shown in the future
- */
-public class MessageDialogWithToggle extends MessageDialog {
-	
-	/**
-	 * The preference key which is set by the toggle button.
-	 * This key must be a boolean preference in the preference store.
-	 */
-	private String fPreferenceKey = null;
-	/**
-	 * The message displayed to the user, with the toggle button
-	 */
-	private String fToggleMessage = null;
-	private Button fToggleButton = null;
-	/**
-	 * The preference store which will be affected by the toggle button
-	 */
-	IPreferenceStore fStore = null;
-
-	public MessageDialogWithToggle(Shell parentShell, String dialogTitle, Image image, String message, int dialogImageType, String[] dialogButtonLabels, int defaultIndex, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-		super(parentShell, dialogTitle, image, message, dialogImageType, dialogButtonLabels, defaultIndex);
-		fStore = store;
-		fPreferenceKey = preferenceKey;
-		fToggleMessage = toggleMessage;
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite area = (Composite) super.createDialogArea(parent);
-		fToggleButton = createCheckButton(area, fToggleMessage);
-		getToggleButton().setSelection(!fStore.getBoolean(fPreferenceKey));
-		return area;
-	}
-
-	/**
-	 * Creates a button with the given label and sets the default
-	 * configuration data.
-	 */
-	protected Button createCheckButton(Composite parent, String label) {
-		Button button= new Button(parent, SWT.CHECK | SWT.LEFT);
-		button.setText(label);
-
-		GridData data = new GridData(SWT.NONE);
-		data.horizontalSpan= 2;
-		data.horizontalAlignment= GridData.CENTER;
-		button.setLayoutData(data);
-		button.setFont(parent.getFont());
-
-		return button;
-	}
-
-	/**
-	 * When the OK button is pressed, store the preference.
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-	 */
-	protected void buttonPressed(int id) {
-		if (id == IDialogConstants.OK_ID) {  // was the OK button pressed?
-			fStore.setValue(fPreferenceKey, !getToggleButton().getSelection());
-		}
-		super.buttonPressed(id);
-	}
-
-	/**
-	 * Returns the button used to toggle the dialog preference
-	 * 
-	 * @return Button the preference toggle button
-	 */
-	protected Button getToggleButton() {
-		return fToggleButton;
-	}
-	
-	/**
-	 * Convenience method to open a simple confirm (OK/Cancel) dialog.
-	 *
-	 * @param parent the parent shell of the dialog, or <code>null</code> if none
-	 * @param title the dialog's title, or <code>null</code> if none
-	 * @param message the message
-	 * @return <code>true</code> if the user presses the OK button,
-	 *    <code>false</code> otherwise
-	 */
-	public static boolean openConfirm(Shell parent, String title, String message, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-		MessageDialogWithToggle dialog = new MessageDialogWithToggle(
-			parent,
-			title,
-			null,	// accept the default window icon
-			message,
-			QUESTION,
-			new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL},
-			0,		// OK is the default
-			preferenceKey,
-			toggleMessage,
-			store);
-		return dialog.open() == 0;
-	}
-	/**
-	 * Convenience method to open a standard error dialog.
-	 *
-	 * @param parent the parent shell of the dialog, or <code>null</code> if none
-	 * @param title the dialog's title, or <code>null</code> if none
-	 * @param message the message
-	 */
-	public static void openError(Shell parent, String title, String message, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-		MessageDialogWithToggle dialog = new MessageDialogWithToggle(
-			parent,
-			title,
-			null,	// accept the default window icon
-			message,
-			ERROR,
-			new String[] {IDialogConstants.OK_LABEL},
-			0,		// ok is the default
-			preferenceKey,
-			toggleMessage,
-			store);
-		dialog.open();
-	}
-	/**
-	 * Convenience method to open a standard information dialog.
-	 *
-	 * @param parent the parent shell of the dialog, or <code>null</code> if none
-	 * @param title the dialog's title, or <code>null</code> if none
-	 * @param message the message
-	 */
-	public static void openInformation(
-		Shell parent,
-		String title,
-		String message, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-			MessageDialogWithToggle dialog =
-				new MessageDialogWithToggle(parent, title, null, // accept the default window icon
-		message, INFORMATION, new String[] { IDialogConstants.OK_LABEL }, 0,		// ok is the default 
-		preferenceKey, toggleMessage, store);
-		dialog.open();
-	}
-	/**
-	 * Convenience method to open a simple Yes/No question dialog.
-	 *
-	 * @param parent the parent shell of the dialog, or <code>null</code> if none
-	 * @param title the dialog's title, or <code>null</code> if none
-	 * @param message the message
-	 * @return <code>true</code> if the user presses the OK button,
-	 *    <code>false</code> otherwise
-	 */
-	public static boolean openQuestion(Shell parent, String title, String message, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-		MessageDialogWithToggle dialog = new MessageDialogWithToggle(
-			parent,
-			title,
-			null,	// accept the default window icon
-			message,
-			QUESTION,
-			new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL},
-			0,		// yes is the default
-			preferenceKey,
-			toggleMessage,
-			store);
-		return dialog.open() == 0;
-	}
-	/**
-	 * Convenience method to open a standard warning dialog.
-	 *
-	 * @param parent the parent shell of the dialog, or <code>null</code> if none
-	 * @param title the dialog's title, or <code>null</code> if none
-	 * @param message the message
-	 */
-	public static void openWarning(Shell parent, String title, String message, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-		MessageDialogWithToggle dialog = new MessageDialogWithToggle(
-			parent,
-			title,
-			null,	// accept the default window icon
-			message,
-			WARNING,
-			new String[] {IDialogConstants.OK_LABEL},
-			0,		// ok is the default
-			preferenceKey,
-			toggleMessage,
-			store);
-		dialog.open();
-	}
-
-	/* (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, IAntUIHelpContextIds.MESSAGE_WITH_TOGGLE_DIALOG);
-	}
-
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageLine.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MessageLine.java
deleted file mode 100644
index cc78534..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/preferences/MinimizedFileSystemElement.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MinimizedFileSystemElement.java
deleted file mode 100644
index fd45b6d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/MinimizedFileSystemElement.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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);
-		}
-		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/internal/ui/preferences/OverlayPreferenceStore.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/OverlayPreferenceStore.java
deleted file mode 100644
index 5532c81..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/preferences/PropertyFileFilter.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/PropertyFileFilter.java
deleted file mode 100644
index d2c2530..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/PropertyFileFilter.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/**********************************************************************
-Copyright (c) 2003 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-package org.eclipse.ant.internal.ui.preferences;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.custom.BusyIndicator;
-
-public class PropertyFileFilter extends ViewerFilter {
-
-	/**
-	 * Objects to filter
-	 */
-	protected List fFilter;
-	
-	/**
-	 * Collection of property files and containers to display
-	 */
-	private Set fPropertyFiles;
-
-	/**
-	 * Creates a new filter that filters the given 
-	 * objects.
-	 */
-	public PropertyFileFilter(List objects) {
-		fFilter = objects;
-		init();
-	}
-
-	/**
-	 * @see ViewerFilter#select(Viewer, Object, Object)
-	 */
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		return fPropertyFiles.contains(element) && !fFilter.contains(element);
-	}
-	
-	/**
-	 * Search for all archives in the workspace.
-	 */
-	private void init() {
-		BusyIndicator.showWhile(AntUIPlugin.getStandardDisplay(), new Runnable() {
-			public void run() {
-				fPropertyFiles = new HashSet();
-				traverse(ResourcesPlugin.getWorkspace().getRoot(), fPropertyFiles);
-			}
-		});
-	}
-
-	/**
-	 * Traverse the given container, adding property file to the given set.
-	 * Returns whether any files were added
-	 */
-	private boolean traverse(IContainer container, Set set) {
-		boolean added = false;
-		try {
-			IResource[] resources = container.members();
-			for (int i = 0; i < resources.length; i++) {
-				IResource resource = resources[i];
-				if (resource instanceof IFile) {
-					IFile file = (IFile) resource;
-					String ext = file.getFileExtension();
-					if (ext != null && ext.equalsIgnoreCase("properties")) { //$NON-NLS-1$
-						set.add(file);
-						added = true;
-					}
-				} else if (resource instanceof IContainer) {
-					if (traverse((IContainer) resource, set)) {
-						set.add(resource);
-						added = true;
-					}
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return added;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/StatusDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/StatusDialog.java
deleted file mode 100644
index 3bfac18..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.preferences;
-
-
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-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.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, IAntUIHelpContextIds.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= 0;
-		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/internal/ui/preferences/StatusInfo.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/StatusInfo.java
deleted file mode 100644
index 47cf377..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.preferences;
-
-
-import org.eclipse.ant.internal.ui.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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IStatus#getMessage()
-	 */
-	public String getMessage() {
-		return fStatusMessage;
-	}
-
-	/**
-	 * Sets the status to ERROR.
-	 * @param errorMessage 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 warningMessage 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 infoMessage 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/internal/ui/preferences/TabFolderLayout.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java
deleted file mode 100644
index 4e91920..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/views/AntProjectContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntProjectContentProvider.java
deleted file mode 100644
index 1211ff1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntProjectContentProvider.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.ant.internal.ui.views;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.views.elements.AntNode;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.ant.internal.ui.views.elements.RootNode;
-import org.eclipse.ant.internal.ui.views.elements.TargetNode;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * Content provider that provides a tree of ant projects.
- */
-public class AntProjectContentProvider implements ITreeContentProvider {
-
-	/**
-	 * The root node of the project tree
-	 */
-	private RootNode rootNode;
-	private boolean fIsFilteringInternalTargets= false;
-
-	/**
-	 * @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 project to the tree. Has no effect if a project with the same buildfile name
-	 * is already present in the tree.
-	 * 
-	 * @param project The project to add
-	 */
-	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) { 
-			if (!fIsFilteringInternalTargets) {
-				return ((ProjectNode) element).getTargets();
-			}
-			TargetNode[] targets= ((ProjectNode) element).getTargets();
-			List filteredTargets= new ArrayList();
-			for (int i = 0; i < targets.length; i++) {
-				TargetNode node = targets[i];
-				if (!isInternal(node)) {
-					filteredTargets.add(node);
-				}
-			}
-			return filteredTargets.toArray();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns whether the given target is an internal target. Internal
-	 * targets are targets which has no description. The default target
-	 * is never considered internal.
-	 * @param target the target to examine
-	 * @return whether the given target is an internal target
-	 */
-	private boolean isInternal(TargetNode target) {
-		return target != target.getProject().getDefaultTarget() && target.getDescription() == 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;
-	}
-	
-	public boolean isFilterInternalTargets() {
-		return fIsFilteringInternalTargets;
-	}
-
-	/**
-	 * @param filter
-	 */
-	public void setFilterInternalTargets(boolean filter) {
-		fIsFilteringInternalTargets= filter;
-	}
-
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntTargetContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntTargetContentProvider.java
deleted file mode 100644
index cbe202f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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.internal.ui.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/internal/ui/views/AntView.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntView.java
deleted file mode 100644
index 24495a8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntView.java
+++ /dev/null

@@ -1,745 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms 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.internal.ui.views;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.actions.AddBuildFilesAction;
-import org.eclipse.ant.internal.ui.views.actions.AntOpenWithMenu;
-import org.eclipse.ant.internal.ui.views.actions.FilterInternalTargetsAction;
-import org.eclipse.ant.internal.ui.views.actions.RefreshBuildFilesAction;
-import org.eclipse.ant.internal.ui.views.actions.RemoveAllAction;
-import org.eclipse.ant.internal.ui.views.actions.RemoveProjectAction;
-import org.eclipse.ant.internal.ui.views.actions.RunTargetAction;
-import org.eclipse.ant.internal.ui.views.actions.SearchForBuildFilesAction;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.ant.internal.ui.views.elements.RootNode;
-import org.eclipse.ant.internal.ui.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.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.Transfer;
-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.ui.XMLMemento;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-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;
-	private boolean restoredFilterInternalTargets= false;
-	/**
-	 * This memento allows the Ant view to save and restore state
-	 * when it is closed and opened within a session. A different
-	 * memento is supplied by the platform for persistance at
-	 * workbench shutdown.
-	 */
-	private static IMemento tempMemento = 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 tag used to identify the "filter internal targets" preference.
-	 */
-	private static final String TAG_FILTER_INTERNAL_TARGETS = "filterInternalTargets"; //$NON-NLS-1$
-	/**
-	 * XML key used to store the value of the "filter internal targets" preference. 
-	 */
-	private static final String KEY_VALUE = "value"; //$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 AddBuildFilesAction addBuildFileAction;
-	private SearchForBuildFilesAction searchForBuildFilesAction;
-	private RefreshBuildFilesAction refreshBuildFilesAction;
-	private RunTargetAction runTargetAction;
-	private RemoveProjectAction removeProjectAction;
-	private RemoveAllAction removeAllAction;
-	private FilterInternalTargetsAction filterInternalTargetsAction;
-	// Context-menu-only actions
-	private AntOpenWithMenu openWithMenu;
-	private RunTargetAction 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() {
-				//must do a full refresh to re-sort
-				projectViewer.refresh();
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		initializeActions();
-		createProjectViewer(parent);
-		initializeDragAndDrop();
-		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();
-	}
-	
-	private void initializeDragAndDrop() {
-		int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_DEFAULT;
-		Transfer[] transfers = new Transfer[] { FileTransfer.getInstance() };
-		TreeViewer viewer = getProjectViewer();
-		AntViewDropAdapter adapter = new AntViewDropAdapter(this);
-		viewer.addDropSupport(ops, transfers, adapter);
-	}
-
-	/**
-	 * 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(runTargetAction);
-			menu.add(editConfigAction);
-			menu.add(new Separator());
-			addOpenWithMenu(menu);
-			menu.add(new Separator());
-			menu.add(addBuildFileAction);
-			menu.add(removeProjectAction);
-			menu.add(removeAllAction);
-			menu.add(refreshBuildFilesAction);
-		}
-		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 AddBuildFilesAction(this);
-		
-		removeProjectAction = new RemoveProjectAction(this);
-		updateProjectActions.add(removeProjectAction);
-		
-		removeAllAction = new RemoveAllAction(this);
-		updateProjectActions.add(removeAllAction);
-		
-		runTargetAction = new RunTargetAction(this, false);
-		updateProjectActions.add(runTargetAction);
-		
-		searchForBuildFilesAction = new SearchForBuildFilesAction(this);
-		
-		refreshBuildFilesAction = new RefreshBuildFilesAction(this);
-		updateProjectActions.add(refreshBuildFilesAction); 
-		
-		openWithMenu= new AntOpenWithMenu(this.getViewSite().getPage());
-		
-		editConfigAction= new RunTargetAction(this, true);
-		updateProjectActions.add(editConfigAction);
-		
-		filterInternalTargetsAction= new FilterInternalTargetsAction(this);
-	}
-
-	/**
-	 * 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);
-		projectContentProvider = new AntProjectContentProvider();
-		projectViewer.setContentProvider(projectContentProvider);
-		projectContentProvider.setFilterInternalTargets(restoredFilterInternalTargets);
-		filterInternalTargetsAction.setChecked(restoredFilterInternalTargets);
-		projectViewer.setLabelProvider(new AntViewLabelProvider());
-		if (tempMemento != null) {
-			restoreRoot(tempMemento);
-		}
-		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) {
-				if (!event.getSelection().isEmpty()) {
-					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.isEmpty() || !(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 = IDE.getDefaultEditor(file);
-			if (editor == null) {
-				editor= registry.findEditor(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID);
-			}
-			try {
-				if (editor == null) {
-					getViewSite().getPage().openEditor(new FileEditorInput(file), IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
-				} else {
-					getViewSite().getPage().openEditor(new FileEditorInput(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);
-		}
-		setProjectViewerSelectionAfterDeletion();
-	}
-
-	private void setProjectViewerSelectionAfterDeletion() {
-		Object[] children= projectContentProvider.getChildren(projectContentProvider.getRootNode());
-		if (children.length > 0) {
-			ViewerSorter sorter= projectViewer.getSorter();
-			sorter.sort(projectViewer, children);
-			projectViewer.setSelection(new StructuredSelection(children[0]));
-		}
-	}
-
-	/**
-	 * 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();
-		setProjectViewerSelectionAfterDeletion();
-	}
-
-	/**
-	 * 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);
-		if (memento != null) {
-			IMemento child= memento.getChild(TAG_FILTER_INTERNAL_TARGETS);
-			if (child != null) {
-				restoredFilterInternalTargets= Boolean.valueOf(child.getString(KEY_VALUE)).booleanValue();
-			}
-		}
-	}
-
-	/**
-	 * 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 && Boolean.valueOf(errorString).booleanValue()) {
-				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, String.valueOf(true));
-			} else {
-				if (defaultTarget != null) {
-					projectMemento.putString(KEY_DEFAULT, defaultTarget);
-				}
-				projectMemento.putString(KEY_ERROR, String.valueOf(false));
-			}
-		}
-		IMemento filterTargets= memento.createChild(TAG_FILTER_INTERNAL_TARGETS);
-		filterTargets.putString(KEY_VALUE, isFilterInternalTargets() ? String.valueOf(true) : String.valueOf(false));
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		tempMemento= XMLMemento.createWriteRoot("AntViewMemento"); //$NON-NLS-1$
-		saveState(tempMemento);
-		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(filterInternalTargetsAction);
-
-		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;
-	}
-
-	/**
-	 * Returns whether internal targets are currently being filtered out of
-	 * the view.
-	 * 
-	 * @return whether or not internal targets are being filtered out
-	 */
-	public boolean isFilterInternalTargets() {
-		if (projectContentProvider != null) {
-			return projectContentProvider.isFilterInternalTargets();
-		}
-		return false;
-	}
-
-	/**
-	 * Sets whether internal targets should be filtered out of the view.
-	 * 
-	 * @param filter whether or not internal targets should be filtered out
-	 */
-	public void setFilterInternalTargets(boolean filter) {
-		if (projectContentProvider != null) {
-			projectContentProvider.setFilterInternalTargets(filter);
-			projectViewer.refresh();
-		}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewDropAdapter.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewDropAdapter.java
deleted file mode 100644
index 49375ac..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewDropAdapter.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.ui.views;
-
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.DropTargetAdapter;
-import org.eclipse.swt.dnd.DropTargetEvent;
-
-/**
- * A drop adapter which adds files to the Ant view.
- */
-public class AntViewDropAdapter extends DropTargetAdapter {
-	
-	private AntView view;
-	
-	/**
-	 * Creates a new drop adapter for the given Ant view.
-	 * @param view the view which dropped files will be added to
-	 */
-	public AntViewDropAdapter(AntView view) {
-		this.view= view;
-	}
-
-	/**
-	 * @see
-	 * org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
-	public void drop(DropTargetEvent event) {
-		Object data = event.data;
-		if (data instanceof String[]) {
-			final String[] strings = (String[]) data;
-			BusyIndicator.showWhile(null, new Runnable() {
-				public void run() {
-					for (int i = 0; i < strings.length; i++) {
-						processString(strings[i]);
-					}
-				}
-			});
-		}
-	}
-	
-	/**
-	 * Attempts to process the given string as a path to an
-	 * XML file. If the string is determined to be a path to an
-	 * XML file in the workspace, that file is added to the Ant
-	 * view.
-	 * @param buildFileName the string to process
-	 */
-	private void processString(String buildFileName) {
-		IFile buildFile = AntUtil.getFileForLocation(buildFileName, null);
-		if (buildFile == null || !buildFileName.toLowerCase().endsWith(".xml")) { //$NON-NLS-1$
-			return;
-		}
-		buildFileName = buildFile.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/internal/ui/views/AntViewLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewLabelProvider.java
deleted file mode 100644
index 9fd1cc0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewLabelProvider.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.internal.ui.views;
-
-import org.eclipse.ant.internal.ui.model.AntImageDescriptor;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.ant.internal.ui.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())){
-				base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_DEFAULT_TARGET);
-			} else if (target.getDescription() == null) {
-				base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET_INTERNAL);
-			} 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/internal/ui/views/AntViewMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewMessages.java
deleted file mode 100644
index 0155939..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.views;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntViewMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/views/AntViewMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/AntViewMessages.properties
deleted file mode 100644
index 389d024..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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/internal/ui/views/actions/AddBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AddBuildFilesAction.java
deleted file mode 100644
index 18e623b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AddBuildFilesAction.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.views.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.externaltools.internal.ui.FileSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Action that prompts the user for build files and adds the selected files to
- * an <code>AntView</code>
- */
-public class AddBuildFilesAction extends Action {
-
-	private AntView view;
-
-	public AddBuildFilesAction(AntView view) {
-		super(AntViewActionMessages.getString("AddBuildFilesAction.1"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ADD)); //$NON-NLS-1$
-		this.view= view;
-		setToolTipText(AntViewActionMessages.getString("AddBuildFilesAction.1")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(this, IAntUIHelpContextIds.ADD_BUILDFILE_ACTION);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		FileSelectionDialog dialog = new FileSelectionDialog(Display.getCurrent().getActiveShell(), ResourcesPlugin.getWorkspace().getRoot(), AntViewActionMessages.getString("AddBuildFilesAction.2")); //$NON-NLS-1$
-		dialog.setFileFilter("*.xml", true); //$NON-NLS-1$
-		dialog.setAllowMultiselection(true);
-		dialog.open();
-		final IStructuredSelection result = dialog.getResult();
-		if (result == null) {
-			return;
-		}
-
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					monitor.beginTask(AntViewActionMessages.getString("AddBuildFilesAction.3"), result.size()); //$NON-NLS-1$
-					Object[] files= result.toArray();
-					files: for (int i = 0; i < files.length && !monitor.isCanceled(); i++) {
-						Object file = files[i];
-						if (file instanceof IFile) {
-							String buildFileName= ((IFile)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.
-									monitor.worked(1);
-									continue files;
-								}
-							}
-							final ProjectNode project= new ProjectNode(buildFileName);
-							project.getName();
-							monitor.worked(1);
-							Display.getDefault().asyncExec(new Runnable() {
-								public void run() {
-									view.addProject(project);
-								}
-							});
-						}
-					}
-				}
-			});
-			
-			} catch (InvocationTargetException e) {
-			} catch (InterruptedException e) {
-			}
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java
deleted file mode 100644
index d0b0ce9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java
+++ /dev/null

@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.internal.ui.editor.model.AntElementNode;
-import org.eclipse.ant.internal.ui.editor.outline.AntModel;
-import org.eclipse.ant.internal.ui.editor.text.AntEditorDocumentProvider;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-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.jface.action.ContributionItem;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-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.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * 
- * 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);
-	
-	private int fLine= -1;
-	private int fColumn= -1;
-
-	/**
-	 * 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().getName());
-		} 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;
-		} 
-		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.findEditor(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID); // should not be null
-		IEditorDescriptor preferredEditor = IDE.getDefaultEditor(fileResource); // may be null
-		
-		Object[] editors= registry.getEditors(fileResource.getName());
-		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.internal.ui.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(IEditorRegistry.SYSTEM_EXTERNAL_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;
-		}
-		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 editorDescriptor) {
-		IEditorPart editorPart= null;
-		IFile fileResource = getFileResource();
-		try {
-			if (editorDescriptor == null) {
-				editorPart= page.openEditor(new FileEditorInput(fileResource), IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
-			} else {
-				editorPart= page.openEditor(new FileEditorInput(fileResource), editorDescriptor.getId());
-			}
-		} catch (PartInitException e) {
-			AntUIPlugin.log(MessageFormat.format(AntViewActionMessages.getString("AntViewOpenWithMenu.Editor_failed"), new String[]{fileResource.getLocation().toOSString()}), e); //$NON-NLS-1$
-		}
-		if (fLine == -1) {
-			return;
-		}
-		if (editorPart instanceof ITextEditor) {
-			ITextEditor editor= (ITextEditor)editorPart;
-			int offset= getOffset(fLine, fColumn, editor);
-			if (offset == -1) {
-				return;
-			}
-			IDocumentProvider provider= editor.getDocumentProvider();
-			if (provider instanceof AntEditorDocumentProvider) {
-				AntModel model= ((AntEditorDocumentProvider)provider).getAntModel(editor.getEditorInput());
-				AntElementNode node= model.getProjectNode().getNode(offset);
-				editor.setHighlightRange(node.getOffset(), node.getLength(), true);
-				editor.selectAndReveal(node.getOffset(), node.getSelectionLength());	
-			}
-		}
-	}
-	
-	private int getOffset(int line, int column, ITextEditor editor) {
-		IDocumentProvider provider= editor.getDocumentProvider();
-		IEditorInput input= editor.getEditorInput();
-		try {
-			provider.connect(input);
-		} catch (CoreException e) {
-			return -1;
-		}
-		try {
-			IDocument document= provider.getDocument(input);
-			if (document != null) {
-				if (column > -1) {
-					 //column marks the length..adjust to 0 index and to be within the element's source range
-					return document.getLineOffset(line - 1) + column - 1 - 2;
-				} 
-				return document.getLineOffset(line - 1);
-			}
-		} catch (BadLocationException e) {
-		} finally {
-			provider.disconnect(input);
-		}
-		return -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(IDE.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()) {
-							IDE.setDefaultEditor(fileResource, null);
-							try {
-								IDE.openEditor(page, fileResource, true);
-							} 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);
-	}
-
-	
-	public void setExternalInfo(int line, int column) {
-		fLine= line;
-		fColumn= column;
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntViewActionMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntViewActionMessages.java
deleted file mode 100644
index a762df8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.views.actions;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntViewActionMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/views/actions/AntViewActionMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntViewActionMessages.properties
deleted file mode 100644
index ce1d422..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntViewActionMessages.properties
+++ /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
-###############################################################################
-
-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
-AddBuildFilesAction.1=&Add Buildfiles
-AddBuildFilesAction.2=&Select buildfiles:
-AddBuildFilesAction.3=Adding Buildfile(s)...
-RemoveAllAction.Remove_All=Remove A&ll Buildfiles
-RemoveProjectAction.Remove=Remo&ve Buildfile
-RemoveProjectAction.Remove_2=Remove Selected Buildfile
-RunTargetAction.Run_1=R&un
-RunTargetAction.4=&Run Ant...
-RunTargetAction.Run_Default=Run the Default Target of the Selected Buildfile
-RunTargetAction.2=Launching Ant buildfile
-RunTargetAction.3=No target found
-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}
-RefreshBuildFilesAction.Refresh_Buildfiles_1=Re&fresh Buildfiles
-RefreshBuildFilesAction.Refreshing_buildfiles_3=Refreshing buildfiles...
-RefreshBuildFilesAction.Refreshing_{0}_4=Refreshing {0}
-FilterInternalTargetsAction.0=Hide Internal Targets
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/EditorImageDescriptor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/EditorImageDescriptor.java
deleted file mode 100644
index 959cc58..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/EditorImageDescriptor.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.internal.ui.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;
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	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);
-		} 
-		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;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		String programName = program.getName();
-		if (programName == null) {
-			return program.hashCode();
-		} 
-		return programName.hashCode();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/FilterInternalTargetsAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/FilterInternalTargetsAction.java
deleted file mode 100644
index a6b98a8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/FilterInternalTargetsAction.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.ant.internal.ui.views.actions;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.jface.action.Action;
-
-/** 
- * An action which toggles filtering of internal targets from the Ant view.
- */
-public class FilterInternalTargetsAction extends Action {
-
-	private AntView fView;
-	
-	public FilterInternalTargetsAction(AntView view) {
-		super(AntViewActionMessages.getString("FilterInternalTargetsAction.0")); //$NON-NLS-1$
-		fView = view;
-		setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_FILTER_INTERNAL_TARGETS));
-		setToolTipText(AntViewActionMessages.getString("FilterInternalTargetsAction.0")); //$NON-NLS-1$
-		setChecked(fView.isFilterInternalTargets());
-	}
-	
-	/**
-	 * Toggles the filtering of internal targets from the Ant view
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		fView.setFilterInternalTargets(isChecked());
-	}
-
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
deleted file mode 100644
index 94cdda2..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.ant.internal.ui.views.elements.TargetNode;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.PlatformUI;
-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_REFRESH)); //$NON-NLS-1$
-		setToolTipText(AntViewActionMessages.getString("RefreshBuildFilesAction.Refresh_Buildfiles_1")); //$NON-NLS-1$
-		this.view = view;
-		WorkbenchHelp.setHelp(this, IAntUIHelpContextIds.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;
-		}
-		
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					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/internal/ui/views/actions/RemoveAllAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RemoveAllAction.java
deleted file mode 100644
index b94a92b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.views.actions;
-
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.jface.action.Action;
-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, IAntUIHelpContextIds.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/internal/ui/views/actions/RemoveProjectAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RemoveProjectAction.java
deleted file mode 100644
index 147c293..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.views.actions;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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, IAntUIHelpContextIds.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/internal/ui/views/actions/RunTargetAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RunTargetAction.java
deleted file mode 100644
index f0685f6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RunTargetAction.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.views.actions;
-
-
-import java.util.Iterator;
-
-import org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.AntUtil;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.ant.internal.ui.views.elements.AntNode;
-import org.eclipse.ant.internal.ui.views.elements.ProjectNode;
-import org.eclipse.ant.internal.ui.views.elements.TargetNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.progress.UIJob;
-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;
-	private boolean showDialog;
-	
-	/**
-	 * 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.
-	 * @param showDialog whether or not to display the launch configuration dialog to edit the
-	 * associated launch configuration
-	 */
-	public RunTargetAction(AntView view, boolean showDialog) {
-		
-		if (showDialog) {
-			setText(AntViewActionMessages.getString("RunTargetAction.4")); //$NON-NLS-1$
-			setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_TAB_ANT_TARGETS));
-			WorkbenchHelp.setHelp(this, IAntUIHelpContextIds.EDIT_LAUNCH_CONFIGURATION_ACTION);
-		} else {
-			setText(AntViewActionMessages.getString("RunTargetAction.Run_1")); //$NON-NLS-1$
-			setImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_RUN));
-			WorkbenchHelp.setHelp(this, IAntUIHelpContextIds.RUN_TARGET_ACTION);
-		}
-		setToolTipText(AntViewActionMessages.getString("RunTargetAction.Run_Default")); //$NON-NLS-1$
-		this.view= view;
-		this.showDialog= showDialog;
-	}
-
-	/**
-	 * Executes the selected target or project in the Ant view.
-	 */
-	public void run() {
-		UIJob job= new UIJob(AntViewActionMessages.getString("RunTargetAction.2")) { //$NON-NLS-1$
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				TargetNode target= getSelectedTarget();
-				if (target == null) {
-					return new Status(IStatus.ERROR, AntUIPlugin.getUniqueIdentifier(), IStatus.ERROR, AntViewActionMessages.getString("RunTargetAction.3"), null); //$NON-NLS-1$
-				}
-				runTarget(target);
-				return Status.OK_STATUS;
-			}
-		};
-		job.schedule();
-	}
-	
-	/**
-	 * Executes the given target
-	 * @param target the target to execute
-	 */
-	public void runTarget(TargetNode target) {
-		IFile file= AntUtil.getFile(target.getProject().getBuildFileName());
-		if (file == null) {
-			AntUIPlugin.getStandardDisplay().beep();
-			return;
-		}
-		AntLaunchShortcut shortcut= new AntLaunchShortcut();
-		shortcut.setShowDialog(showDialog);
-		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;
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
deleted file mode 100644
index b980de5..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.views.actions;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import org.eclipse.ant.internal.ui.model.AntUIImages;
-import org.eclipse.ant.internal.ui.model.IAntUIConstants;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.views.AntView;
-import org.eclipse.ant.internal.ui.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.operation.IRunnableWithProgress;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-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, IAntUIHelpContextIds.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() != Window.CANCEL) {
-			final IFile[] files= dialog.getResults();
-			final boolean includeErrorNodes= dialog.getIncludeErrorResults();
-			final ProjectNode[] existingProjects= view.getProjects();
-			try {
-				PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) {
-						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/internal/ui/views/actions/SearchForBuildFilesDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
deleted file mode 100644
index 5fb60c9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
+++ /dev/null

@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.views.actions;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.model.AntUIPlugin;
-import org.eclipse.ant.internal.ui.model.IAntUIHelpContextIds;
-import org.eclipse.ant.internal.ui.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.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-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.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) {
-				setErrorMessage(error);
-				getOkButton().setEnabled(false);
-				return;
-			}
-		}
-		getOkButton().setEnabled(true);
-		setErrorMessage(""); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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() == Window.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) {
-			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, IAntUIHelpContextIds.SEARCH_FOR_BUILDFILES_DIALOG);
-	}
-
-}

diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntNode.java
deleted file mode 100644
index 2bf5003..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/views/elements/AntViewElementsMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntViewElementsMessages.java
deleted file mode 100644
index d01959e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.views.elements;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntViewElementsMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.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/internal/ui/views/elements/AntViewElementsMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/AntViewElementsMessages.properties
deleted file mode 100644
index fedbf89..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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/internal/ui/views/elements/ProjectNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/ProjectNode.java
deleted file mode 100644
index c3f1427..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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.internal.ui.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 isErrorNode 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/internal/ui/views/elements/RootNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/RootNode.java
deleted file mode 100644
index 3bf2e43..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/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.internal.ui.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/internal/ui/views/elements/TargetNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/TargetNode.java
deleted file mode 100644
index 078c234..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/elements/TargetNode.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.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 name, and description
-	 * 
-	 * @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 isErrorNode 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/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityException.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityException.java
deleted file mode 100644
index c7eb2c7..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/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.internal.ui.antsupport;
-
-
-/**
- * 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.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityManager.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityManager.java
deleted file mode 100644
index 522a391..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/AntSecurityManager.java
+++ /dev/null

@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.antsupport;
-
-
-import java.io.FileDescriptor;
-import java.net.InetAddress;
-import java.net.SocketPermission;
-import java.security.Permission;
-
-
-/**
- * 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 or mimics the default security manager behavior
- */
-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 super.checkTopLevelWindow(window);
-	}
-
-	/**
-	 * @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#getInCheck()
-	 * @deprecated
-	 */
-	public boolean getInCheck() {
-		if (securityManager != null) {
-			return securityManager.getInCheck();
-		}
-		return super.getInCheck();
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getSecurityContext()
-	 */
-	public Object getSecurityContext() {
-		if (securityManager != null) {
-			return securityManager.getSecurityContext();
-		}
-		return super.getSecurityContext();
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getThreadGroup()
-	 */
-	public ThreadGroup getThreadGroup() {
-		if (securityManager != null) {
-			securityManager.getThreadGroup();
-		}
-		return super.getThreadGroup();
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/DemuxInputStreamSetter.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/DemuxInputStreamSetter.java
deleted file mode 100644
index 7e9f0a4..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/DemuxInputStreamSetter.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.ui.antsupport;
-
-
-import org.apache.tools.ant.DemuxInputStream;
-import org.apache.tools.ant.Project;
-
-/**
- * This class exists so that the Ant integration has backwards compatibility
- * with Ant releases previous to 1.6. DemuxInputStream is a new class to Ant 1.6.
- */
-class DemuxInputStreamSetter {
-
-	protected void remapSystemIn(Project project) {
-		System.setIn(new DemuxInputStream(project));
-	}
-}

diff --git a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InputHandlerSetter.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InputHandlerSetter.java
deleted file mode 100644
index 6159934..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/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.ui.antsupport;
-
-
-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.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.java
deleted file mode 100644
index b4c5b1f..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/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.ui.antsupport;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class InternalAntMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.ui.antsupport.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.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.properties b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.properties
deleted file mode 100644
index c889ddf..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntMessages.properties
+++ /dev/null

@@ -1,79 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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.12=print information that might be helpful to
-InternalAntRunner.13=\t\t\t\t\t\t\tdiagnose or report problems.
-InternalAntRunner.19=load all properties from file with -D
-InternalAntRunner.20=\t\t\t\t\t\t\tproperties taking precedence
-InternalAntRunner.22=the class which will handle input requests
-InternalAntRunner.1=\t\t\t\t\'\'
-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.157=-lib not supported\nConfigure the Ant runtime classpath using either the\nglobal Ant runtime classpath or the Ant runtime classpath\n for this particular build
-InternalAntRunner.158=\t\t\tdo not allow interactive input
-InternalAntRunner.159=\t\texecute all targets that do not depend
-InternalAntRunner.160=\t\t\t\t\t\ton failed target(s)
-InternalAntRunner.161=Class {0} not found for task {1}
-InternalAntRunner.162=Class {0} not found for type {1}
-
-RemoteAntBuildLogger.BUILD_FAILED__{0}_1=BUILD FAILED: {0}
-RemoteAntBuildLogger.Total_time=Total time: 
-RemoteAntBuildLogger._minutes_2=\ minutes
-RemoteAntBuildLogger._minute_3=\ minute
-RemoteAntBuildLogger._seconds_4=\ seconds
-RemoteAntBuildLogger._second_5=\ second
-RemoteAntBuildLogger._milliseconds_6=\ milliseconds

diff --git a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntRunner.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntRunner.java
deleted file mode 100644
index 2095954..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/InternalAntRunner.java
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/MessageIds.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/MessageIds.java
deleted file mode 100644
index 8721b03..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/MessageIds.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package org.eclipse.ant.internal.ui.antsupport.logger;
-
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-public class MessageIds {
-
-	public static String PROCESS_ID=   "processID"; //$NON-NLS-1$
-	public static String BUILD_CANCELLED= "cancelled"; //$NON-NLS-1$
-	public static String TASK= "task"; //$NON-NLS-1$
-}

diff --git a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/RemoteAntBuildLogger.java b/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/RemoteAntBuildLogger.java
deleted file mode 100644
index 1e35d45..0000000
--- a/ant/org.eclipse.ant.ui/Remote Ant Support/org/eclipse/ant/internal/ui/antsupport/logger/RemoteAntBuildLogger.java
+++ /dev/null

@@ -1,317 +0,0 @@
-package org.eclipse.ant.internal.ui.antsupport.logger;
-
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.net.Socket;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.DefaultLogger;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.eclipse.ant.internal.ui.antsupport.AntSecurityException;
-import org.eclipse.ant.internal.ui.antsupport.InternalAntMessages;
-import org.eclipse.ant.internal.ui.antsupport.InternalAntRunner;
-
-/**
- * Parts adapted from org.eclipse.jdt.internal.junit.runner.RemoteTestRunner
- * A build logger that reports via a socket connection.
- * See MessageIds for more information about the protocol.
- */
-public class RemoteAntBuildLogger extends DefaultLogger {
-
-	/** Time of the start of the build */
-    private long startTime = System.currentTimeMillis();
-
-	/**
-	 * The client socket.
-	 */
-	private Socket fClientSocket;
-	/**
-	 * Print writer for sending messages
-	 */
-	private PrintWriter fWriter;
-	/**
-	 * Host to connect to, default is the localhost
-	 */
-	private String fHost= ""; //$NON-NLS-1$
-	/**
-	 * Port to connect to.
-	 */
-	private int fPort= -1;
-	/**
-	 * Is the debug mode enabled?
-	 */
-	private boolean fDebugMode= false;	
-	
-	private boolean fSentProcessId= false;
-	
-	private List fEventQueue;
-	
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.DefaultLogger#printMessage(java.lang.String, java.io.PrintStream, int)
-	 */
-	protected void printMessage(String message, PrintStream stream, int priority) {
-		marshalMessage(priority, message);
-	}
-	
-	/**
-	 * Connect to the remote Ant build listener.
-	 */
-	private void connect() {
-		if (fDebugMode) {
-			System.out.println("RemoteAntBuildLogger: trying to connect" + fHost + ":" + fPort); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		
-		for (int i= 1; i < 5; i++) {
-			try{
-				fClientSocket= new Socket(fHost, fPort);
-				fWriter= new PrintWriter(fClientSocket.getOutputStream(), true);
-				return;
-			} catch(IOException e){
-			}
-			try {
-				Thread.sleep(500);
-			} catch(InterruptedException e) {
-			}
-		}
-		shutDown();
-	}
-
-	/**
-	 * Shutdown the connection to the remote build listener.
-	 */
-	private void shutDown() {
-		if (fEventQueue != null) {
-			fEventQueue.clear();
-		}
-		if (fWriter != null) {
-			fWriter.close();
-			fWriter= null;
-		}
-		
-		try {
-			if (fClientSocket != null) {
-				fClientSocket.close();
-				fClientSocket= null;
-			}
-		} catch(IOException e) {
-		}
-	}
-
-	private void sendMessage(String msg) {
-		if (fWriter == null) {
-			return;
-		}
-		
-		fWriter.println(msg);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-		handleException(event);
-        printMessage( getTimeString(System.currentTimeMillis() - startTime), out, Project.MSG_INFO); 
-		shutDown();
-	}
-	
-	protected void handleException(BuildEvent event) {
-		Throwable exception = event.getException();
-		if (exception == null
-		|| exception instanceof AntSecurityException) {
-			return;
-		}
-		printMessage(MessageFormat.format(InternalAntMessages.getString("RemoteAntBuildLogger.BUILD_FAILED__{0}_1"), new String[] { exception.toString()}), //$NON-NLS-1$
-					out, Project.MSG_ERR);	
-	}
-	
-	private String getTimeString(long milliseconds) {
-		long seconds = milliseconds / 1000;
-		long minutes = seconds / 60;
-		seconds= seconds % 60;
-
-		StringBuffer result= new StringBuffer(InternalAntMessages.getString("RemoteAntBuildLogger.Total_time")); //$NON-NLS-1$
-		if (minutes > 0) {
-			result.append(minutes);
-			if (minutes > 1) {
-				result.append(InternalAntMessages.getString("RemoteAntBuildLogger._minutes_2")); //$NON-NLS-1$
-			} else {
-				result.append(InternalAntMessages.getString("RemoteAntBuildLogger._minute_3")); //$NON-NLS-1$
-			}
-		}
-		if (seconds > 0) {
-			if (minutes > 0) {
-				result.append(' ');
-			}
-			result.append(seconds);
-	
-			if (seconds > 1) {
-				result.append(InternalAntMessages.getString("RemoteAntBuildLogger._seconds_4")); //$NON-NLS-1$
-			} else {
-				result.append(InternalAntMessages.getString("RemoteAntBuildLogger._second_5")); //$NON-NLS-1$
-			} 
-		}
-		if (seconds == 0 && minutes == 0) {
-			result.append(milliseconds);
-			result.append(InternalAntMessages.getString("RemoteAntBuildLogger._milliseconds_6"));		 //$NON-NLS-1$
-		}
-		return result.toString();
-	}
-			
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-		if (!fSentProcessId) {
-			establishConnection(event);
-		}
-
-		if (Project.MSG_INFO <= msgOutputLevel) {
-			String msg= event.getTarget().getName() + ":"; //$NON-NLS-1$
-			printMessage(msg, out, Project.MSG_INFO);
-        }
-	}
-
-	private void establishConnection(BuildEvent event) {
-		String portProperty= event.getProject().getProperty("eclipse.connect.port"); //$NON-NLS-1$
-		if (portProperty != null) {
-			fPort= Integer.parseInt(portProperty);
-			connect();
-		}
-		
-		fSentProcessId= true;
-		StringBuffer message= new StringBuffer(MessageIds.PROCESS_ID);
-		message.append(event.getProject().getProperty("org.eclipse.ant.ui.ATTR_ANT_PROCESS_ID")); //$NON-NLS-1$
-		sendMessage(message.toString());
-		if (fEventQueue != null) {
-			for (Iterator iter = fEventQueue.iterator(); iter.hasNext();) {
-				processEvent((BuildEvent)iter.next());
-			}
-			fEventQueue= null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		if (event.getPriority() > msgOutputLevel && event.getPriority() != InternalAntRunner.MSG_PROJECT_HELP) {
-			return;
-		}
-		
-		if (!fSentProcessId) {
-			if (event.getPriority() == InternalAntRunner.MSG_PROJECT_HELP) {
-				if (Project.MSG_INFO > msgOutputLevel) {
-					return;
-				}
-				//no buildstarted or project started for project help option
-				establishConnection(event);
-				return;
-			}
-			if (fEventQueue == null){
-				fEventQueue= new ArrayList(10);
-			}
-			fEventQueue.add(event);
-			return;
-		}
-		
-		processEvent(event);
-	}
-
-	private void processEvent(BuildEvent event) {
-		if (event.getTask() != null & !emacsMode) {
-			try {
-				marshalTaskMessage(event);
-			} catch (IOException e) {
-			}
-		} else {
-			marshalMessage(event);
-		}
-	}
-	
-	private void marshalMessage(BuildEvent event) {
-		String eventMessage= event.getMessage().trim();
-		if (eventMessage.length() == 0) {
-			return;
-		}
-		marshalMessage(event.getPriority(), eventMessage);
-	}
-
-	private void marshalMessage(int priority, String message) {
-		try {
-			BufferedReader r = new BufferedReader(new StringReader(message));
-			String line = r.readLine();
-			StringBuffer messageLine;
-			while (line != null) {
-				messageLine= new StringBuffer();
-				messageLine.append(priority);
-				messageLine.append(',');
-				messageLine.append(line);
-				sendMessage(messageLine.toString());
-				line = r.readLine();
-			}
-		} catch (IOException e) {
-		}
-	}
-
-	private void marshalTaskMessage(BuildEvent event) throws IOException {
-		String eventMessage= event.getMessage().trim();
-		if (eventMessage.length() == 0) {
-			return;
-		}
-		BufferedReader r = new BufferedReader(new StringReader(eventMessage));
-		String line = r.readLine();
-		StringBuffer message;
-		String taskName= event.getTask().getTaskName();
-		StringBuffer labelBuff= new StringBuffer();
-		labelBuff.append('[');
-		labelBuff.append(taskName);
-		labelBuff.append("] "); //$NON-NLS-1$
-		String label= labelBuff.toString();
-		Location location= event.getTask().getLocation();
-		int priority= event.getPriority();
-		while (line != null) {
-			message= new StringBuffer(MessageIds.TASK);
-			message.append(priority);
-			message.append(',');
-			message.append(taskName);
-			message.append(',');
-			line= (label + line).trim();
-			message.append(line.length());
-			message.append(',');
-			message.append(line);
-			message.append(',');
-			message.append(location);
-			sendMessage(message.toString());
-			line = r.readLine();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-		establishConnection(event);
-		super.buildStarted(event);
-	}
-}
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/about.html b/ant/org.eclipse.ant.ui/about.html
deleted file mode 100644
index 5ad15d7..0000000
--- a/ant/org.eclipse.ant.ui/about.html
+++ /dev/null

@@ -1,50 +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>22nd March, 2004</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.6.1</b></p>
-<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Ant project.</p>
-
-<p>The following classes (&quot;Ant-Derived Work&quot;) are based on Ant code:</p>
-
-<ul>
-	<li>org.eclipse.ant.internal.ui.antsupport.InternalAntRunner contained in remoteAnt.jar and remoteAntsrc.zip</li>
-	<li>org.eclipse.ant.internal.ui.editor.utils.ProjectHelper contained in antui.jar and antuisrc.zip </li>
-</ul>
-
-<p>Your use of the Ant-Derived Work is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
-in the file <a href="asl-v20.txt">asl-v20.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
-
-<p>The names &quot;Ant&quot; and  &quot;Apache Software Foundation&quot; must not be used to endorse or promote products derived from this 
-software without prior written permission.  For written permission, please contact <a href="mailto:apache@apache.org">apache@apache.org</a>.</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/asl-v20.txt b/ant/org.eclipse.ant.ui/asl-v20.txt
deleted file mode 100644
index d645695..0000000
--- a/ant/org.eclipse.ant.ui/asl-v20.txt
+++ /dev/null

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) 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. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

diff --git a/ant/org.eclipse.ant.ui/build.properties b/ant/org.eclipse.ant.ui/build.properties
deleted file mode 100644
index 06e7416..0000000
--- a/ant/org.eclipse.ant.ui/build.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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/,\
-				templates/,\
-				Ant Editor/
-
-source.lib/antrunner.jar = Ant Runner Support/
-
-source.lib/remoteAnt.jar = Remote Ant Support/
-
-src.includes=about.html
-
-bin.includes = icons/,\
-		.options,\
-		plugin.properties,\
-		plugin.xml,\
-		about.html,\
-		templates/,\
-		*.jar,\
-		lib/*.jar
-				
-jars.compile.order=antui.jar,lib/antrunner.jar,lib/remoteAnt.jar
-jars.extra.classpath=../org.apache.ant/lib/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 d8bc98e..0000000
--- a/ant/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml
+++ /dev/null

@@ -1,67 +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" depends="clean, lib/antrunnerlib.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="version.suffix" value="_3.0.0"/>
-		<property name="ant_version.suffix" value="_1.6.1"/>
-		<property name="bootclasspath" value=""/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="win32.jar" value="${eclipse.home}/plugins/org.eclipse.swt.win32${version.suffix}/ws/win32/swt.jar"/>
-		<property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk${version.suffix}/ws/gtk/swt.jar"/>
-		<property name="motif.jar" value="${eclipse.home}/plugins/org.eclipse.swt.motif${version.suffix}/ws/motif/swt.jar"/>
-		<property name="osx.jar" value="${eclipse.home}/plugins/org.eclipse.swt.carbon${version.suffix}/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.core.runtime/bin;
-				 	${eclipse.home}/plugins/org.eclipse.core.runtime${version.suffix}/runtime.jar;
-			 		${basedir}/../org.eclipse.core.resources/bin;
-			 		${eclipse.home}/plugins/org.eclipse.core.resources${version.suffix}/resources.jar;
-			 		${basedir}/../org.apache.ant/lib/ant.jar;
-			 		${eclipse.home}/plugins/org.apache.ant${ant_version.suffix}/lib/ant.jar;
-			 		${basedir}/bin;
-					${basedir}/../org.eclipse.swt${version.suffix}/bin;
-			 		${swt.jar};
-					${basedir}/../org.eclipse.text/bin;
-					${eclipse.home}/plugins/org.eclipse.text${version.suffix}/text.jar;
-			 		${basedir}/../org.eclipse.ant.core/bin;
-			 		${eclipse.home}/plugins/org.eclipse.ant.core${version.suffix}/antsupport.jar;
-			 		${basedir}/../org.eclipse.debug.core/bin;
-			 		${eclipse.home}/plugins/org.eclipse.debug.core${version.suffix}/dtcore.jar;
-			 		${basedir}/../org.eclipse.debug.ui/bin;
-					${eclipse.home}/plugins/org.eclipse.debug.ui${version.suffix}/dtui.jar;
-			 		${basedir}/../org.eclipse.jface/bin;
-			 		${eclipse.home}/plugins/org.eclipse.jface${version.suffix}/jface.jar;">
-			<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>
-</project>

diff --git a/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml b/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml
deleted file mode 100644
index 3047a68..0000000
--- a/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml
+++ /dev/null

@@ -1,42 +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" depends="clean, lib/remoteAntLib.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="version.suffix" value="_3.0.0"/>
-		<property name="ant_version.suffix" value="_1.6.1"/>
-		<property name="bootclasspath" value=""/>
-		<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/remoteAntLib.jar" description= "Creates the remoteAnt.jar" depends="init">
-		<property name="destdir" value="${temp.folder}/lib/remoteAnt.jar.bin"/>
-		<delete dir="${temp.folder}/lib/remoteAnt.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/remoteAnt.jar.bin"/>
-		<!-- compile the source code -->
-		<javac target="1.1" destdir="${temp.folder}/lib/remoteAnt.jar.bin" failonerror="true" verbose="false" debug="on" includeJavaRuntime= "yes" includeAntRuntime="no"
-			 	bootclasspath="${bootclasspath}" 
-			 	classpath="${basedir}/../org.apache.ant/lib/ant.jar;
-			 	${eclipse.home}/plugins/org.apache.ant${ant_version.suffix}/lib/ant.jar;">
-			<src path="Remote Ant Support/"/>
-		</javac>
-		<!-- copy necessary resources -->
-		<copy todir="${temp.folder}/lib/remoteAnt.jar.bin">
-			<fileset dir="Remote Ant Support/" excludes="**/*.java"/>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar jarfile="${build.result.folder}/lib/remoteAnt.jar" basedir="${temp.folder}/lib/remoteAnt.jar.bin"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" description="Deletes previous build remnants" depends="init">
-		<delete file="${build.result.folder}/lib/remoteAnt.jar"/>
-		<delete dir="${temp.folder}"/>
-	</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 870cf16..0000000
--- a/ant/org.eclipse.ant.ui/buildfiles/exportplugin.xml
+++ /dev/null

@@ -1,44 +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_3.0.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 file="lib/remoteAnt.jar" todir="${dest}/lib"/>
-		<copy todir="${dest}/icons">
-			<fileset dir="icons" />
-		</copy>		
-	</target>
-	
-</project>

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/add_co.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/add_co.gif
deleted file mode 100644
index 0d92598..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/add_co.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/alpha_mode.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/alpha_mode.gif
deleted file mode 100644
index f1e318e..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/alpha_mode.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/ant_targets.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/ant_targets.gif
deleted file mode 100644
index b1cc2cf..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/ant_targets.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_imported_elements.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_imported_elements.gif
deleted file mode 100644
index aa71721..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_imported_elements.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_internal_targets.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_internal_targets.gif
deleted file mode 100644
index e7da81e..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_internal_targets.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_properties.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_properties.gif
deleted file mode 100644
index cd9ee84..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_properties.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_top_level.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_top_level.gif
deleted file mode 100644
index cc1ce15..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/filter_top_level.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/properties.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/properties.gif
deleted file mode 100644
index 0fbf9d0..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/properties.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 e4a1d38..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/remove_co.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/remove_co.gif
deleted file mode 100644
index 559e462..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/remove_co.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/removeall_co.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/removeall_co.gif
deleted file mode 100644
index ecd1be5..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/removeall_co.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 eb17c11..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/dlcl16/search.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/search.gif
deleted file mode 100644
index f246a63..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/search.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/synced.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/synced.gif
deleted file mode 100644
index c6d7da1..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/synced.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/synched.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/synched.gif
deleted file mode 100644
index c6d7da1..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/synched.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/add_co.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/add_co.gif
deleted file mode 100644
index aa2eb88..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/add_co.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/alpha_mode.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/alpha_mode.gif
deleted file mode 100644
index 907d34f..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/alpha_mode.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/ant_targets.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/ant_targets.gif
deleted file mode 100644
index cdb0402..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/ant_targets.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_imported_elements.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_imported_elements.gif
deleted file mode 100644
index 097f8a9..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_imported_elements.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_internal_targets.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_internal_targets.gif
deleted file mode 100644
index ee7387c..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_internal_targets.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_properties.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_properties.gif
deleted file mode 100644
index 3f46cf0..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_properties.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_top_level.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_top_level.gif
deleted file mode 100644
index f58e082..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/filter_top_level.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/properties.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/properties.gif
deleted file mode 100644
index 6223cfc..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/properties.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 3ca04d0..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/remove_co.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/remove_co.gif
deleted file mode 100644
index 2cd9c54..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/remove_co.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/removeall_co.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/removeall_co.gif
deleted file mode 100644
index 28a3785..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/removeall_co.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 b88fb72..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/elcl16/search.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/search.gif
deleted file mode 100644
index d540a01..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/search.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/synced.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/synced.gif
deleted file mode 100644
index cbd4bbb..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/synced.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/synched.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/synched.gif
deleted file mode 100644
index c2c72a7..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/synched.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/eview16/ant_view.gif b/ant/org.eclipse.ant.ui/icons/full/eview16/ant_view.gif
deleted file mode 100644
index 68d9564..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/eview16/ant_view.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 2799542..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 6df3469..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 0bc6068..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/anttaskdef_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/anttaskdef_obj.gif
deleted file mode 100644
index 807d1f4..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/anttaskdef_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/build_tab.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/build_tab.gif
deleted file mode 100644
index 4fcb208..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/build_tab.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 fbfc41a..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 fbcf2f8..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/import_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/import_obj.gif
deleted file mode 100644
index b0e9130..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/import_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 d7080f9..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/macrodef_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/macrodef_obj.gif
deleted file mode 100644
index 1753b96..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/macrodef_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 9b9f79a..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 6223cfc..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 f8277cf..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/targetinternal_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/targetinternal_obj.gif
deleted file mode 100644
index da1a166..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/targetinternal_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 146a903..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 b914ed7..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/template_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/template_obj.gif
deleted file mode 100644
index fdde5fb..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/template_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 76a58c5..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 119dccc..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/icons/full/ovr16/import_co.gif b/ant/org.eclipse.ant.ui/icons/full/ovr16/import_co.gif
deleted file mode 100644
index b0a24b2..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/ovr16/import_co.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/ovr16/warning_co.gif b/ant/org.eclipse.ant.ui/icons/full/ovr16/warning_co.gif
deleted file mode 100644
index ee2dac4..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/ovr16/warning_co.gif
+++ /dev/null
Binary files differ

diff --git a/ant/org.eclipse.ant.ui/icons/full/wizban/importbuildfile_wiz.gif b/ant/org.eclipse.ant.ui/icons/full/wizban/importbuildfile_wiz.gif
deleted file mode 100644
index 27f397c..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/wizban/importbuildfile_wiz.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 6b580c4..0000000
--- a/ant/org.eclipse.ant.ui/plugin.properties
+++ /dev/null

@@ -1,106 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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 = Ant Build
-AntLaunchShortcut.label = &Ant Build
-AntLaunchShortcutWithDialog.label = &Ant Build...
-ContextualAntLaunchShortcut.label = Ant Build
-ContextualAntLaunchShortcutWithDialog.label = Ant Build...
-antLaunchConfigurationTabGroup.description=Create a configuration that will run an Ant buildfile.
-antBuilderLaunchConfigurationTabGroup.description=Create a configuration that will run an Ant buildfile during a 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
-PreferencePage.antCodeFormatterPreferences = Formatter
-PreferencePage.antTemplatePreferences = Templates
-
-antPresentation.label=Ant
-antConsolePresentation.label=Console
-antEditorPresentation.label=Editor
-
-errorMessageColor.label=Error message color
-errorMessageColor.description=The color used in the console for Ant error messages resulting from an Ant build.
-
-warningMessageColor.label=Warning message color
-warningMessageColor.description=The color used in the console for Ant warning messages resulting from an Ant build.
-
-informationMessageColor.label=Information message color
-informationMessageColor.description=The color used in the console for Ant information messages resulting from an Ant build.
-
-verboseMessageColor.label=Verbose message color
-verboseMessageColor.description=The color used in the console for Ant verbose messages resulting from an Ant build.
-		
-debugMessageColor.label=Debug message
-debugMessageColor.description=The color used in the console for Ant debug messages resulting from an Ant build.
-		
-lineNumberColor.label=Line number foreground color
-lineNumberColor.description=The color used in the Ant editor for the line numbers.
-
-currentLineHighlightColor.label=Current line highlight color
-currentLineHighlightColor.description=The color used in the Ant editor to highlight the current line.
-
-printMarginColor.label=Print Margin color
-printMarginColor.description=The color used in the Ant editor for the print margin.
-		
-codeAssistBackgroundColor.label=Code assist proposals background color
-codeAssistBackgroundColor.description=The color used for the background of the Ant editor code assist proposals.
-		
-codeAssistForegroundColor.label=Code assist proposals foreground color
-codeAssistForegroundColor.description=The color used for the foreground of the Ant editor code assist proposals.
-		
-textColor.label=Text color
-textColor.description=The color used in the Ant editor for simple text.
-
-processingInstructionsColor.label=Processing instructions color
-processingInstructionsColor.description=The color used in the Ant editor for XML processing instructions.
-		
-constantStringsColor.label=Constant strings color
-constantStringsColor.description=The color used in the Ant editor for constant strings.
-
-tagsColor.label=Tags color
-tagsColor.description=The color used in the Ant editor for tags.
-
-commentsColor.label=Comments color
-commentsColor.description=The color used in the Ant editor for comments.
-
-templatesName = Ant Templates Definitions
-
-buildFile.contextType.name= Ant
-task.contextType.name= Ant Task
-
-antDocumentFactory.name= Ant Document Factory
-antDocumentSetupParticipant.name= Ant Document Setup Participant
-
-ant.resolvers.src= Source Fileset
-ant.resolvers.src.description= A source fileset
-ant.resolvers.dst= Destination Fileset
-ant.resolvers.dst.description= An output fileset
-
-Ant.marker.label = Ant Buildfile Problem
-
-antImportWizard.name= Existing Ant Buildfile
-antImportWizard.description= Creates an Eclipse project from an exisiting Ant buildfile in the filesystem.
\ 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 db4f116..0000000
--- a/ant/org.eclipse.ant.ui/plugin.xml
+++ /dev/null

@@ -1,579 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ant.ui"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.internal.ui.model.AntUIPlugin">
-
-   <runtime>
-      <library name="antui.jar">
-         <export name="*"/>
-         <packages prefixes="org.eclipse.ant.internal.ui"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.apache.ant"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jdt.core"/>
-   </requires>
-   
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            name="%AntEditor.name"
-            icon="icons/full/obj16/ant_buildfile.gif"
-            filenames="build.xml,*.macrodef,*.ent"
-            class="org.eclipse.ant.internal.ui.editor.AntEditor"
-            contributorClass="org.eclipse.ant.internal.ui.editor.AntEditorActionContributor"
-            id="org.eclipse.ant.ui.internal.editor.AntEditor">
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%AntBuild"
-            delegate="org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchDelegate"
-            category="org.eclipse.ui.externaltools"
-            modes="run"
-            id="org.eclipse.ant.AntLaunchConfigurationType">
-      </launchConfigurationType>
-      <launchConfigurationType
-            name="%AntBuild"
-            delegate="org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchDelegate"
-            category="org.eclipse.ui.externaltools.builder"
-            modes="run"
-            id="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.launching.classpathProviders">
-      <classpathProvider
-            class="org.eclipse.ant.internal.ui.launchConfigurations.AntClasspathProvider"
-            id="org.eclipse.ant.ui.AntClasspathProvider">
-      </classpathProvider>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.launching.runtimeClasspathEntries">
-      <runtimeClasspathEntry
-            class="org.eclipse.ant.internal.ui.launchConfigurations.AntHomeClasspathEntry"
-            id="org.eclipse.ant.ui.classpathentry.antHome">
-      </runtimeClasspathEntry>
-      <runtimeClasspathEntry
-            class="org.eclipse.ant.internal.ui.launchConfigurations.ContributedClasspathEntriesEntry"
-            id="org.eclipse.ant.ui.classpathentry.extraClasspathEntries">
-      </runtimeClasspathEntry>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%CategoryView.antViews"
-            id="org.eclipse.ant.ui.views">
-      </category>
-      <view
-            name="%View.antView"
-            icon="icons/full/eview16/ant_view.gif"
-            category="org.eclipse.ant.ui.views"
-            fastViewWidthRatio="0.40"
-            class="org.eclipse.ant.internal.ui.views.AntView"
-            id="org.eclipse.ant.ui.views.AntView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
-         <view
-               relative="org.eclipse.ui.views.ContentOutline"
-               visible="false"
-               id="org.eclipse.ant.ui.views.AntView"
-               relationship="stack">
-         </view>
-         <viewShortcut
-               id="org.eclipse.ant.ui.views.AntView">
-         </viewShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-         <view
-               relative="org.eclipse.ui.views.ContentOutline"
-               visible="false"
-               id="org.eclipse.ant.ui.views.AntView"
-               relationship="stack">
-         </view>
-         <viewShortcut
-               id="org.eclipse.ant.ui.views.AntView">
-         </viewShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <view
-               relative="org.eclipse.ui.views.ContentOutline"
-               visible="false"
-               id="org.eclipse.ant.ui.views.AntView"
-               relationship="stack">
-         </view>
-         <viewShortcut
-               id="org.eclipse.ant.ui.views.AntView">
-         </viewShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaHierarchyPerspective">
-         <view
-               relative="org.eclipse.ui.views.ContentOutline"
-               visible="false"
-               id="org.eclipse.ant.ui.views.AntView"
-               relationship="stack">
-         </view>
-         <viewShortcut
-               id="org.eclipse.ant.ui.views.AntView">
-         </viewShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.debug.ui.DebugPerspective">
-         <view
-               relative="org.eclipse.ui.views.ContentOutline"
-               visible="false"
-               id="org.eclipse.ant.ui.views.AntView"
-               relationship="stack">
-         </view>
-         <viewShortcut
-               id="org.eclipse.ant.ui.views.AntView">
-         </viewShortcut>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PreferencePage.antPreferences"
-            class="org.eclipse.ant.internal.ui.preferences.AntPreferencePage"
-            id="org.eclipse.ant.ui.AntPreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.antRuntimePreferences"
-            category="org.eclipse.ant.ui.AntPreferencePage"
-            class="org.eclipse.ant.internal.ui.preferences.AntRuntimePreferencePage"
-            id="org.eclipse.ant.ui.AntRuntimePreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.antEditorPreferences"
-            category="org.eclipse.ant.ui.AntPreferencePage"
-            class="org.eclipse.ant.internal.ui.preferences.AntEditorPreferencePage"
-            id="org.eclipse.ant.ui.AntEditorPreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.antCodeFormatterPreferences"
-            category="org.eclipse.ant.ui.AntEditorPreferencePage"
-            class="org.eclipse.ant.internal.ui.preferences.AntCodeFormatterPreferencePage"
-            id="org.eclipse.ant.ui.AntCodeFormatterPreferencePage">
-      </page>
-      <page
-            name="%PreferencePage.antTemplatePreferences"
-            category="org.eclipse.ant.ui.AntEditorPreferencePage"
-            class="org.eclipse.ant.internal.ui.editor.templates.AntTemplatePreferencePage"
-            id="org.eclipse.ant.ui.TemplatesPreferencePage">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            targetID="org.eclipse.ant.internal.ui.editor.AntEditor.RulerContext"
-            id="org.eclipse.ant.internal.ui.editor.AntEditor.RulerContext">
-         <action
-               label="%AddTask.label"
-               helpContextId="org.eclipse.ui.AddTask_action_context"
-               class="org.eclipse.ui.texteditor.TaskRulerAction"
-               tooltip="%AddTask.tooltip"
-               menubarPath="additions"
-               id="org.eclipse.ui.texteditor.TaskRulerAction">
-         </action>
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               tooltip="%AddBookmark.tooltip"
-               menubarPath="additions"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-         </action>
-      </viewerContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ant.core.extraClasspathEntries">
-      <extraClasspathEntry
-            library="lib/antrunner.jar">
-      </extraClasspathEntry>
-      <extraClasspathEntry
-            library="lib/remoteAnt.jar"
-            eclipseRuntime="false">
-      </extraClasspathEntry>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.consoleColorProviders">
-      <consoleColorProvider
-            class="org.eclipse.ant.internal.ui.console.AntConsoleColorProvider"
-            processType="org.eclipse.ant.ui.antProcess"
-            id="org.eclipse.ant.consoleColorProvider">
-      </consoleColorProvider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.externaltools.configurationDuplicationMaps">
-      <configurationMap
-            builderType="org.eclipse.ant.AntBuilderLaunchConfigurationType"
-            sourceType="org.eclipse.ant.AntLaunchConfigurationType">
-      </configurationMap>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.ant.AntLaunchConfigurationType"
-            helpContextId="org.eclipse.ui.externaltools.launchConfigHelpContext.ant"
-            description="%antLaunchConfigurationTabGroup.description"
-            class="org.eclipse.ant.internal.ui.launchConfigurations.AntTabGroup"
-            id="org.eclipse.ant.ui.launchConfigurationTabGroup.ant">
-      </launchConfigurationTabGroup>
-      <launchConfigurationTabGroup
-            type="org.eclipse.ant.AntBuilderLaunchConfigurationType"
-            helpContextId="org.eclipse.ui.externaltools.launchConfigHelpContext.ant_builder"
-            description="%antBuilderLaunchConfigurationTabGroup.description"
-            class="org.eclipse.ant.internal.ui.launchConfigurations.AntBuilderTabGroup"
-            id="org.eclipse.ant.ui.launchConfigurationTabGroup.ant.builder">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/full/obj16/ant.gif"
-            configTypeID="org.eclipse.ant.AntLaunchConfigurationType"
-            id="org.eclipse.ant.launchConfigurationTypeImage.ant">
-      </launchConfigurationTypeImage>
-      <launchConfigurationTypeImage
-            icon="icons/full/obj16/ant.gif"
-            configTypeID="org.eclipse.ant.AntBuilderLaunchConfigurationType"
-            id="org.eclipse.ant.launchConfigurationTypeImage.ant.builder">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension point="org.eclipse.core.runtime.adapters">
-      <factory 
-            class="" 
-            adaptableType="org.eclipse.ant.internal.ui.editor.model.AntTargetNode">
-            <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
-        </factory>
-      <factory 
-            class="" 
-            adaptableType="org.eclipse.ant.internal.ui.editor.model.AntProjectNode">
-            <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
-        </factory>
-   </extension>   
-   <extension
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            label="%AntLaunchShortcut.label"
-            icon="icons/full/obj16/ant.gif"
-            category="org.eclipse.ui.externaltools"
-            helpContextId="org.eclipse.ui.externaltools.launchShortcutHelpContext.antShortcut"
-            class="org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut"
-            modes="run"
-            id="org.eclipse.ant.ui.antShortcut">
-        <contextualLaunch>
-           <enablement>
-             <with variable="selection">
-               <count value="1"/>
-               <iterate>
-                 <or>
-                   <instanceof value="org.eclipse.ant.internal.ui.editor.model.AntElementNode"/>
-                   <and>
-                     <test property="org.eclipse.debug.ui.matchesPattern" value="*.xml"/>
-                     <test property="org.eclipse.debug.ui.matchesContentType" value="org.eclipse.ant.core.antBuildFile"/>
-                   </and>
-                 </or>
-               </iterate>
-             </with>
-           </enablement>
-           <contextLabel
-         	  mode="run"
-         	  label="%ContextualAntLaunchShortcut.label"/>
-  		 </contextualLaunch>
-      </shortcut>
-      <shortcut
-            label="%AntLaunchShortcutWithDialog.label"
-            icon="icons/full/obj16/ant.gif"
-            category="org.eclipse.ui.externaltools"
-            helpContextId="org.eclipse.ui.externaltools.launchShortcutHelpContext.antShortcutWithDialog"
-            class="org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcutWithDialog"
-            modes="run"
-            id="org.eclipse.ant.ui.antShortcutWithDialog">
-        <contextualLaunch>
-           <enablement>
-             <with variable="selection">
-               <count value="1"/>
-               <iterate>
-                 <or>
-                   <instanceof value="org.eclipse.ant.internal.ui.editor.model.AntElementNode"/>
-                   <and>
-                     <test property="org.eclipse.debug.ui.matchesPattern" value="*.xml"/>
-                     <test property="org.eclipse.debug.ui.matchesContentType" value="org.eclipse.ant.core.antBuildFile"/>
-                   </and>
-                 </or>
-               </iterate>
-             </with>
-           </enablement>
-           <contextLabel
-         	  mode="run"
-         	  label="%ContextualAntLaunchShortcutWithDialog.label"/>
-  		 </contextualLaunch>
-      </shortcut>
-   </extension>
-   <extension point="org.eclipse.core.runtime.adapters">
-         <factory 
-            class=""
-            adaptableType="org.eclipse.core.resources.IFile">
-            <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
-         </factory>
-    </extension>
-<!-- Console Extensions -->
-   <extension
-         point="org.eclipse.debug.ui.consoleLineTrackers">
-      <consoleLineTracker
-            class="org.eclipse.ant.internal.ui.console.JavacLineTracker"
-            processType="org.eclipse.ant.ui.antProcess"
-            id="org.eclipse.ant.ui.javacLineTracker">
-      </consoleLineTracker>
-      <consoleLineTracker
-            class="org.eclipse.ant.internal.ui.console.TaskLineTracker"
-            processType="org.eclipse.ant.ui.antProcess"
-            id="org.eclipse.ant.ui.taskLineTracker">
-      </consoleLineTracker>
-      <consoleLineTracker
-            class="org.eclipse.ant.internal.ui.console.BuildFailedTracker"
-            processType="org.eclipse.ant.ui.antProcess"
-            id="org.eclipse.ant.ui.buildFailedTracker">
-      </consoleLineTracker>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.statusHandlers">
-      <statusHandler
-            code="1000"
-            plugin="org.eclipse.ant.ui"
-            class="org.eclipse.ant.internal.ui.launchConfigurations.RunAntStatusHandler"
-            id="org.eclipse.ant.ui.statusHandler.runAntInit">
-      </statusHandler>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.processFactories">
-      <processFactory
-            class="org.eclipse.ant.internal.ui.launchConfigurations.RemoteAntProcessFactory"
-            id="org.eclipse.ant.ui.remoteAntProcessFactory">
-      </processFactory>
-   </extension>
-   
-    <extension
-         point="org.eclipse.ui.themes">
-        <themeElementCategory label="%antPresentation.label" id="org.eclipse.ant.ui.presentation"/>
-		<themeElementCategory label="%antConsolePresentation.label" id="org.eclipse.ant.ui.console.presentation" parentId= "org.eclipse.ant.ui.presentation"/>
-		<themeElementCategory label="%antEditorPresentation.label" id="org.eclipse.ant.ui.editor.presentation" parentId= "org.eclipse.ant.ui.presentation"/>
-		 <!-- Ant Console colors -->
-		 <!-- Ant error messages should default to the console std err -->
-		<colorDefinition
-			label="%errorMessageColor.label"
-            categoryId= "org.eclipse.ant.ui.console.presentation"
-            defaultsTo= "org.eclipse.debug.ui.errorColor"
-            id="org.eclipse.ant.ui.errorColor">
-            <description>%errorMessageColor.description</description> 
-		</colorDefinition>
-		<colorDefinition
-            label="%warningMessageColor.label"
-            value="255,100,0"
-			categoryId= "org.eclipse.ant.ui.console.presentation"
-            id="org.eclipse.ant.ui.warningColor">
-            <description>%warningMessageColor.description</description> 
-		</colorDefinition>
-		<colorDefinition
-            label="%informationMessageColor.label"
-            defaultsTo= "org.eclipse.debug.ui.outColor"
-			categoryId= "org.eclipse.ant.ui.console.presentation"
-            id="org.eclipse.ant.ui.informationColor">
-            <description>%informationMessageColor.description</description>             
-		</colorDefinition>
-		<colorDefinition
-            label="%verboseMessageColor.label"
-            value="0,200,125"
-            categoryId= "org.eclipse.ant.ui.console.presentation"
-            id="org.eclipse.ant.ui.verboseColor">
-            <description>%verboseMessageColor.description</description>             
-		</colorDefinition>
-		<colorDefinition
-            label="%debugMessageColor.label"
-            value="COLOR_BLACK"
-            categoryId= "org.eclipse.ant.ui.console.presentation"
-            id="org.eclipse.ant.ui.debugColor">
-            <description>%debugMessageColor.description</description>             
-		</colorDefinition>
-		
-		<!--Ant Editor colors-->
-		 <!-- The first five should default to the text editor colors once defined -->
-		<colorDefinition
-			label="%lineNumberColor.label"
-            value="COLOR_BLACK"
-            categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.lineNumberForegroundColor">
-            <description>%lineNumberColor.description</description> 
-		</colorDefinition>
-		<colorDefinition
-            label="%currentLineHighlightColor.label"
-            value="225,235,224"
-			categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.currentLineHightlightColor">
-            <description>%currentLineHighlightColor.description</description> 
-		</colorDefinition>
-		<colorDefinition
-            label="%printMarginColor.label"
-            value="176,180,185"
-			categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.printMarginColor">
-            <description>%printMarginColor.description</description>             
-		</colorDefinition>
-		<colorDefinition
-            label="%codeAssistBackgroundColor.label"
-            value="254,241,233"
-			categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.codeAssistProposalsBackgroundColor">
-            <description>%codeAssistBackgroundColor.description</description>             
-		</colorDefinition>
-		<colorDefinition
-            label="%codeAssistForegroundColor.label"
-            value="COLOR_BLACK"
-			categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.codeAssistProposalsForegroundColor">
-            <description>%codeAssistForegroundColor.description</description>             
-		</colorDefinition>
-		
-		<colorDefinition
-            label="%textColor.label"
-            value="COLOR_BLACK"
-            categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.textColor">
-            <description>%textColor.description</description>
-		</colorDefinition>
-		<colorDefinition
-            label="%processingInstructionsColor.label"
-            value="128,128,128"
-            categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.processingInstructionsColor">
-            <description>%processingInstructionsColor.description</description>             
-		</colorDefinition>
-		<colorDefinition
-            label="%constantStringsColor.label"
-            value="0,128,0"
-            categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.constantStringsColor">
-            <description>%constantStringsColor.description</description>
-		</colorDefinition>
-		<colorDefinition
-            label="%tagsColor.label"
-            value="0,0,128"
-            categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.tagsColor">
-            <description>%tagsColor.description</description>             
-		</colorDefinition>
-		<colorDefinition
-            label="%commentsColor.label"
-            value="128,0,0"
-            categoryId= "org.eclipse.ant.ui.editor.presentation"
-            id="org.eclipse.ant.ui.commentsColor">
-            <description>%commentsColor.description</description>             
-		</colorDefinition>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.editors.templates">
-      <contextType
-            name="%buildFile.contextType.name"
-            class="org.eclipse.ant.internal.ui.editor.templates.BuildFileContextType"
-            id="org.eclipse.ant.ui.templateContextType.buildFile">
-      </contextType>
-       <contextType
-            name="%task.contextType.name"
-            class="org.eclipse.ant.internal.ui.editor.templates.TaskContextType"
-            id="org.eclipse.ant.ui.templateContextType.task">
-      </contextType>
-      <resolver
-            name="%ant.resolvers.src"
-            type="src"
-            icon="templates/resolver.gif"
-            description="%ant.resolvers.src.description"
-            contextTypeId="org.eclipse.ant.ui.templateContextType.XML"
-            class="org.eclipse.ant.internal.ui.editor.templates.AntVariableResolver">
-      </resolver>
-      <resolver
-            name="%ant.resolvers.dst"
-            type="dst"
-            icon="templates/resolver.gif"
-            description="%ant.resolvers.dst.description"
-            contextTypeId="org.eclipse.ant.ui.templateContextType.XML"
-            class="org.eclipse.ant.internal.ui.editor.templates.AntVariableResolver">
-      </resolver>
-      <include
-      		file="templates/ant.xml"
-      		translations="templates/ant.properties">
-      </include>
-   </extension>
-    
-	<extension id="buildFileProblem" name="%Ant.marker.label" point="org.eclipse.core.resources.markers">
-  		<super type="org.eclipse.core.resources.problemmarker" /> 
-  			<persistent value="true" /> 
-	</extension>
-	
-	<extension 
-       point="org.eclipse.ui.importWizards"> 
-      <wizard 
-         id="org.eclipse.ant.internal.ui.import" 
-         name="%antImportWizard.name" 
-         class="org.eclipse.ant.internal.ui.datatransfer.AntBuildfileImportWizard" 
-         icon="icons/full/obj16/ant.gif"> 
-         <description> 
-            %antImportWizard.description
-         </description> 
-      </wizard> 
-   </extension>
-   
-   <extension
-         id="org.eclipse.ant.ui.AntDocumentFactory"
-         name="%antDocumentFactory.name"
-         point="org.eclipse.core.filebuffers.documentCreation">
-      <factory
-            extensions="xml, ent, macrodef"
-            contentTypeId="org.eclipse.ant.core.antBuildFile"
-            class="org.eclipse.ant.internal.ui.editor.text.AntDocumentFactory">
-      </factory>
-   </extension>
-   
-   <extension
-         id="org.eclipse.ant.ui.AntDocumentSetupParticipant"
-         name="%antDocumentSetupParticipant.name"
-         point="org.eclipse.core.filebuffers.documentSetup">
-      <participant
-            extensions="xml, ent, macrodef"
-            contentTypeId="org.eclipse.ant.core.antBuildFile"
-            class="org.eclipse.ant.internal.ui.editor.text.AntDocumentSetupParticipant">
-      </participant>
-   </extension>
-    
-</plugin>
\ No newline at end of file

diff --git a/ant/org.eclipse.ant.ui/templates/ant.properties b/ant/org.eclipse.ant.ui/templates/ant.properties
deleted file mode 100644
index f6c87df..0000000
--- a/ant/org.eclipse.ant.ui/templates/ant.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-filesetTemplate1.description= Ant fileset type with include clause
-targetTemplate1.description= Ant target with name
-propertyTemplate1.description= Ant property with name and value
-javacTemplate1.description= Add a javac task
-buildFileTemplate1.name= Buildfile template
-buildFileTemplate1.description= Template for a buildfile that contains a single target

diff --git a/ant/org.eclipse.ant.ui/templates/ant.xml b/ant/org.eclipse.ant.ui/templates/ant.xml
deleted file mode 100644
index a7fc780..0000000
--- a/ant/org.eclipse.ant.ui/templates/ant.xml
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ 
--->
-
-<templates>
-
-<template 
-	context="org.eclipse.ant.ui.templateContextType.task" 
-	description="%javacTemplate1.description" 
-	id="org.eclipse.ant.ui.templates.javac1" 
-	name="javac">&lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${dst}&quot;
-         classpath=&quot;${jarfile}&quot;
-         debug=&quot;${on}&quot;
-	/&gt;${cursor}</template>
-
-<template 
-	context="org.eclipse.ant.ui.templateContextType.task" 
-	description="%filesetTemplate1.description" 
-	id="org.eclipse.ant.ui.templates.fileset1" 
-	name="fileset">&lt;fileset dir=&quot;${dir}&quot;&gt;&lt;include name=&quot;${pattern}&quot; /&gt;&lt;/fileset&gt;
-</template>
-
-<template 
-	context="org.eclipse.ant.ui.templateContextType.task" 
-	description="%targetTemplate1.description" 
-	id="org.eclipse.ant.ui.templates.target1" 
-	name="target">&lt;target name=&quot;${targetName}&quot;&gt;
-		${cursor}
-	&lt;/target&gt;
-</template>
-
-<template 
-	context="org.eclipse.ant.ui.templateContextType.task" 
-	description="%propertyTemplate1.description" 
-	id="org.eclipse.ant.ui.templates.property1" 
-	name="property">&lt;property name=&quot;${name}&quot; value=&quot;${value}&quot;/&gt;
-</template>
-
-<template 
-	context="org.eclipse.ant.ui.templateContextType.buildFile" 
-	description="%buildFileTemplate1.description" 
-	id="org.eclipse.ant.ui.templates.buildFile1" 
-	name="%buildFileTemplate1.name">&lt;project default=&quot;${defaultTargetName}&quot;&gt;
-	&lt;target name=&quot;${defaultTargetName}&quot;&gt;
-	${cursor}
-	&lt;/target&gt;
-&lt;/project&gt;
-</template>
-
-</templates>

diff --git a/ant/org.eclipse.ant.ui/templates/resolver.gif b/ant/org.eclipse.ant.ui/templates/resolver.gif
deleted file mode 100644
index 4a26673..0000000
--- a/ant/org.eclipse.ant.ui/templates/resolver.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/.classpath b/platform/org.eclipse.platform/.classpath
deleted file mode 100644
index 618ac00..0000000
--- a/platform/org.eclipse.platform/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry output="bin-intro" kind="src" path="src-intro"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 2f6d5a5..0000000
--- a/platform/org.eclipse.platform/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-bin-intro

diff --git a/platform/org.eclipse.platform/.project b/platform/org.eclipse.platform/.project
deleted file mode 100644
index e28fafc..0000000
--- a/platform/org.eclipse.platform/.project
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.platform</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.intro</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/platform/org.eclipse.platform/SplashFinal_500x330.psd b/platform/org.eclipse.platform/SplashFinal_500x330.psd
deleted file mode 100644
index 14787af..0000000
--- a/platform/org.eclipse.platform/SplashFinal_500x330.psd
+++ /dev/null
Binary files differ

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 f0baa6a..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 "windowImages" contains paths to window images (16x16 and 32x32)
-windowImages=eclipse.gif,eclipse32.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 90e6e1c..0000000
--- a/platform/org.eclipse.platform/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-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,\
-               css/,\
-               cheatsheets/,\
-               welcome.xml,\
-               introContent.xml,\
-               platform.jar
-src.includes = about.html,\
-               launchersrc.zip,\
-               platformsrc.zip
-source.startup.jar = src/
-source.platform.jar = src-intro/

diff --git a/platform/org.eclipse.platform/cheatsheets/CVS_1.xml b/platform/org.eclipse.platform/cheatsheets/CVS_1.xml
deleted file mode 100644
index 3b3d9ef..0000000
--- a/platform/org.eclipse.platform/cheatsheets/CVS_1.xml
+++ /dev/null

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<cheatsheet title="CVS - Merging from one branch to another">
-
-	<intro 
-		href="/org.eclipse.ui.cheatsheets.doc/tasks/tcheatst.htm">
-		<description>
-This cheat sheet will automatically launch wizards, perform actions, and guide you through the individual steps to merge changes from a CVS branch into another branch, or into HEAD. To learn more about using cheat sheets or to see a list of available cheat sheets click help (?).To start working on this cheat sheet, click the "Click to begin" button below.
-		</description>
-	</intro>
-
-	<item
-		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
-		title="Determine Branch and Version Information">
-		<description>
-In this step you must determine the name of the branch or version that contains your changes and the version from which the branch was created. This is a manual task, you will need to perform the work and click the "Click to complete" button to move to the next step. 
-		</description>
-	</item>
-
-	<item
-		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
-		title="Load the Destination into your Workspace">
-		<description>
-Select the project and choose Replace With &gt; Another Branch or Version from the context menu. Then select the branch to replace with. In this step you must ensure that the destination is loaded into your workspace. This is a manual task, you will need to perform the work and click the "Click to complete" button to move to the next step.
-		</description>
-	</item>
-
-	<item
-		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm" 
-		title="Merge Details" 
-		skip="true">
-		<action
-			pluginId=""
-			class=""/>
-		<description>
-Select the project, choose Team &gt; Merge and complete the wizard as required. This step specifies the details of the merge. The "Merge" wizard is automatically displayed when you click the "Click to perform button".
-		</description>
-	</item>
-
-	<item
-		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
-		title="Work with the Merge Editor">
-		<description>
-In the Merge editor manually merge the changes. This step loads the required changes into the workspace. This is a manual task, you will need to perform the work and click the "Click to complete" button to move to the next step.
-		</description>
-	</item>
-
-	<item
-		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
-		title="Commit your changes">
-		<description>
-Select Team &gt; Synchronize with Repository and then commit all the changes to the repository. This step finalizes the transfer of the changes from the workspace to the CVS repository. This is a manual task, you will need to perform the work and click the "Click to complete" button to move to the next step.
-		</description>
-	</item>
-
-</cheatsheet>
\ No newline at end of file

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/background.jpg b/platform/org.eclipse.platform/css/graphics/contentpage/background.jpg
deleted file mode 100644
index ce1cada..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/background.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/backgroundcurve.gif b/platform/org.eclipse.platform/css/graphics/contentpage/backgroundcurve.gif
deleted file mode 100644
index 8c5ec1d..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/backgroundcurve.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/content_background.jpg b/platform/org.eclipse.platform/css/graphics/contentpage/content_background.jpg
deleted file mode 100644
index ce1cada..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/content_background.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/overview_wtr.jpg b/platform/org.eclipse.platform/css/graphics/contentpage/overview_wtr.jpg
deleted file mode 100644
index 733e48c..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/overview_wtr.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/samples_wtr.jpg b/platform/org.eclipse.platform/css/graphics/contentpage/samples_wtr.jpg
deleted file mode 100644
index 78e703a..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/samples_wtr.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/section1.gif b/platform/org.eclipse.platform/css/graphics/contentpage/section1.gif
deleted file mode 100644
index 6147513..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/section1.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/section2.gif b/platform/org.eclipse.platform/css/graphics/contentpage/section2.gif
deleted file mode 100644
index 0ee148b..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/section2.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/section3.gif b/platform/org.eclipse.platform/css/graphics/contentpage/section3.gif
deleted file mode 100644
index b5d24e6..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/section3.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/section4.gif b/platform/org.eclipse.platform/css/graphics/contentpage/section4.gif
deleted file mode 100644
index 258d4a8..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/section4.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/tutorials_wtr.jpg b/platform/org.eclipse.platform/css/graphics/contentpage/tutorials_wtr.jpg
deleted file mode 100644
index e74c7c0..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/tutorials_wtr.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/whatsnew_wtr.jpg b/platform/org.eclipse.platform/css/graphics/contentpage/whatsnew_wtr.jpg
deleted file mode 100644
index c2a42da..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/whatsnew_wtr.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/contentpage/wordmark.gif b/platform/org.eclipse.platform/css/graphics/contentpage/wordmark.gif
deleted file mode 100644
index 27ca85d..0000000
--- a/platform/org.eclipse.platform/css/graphics/contentpage/wordmark.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/overview48.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/overview48.gif
deleted file mode 100644
index 7da24bd..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/overview48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/overview48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/overview48sel.gif
deleted file mode 100644
index 3d1c45b..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/overview48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/overview72.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/overview72.gif
deleted file mode 100644
index d34b4b3..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/overview72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/samples48.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/samples48.gif
deleted file mode 100644
index 3213de6..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/samples48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/samples48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/samples48sel.gif
deleted file mode 100644
index f9c0469..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/samples48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/samples72.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/samples72.gif
deleted file mode 100644
index 4c63a9a..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/samples72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48.gif
deleted file mode 100644
index 1a3f06a..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48sel.gif
deleted file mode 100644
index 3d687bd..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials72.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials72.gif
deleted file mode 100644
index a2aa343..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/tutorials72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/wb48.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/wb48.gif
deleted file mode 100644
index c2fd06a..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/wb48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48.gif
deleted file mode 100644
index 2bfb9be..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48sel.gif
deleted file mode 100644
index 0da843f..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew72.gif b/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew72.gif
deleted file mode 100644
index 74bf6ff..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/ctool/whatsnew72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/dtool/back.gif b/platform/org.eclipse.platform/css/graphics/icons/dtool/back.gif
deleted file mode 100644
index f0d0929..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/dtool/back.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/dtool/forward.gif b/platform/org.eclipse.platform/css/graphics/icons/dtool/forward.gif
deleted file mode 100644
index dbe58b2..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/dtool/forward.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/back.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/back.gif
deleted file mode 100644
index 1c81cb6..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/back.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/forward.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/forward.gif
deleted file mode 100644
index 3e4a4f4..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/forward.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/overview48.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/overview48.gif
deleted file mode 100644
index 8e2f8c1..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/overview48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/overview48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/overview48sel.gif
deleted file mode 100644
index 1275a4a..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/overview48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/overview72.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/overview72.gif
deleted file mode 100644
index e3f7648..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/overview72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/samples48.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/samples48.gif
deleted file mode 100644
index 63d405b..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/samples48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/samples48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/samples48sel.gif
deleted file mode 100644
index 4c3135d..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/samples48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/samples72.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/samples72.gif
deleted file mode 100644
index 9216426..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/samples72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48.gif
deleted file mode 100644
index 718ca6c..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48sel.gif
deleted file mode 100644
index 10680e5..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials72.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials72.gif
deleted file mode 100644
index bab3498..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/tutorials72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/wb48.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/wb48.gif
deleted file mode 100644
index 50ca287..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/wb48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48.gif
deleted file mode 100644
index 6e00d7a..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48sel.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48sel.gif
deleted file mode 100644
index be9fa0c..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew48sel.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew72.gif b/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew72.gif
deleted file mode 100644
index 410093b..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/etool/whatsnew72.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/community_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/community_obj.gif
deleted file mode 100644
index 5d132a8..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/community_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/communityhov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/communityhov_obj.gif
deleted file mode 100644
index acb2a58..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/communityhov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/features_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/features_obj.gif
deleted file mode 100644
index 364fd48..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/features_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/featureshov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/featureshov_obj.gif
deleted file mode 100644
index fbfdf03..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/featureshov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapp_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapp_obj.gif
deleted file mode 100644
index ce00d50..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapphov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapphov_obj.gif
deleted file mode 100644
index 35e9f58..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapphov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplet_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplet_obj.gif
deleted file mode 100644
index b19a952..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplet_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplethov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplethov_obj.gif
deleted file mode 100644
index 5da3db9..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/javaapplethov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/javadev_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/javadev_obj.gif
deleted file mode 100644
index f6526a2..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/javadev_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/javadevhov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/javadevhov_obj.gif
deleted file mode 100644
index 36b47d3..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/javadevhov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/migrate_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/migrate_obj.gif
deleted file mode 100644
index 0c2fe88..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/migrate_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/migratehov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/migratehov_obj.gif
deleted file mode 100644
index ee34e2a..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/migratehov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/new_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/new_obj.gif
deleted file mode 100644
index f46b81b..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/new_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/newhov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/newhov_obj.gif
deleted file mode 100644
index 593e63b..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/newhov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/plugin_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/plugin_obj.gif
deleted file mode 100644
index d92d2c5..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/plugin_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/pluginhov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/pluginhov_obj.gif
deleted file mode 100644
index 1de8ccc..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/pluginhov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapp_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapp_obj.gif
deleted file mode 100644
index 830ab56..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapphov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapphov_obj.gif
deleted file mode 100644
index 5bd80a9..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/rcpapphov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurp_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurp_obj.gif
deleted file mode 100644
index c4e56fc..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurphov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurphov_obj.gif
deleted file mode 100644
index 60481e2..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/samplepurphov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/samplered_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/samplered_obj.gif
deleted file mode 100644
index f6d104e..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/samplered_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/sampleredhov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/sampleredhov_obj.gif
deleted file mode 100644
index 687d6b2..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/sampleredhov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/script_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/script_obj.gif
deleted file mode 100644
index b48b7cd..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/script_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/scripthov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/scripthov_obj.gif
deleted file mode 100644
index d67203e..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/scripthov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/swtapp_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/swtapp_obj.gif
deleted file mode 100644
index 9ba9a33..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/swtapp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/swtapphov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/swtapphov_obj.gif
deleted file mode 100644
index c4fbb5d..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/swtapphov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/teamsup_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/teamsup_obj.gif
deleted file mode 100644
index 4b9def9..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/teamsup_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/teamsuphov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/teamsuphov_obj.gif
deleted file mode 100644
index 4bdf819..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/teamsuphov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/updates_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/updates_obj.gif
deleted file mode 100644
index 1608b30..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/updates_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/updateshov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/updateshov_obj.gif
deleted file mode 100644
index 22a0ace..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/updateshov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasics_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasics_obj.gif
deleted file mode 100644
index 8b82563..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasics_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasicshov_obj.gif b/platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasicshov_obj.gif
deleted file mode 100644
index 230be9c..0000000
--- a/platform/org.eclipse.platform/css/graphics/icons/obj48/wbbasicshov_obj.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/rootpage/background.jpg b/platform/org.eclipse.platform/css/graphics/rootpage/background.jpg
deleted file mode 100644
index 969fcf3..0000000
--- a/platform/org.eclipse.platform/css/graphics/rootpage/background.jpg
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/rootpage/brandmark.gif b/platform/org.eclipse.platform/css/graphics/rootpage/brandmark.gif
deleted file mode 100644
index 2ecdd08..0000000
--- a/platform/org.eclipse.platform/css/graphics/rootpage/brandmark.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/rootpage/dots.gif b/platform/org.eclipse.platform/css/graphics/rootpage/dots.gif
deleted file mode 100644
index 6621b7c..0000000
--- a/platform/org.eclipse.platform/css/graphics/rootpage/dots.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/graphics/swt/form_banner.gif b/platform/org.eclipse.platform/css/graphics/swt/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/platform/org.eclipse.platform/css/graphics/swt/form_banner.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/css/overview/overview.css b/platform/org.eclipse.platform/css/overview/overview.css
deleted file mode 100644
index 859a390..0000000
--- a/platform/org.eclipse.platform/css/overview/overview.css
+++ /dev/null

@@ -1,69 +0,0 @@
-body {

-	background-image : url(../graphics/contentpage/overview_wtr.jpg);

-}

-

-.page { min-height : 700px; }

-

-/* show the "selected" image for this page */

-#navigation-links a#overview img, #navigation-links a#overview:hover img { background-image : url(../graphics/icons/ctool/overview48sel.gif); }

-

-/* 

- * Set up the Overview links to be displayed in two columns

- * that are centered in the middle of the page.

- */

-

-#overview-links {

-	text-align : left;

-	width : 760px;

-	/* To center in Moz (have to use text-align for IE) */

-	margin : 0px auto;

-}

-

-#overview-links a { 

-	width : 370px;

-	text-align : left; 

-	margin-left : 5px;

-	margin-right : 5px;

-	margin-top : 5px;

-	margin-bottom : -20px;

-	vertical-align : top;

-}

-

-#overview-links > a { vertical-align : middle; }

-

-#overview-links a img {

-	height : 57px;

-	width : 57px;

-	vertical-align : middle;

-}	

-

-#overview-links a .link-label {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -50px;

-	left : 60px;

-}

-

-#overview-links a p .text {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -45px;

-	left : 53px;

-}

-

-/* Special case for Mozilla, because the links are displayed

-   in 1 vertical column instead of 2 centered columns */

-#overview-links > a { 	width : 700px; }

-#overview-links a > .link-label { width : 700px; }

-#overview-links a p > .text { width : 700px; }

-

-#overview-links a:hover { border-right : 5px; }

-

-a#basics img { background-image : url(../graphics/icons/obj48/wbbasics_obj.gif); }

-a#basics:hover img { background-image : url(../graphics/icons/obj48/wbbasicshov_obj.gif); }

-

-a#team img { background-image : url(../graphics/icons/obj48/teamsup_obj.gif); }

-a#team:hover img { background-image : url(../graphics/icons/obj48/teamsuphov_obj.gif); }

-


diff --git a/platform/org.eclipse.platform/css/overview/swt.properties b/platform/org.eclipse.platform/css/overview/swt.properties
deleted file mode 100644
index e090103..0000000
--- a/platform/org.eclipse.platform/css/overview/swt.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-
-overview.layout.ncolumns = 2
-overview.layout.link-vspacing = 40
-
-overview.page-content.overview-links.basics.link-icon = css/graphics/icons/obj48/wbbasics_obj.gif
-overview.page-content.overview-links.team.link-icon = css/graphics/icons/obj48/teamsup_obj.gif
-overview.page-content.overview-links.layout.ncolumns = 2
-
-overview.subtitle-id = overview/page-content/page-title
-overview.description-id = overview/page-content/page-description
\ No newline at end of file

diff --git a/platform/org.eclipse.platform/css/root.css b/platform/org.eclipse.platform/css/root.css
deleted file mode 100644
index 2a6eb48..0000000
--- a/platform/org.eclipse.platform/css/root.css
+++ /dev/null

@@ -1,166 +0,0 @@
-/* 

- * Set up general font colours, sizes, etc.  Some of these will override

- * settings from the shared CSS 

- */

-.intro-header H1 {

-	font-size : 18pt;

-}

-

-#page-links a .link-label, #action-links a .link-label {

-	font-size : 13pt;

-	font-weight : 600;

-	color : #E5E5E5;

-}

-

-#page-links a p .text, #action-links a p .text {

-	font-size : 13pt;

-	font-weight : 500;

-	color : #E5E5E5;

-}

-

-/*

- * Set up the content for the root page.

- */

-body {

-	min-width : 770px;

-	/* since IE doesn't support min-width, use expression */

-	width:expression(document.body.clientWidth < 770? "770px": "auto" );

-	background-image : url(graphics/rootpage/background.jpg);

-	background-repeat : no-repeat;

-	background-position : top left;

-	background-color : #7169D1;

- 

-}

-

-#root { 

-	background-image : url(graphics/rootpage/brandmark.gif);

-	background-repeat : no-repeat;

-	background-position : bottom left;

-	min-height : 450px;

-	height : 100%;

-	height : expression(document.body.clientHeight < 450? "450px": "100%" );

-}

-/* 

- * Set up the navigation bar.  It should be centered in the middle

- * of the page

- */

-

-#links-background { 

-	background-image : url(graphics/rootpage/dots.gif);

-	background-repeat : repeat-x;

-	width : 100%; 

-	height : 177px;

- 	margin-top : 18%; 

-	margin-bottom : auto;

-	text-align : center;

-}

-

-/* specify a width for Moz so we can center.  

- * **Important** If additional links are added, we will have to increase this width 

- * to accomodate them, otherwise they will wrap to a new line 

- */

-#links-background > #page-links {

-	width : 33em;

-	margin : 0 auto;

-}

-

-#page-links { position : relative; top : 50px; }

-

-#page-links a {

-	position : relative;

-	width : 7em;

-	margin-left : 0.5em;

-	margin-right : 0.5em;

-	text-align : center;

-	vertical-align : top;

-}

-

-/* float left for Moz so the items all appear inline */

-#page-links > a { float : left; position : relative; }

-

-#page-links a img {

-	height : 82px;

-	width : 82px;

-	vertical-align : middle;

-}

-

-/* protect against very long labels in IE */

-#page-links a .link-label { word-wrap : break-word; }

-

-#page-links a span {

-	display : block;

-	margin : 0px;

-	padding : 0px;

-}

-

-/* properly align the link text based on class (left vs. right) */

-#page-links a.left p { text-align : left;}

-#page-links a.left span { text-align : left; margin-left : 15px; }

-

-#page-links a.right p { text-align : right;}

-#page-links a.right .link-label { text-align : right; margin-right : 15px; }

-#page-links a.right p .text { position : relative; right : 15px;}

-

-/* hide the link label until users hover over the link */

-#page-links a .link-label { padding-top : 20px; visibility : hidden; }

-#page-links a:hover .link-label { visibility : visible; }

-

-/* hide the description until users hover over the link */

-#page-links a p .text  { display : none; }

-#page-links a:hover p .text {

-	display : block;

-	width : 15em;

-	position : absolute;

-}

-

-#page-links a:hover  { border : 0px; }

-#page-links a:hover p { margin : 0px; padding : 0px; }

-

-/* properties for each of the page-links  */

-a#overview img { background-image : url(graphics/icons/etool/overview72.gif); }

-a#overview:hover img { background-image : url(graphics/icons/ctool/overview72.gif); }

-

-a#tutorials img { background-image : url(graphics/icons/etool/tutorials72.gif); }

-a#tutorials:hover img { background-image : url(graphics/icons/ctool/tutorials72.gif); }

-

-a#samples img { background-image : url(graphics/icons/etool/samples72.gif); }

-a#samples:hover img { background-image : url(graphics/icons/ctool/samples72.gif); }

-

-a#news img { background-image : url(graphics/icons/etool/whatsnew72.gif); }

-a#news:hover img { background-image : url(graphics/icons/ctool/whatsnew72.gif); }

-

-/*

- * Set up the action links

- */

-#action-links {

-	width : 98%;

-	position : absolute;

-	left : 0px;

-	top : 20px;

-}

-

-a#workbench { 

-	position : absolute; 

-	top : -16px;

-	right : -8px;

-	text-align : right;  

-}

-

-a#workbench img {

-	background-image : url(graphics/icons/etool/wb48.gif); 

-	height : 56px;

-	width : 56px;

-	text-align : center;

-}

-

-a#workbench:hover img {

-	background-image : url(graphics/icons/ctool/wb48.gif); 

-	height : 56px;

-	width : 56px;

-}

-/* hide the link and description until users hover over the link */

-#action-links a p .text, #action-links a .link-label { display : none; }

-#action-links a:hover .link-label { display : block; width : 16em; }

-#action-links a:hover p .text {	display : block; width : 16em; }

-#action-links a:hover { border-right : 0px; }

-


diff --git a/platform/org.eclipse.platform/css/root_swt.properties b/platform/org.eclipse.platform/css/root_swt.properties
deleted file mode 100644
index a7523be..0000000
--- a/platform/org.eclipse.platform/css/root_swt.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-
-root.links-background.page-links.overview.link-icon = css/graphics/icons/etool/overview72.gif
-root.links-background.page-links.tutorials.link-icon = css/graphics/icons/etool/tutorials72.gif
-root.links-background.page-links.samples.link-icon= css/graphics/icons/etool/samples72.gif
-root.links-background.page-links.news.link-icon = css/graphics/icons/etool/whatsnew72.gif
-root.action-links.workbench.link-icon = css/graphics/icons/etool/wb48.gif
-
-root.links-background.page-links.overview.hover-icon = css/graphics/icons/ctool/overview72.gif
-root.links-background.page-links.tutorials.hover-icon = css/graphics/icons/ctool/tutorials72.gif
-root.links-background.page-links.samples.hover-icon = css/graphics/icons/ctool/samples72.gif
-root.links-background.page-links.news.hover-icon = css/graphics/icons/ctool/whatsnew72.gif
-root.action-links.workbench.hover-icon = css/graphics/icons/ctool/wb48.gif
-
-
-root.links-background.page-links.overview.small-link-icon = css/graphics/icons/etool/overview48.gif
-root.links-background.page-links.tutorials.small-link-icon = css/graphics/icons/etool/tutorials48.gif
-root.links-background.page-links.samples.small-link-icon = css/graphics/icons/etool/samples48.gif
-root.links-background.page-links.news.small-link-icon = css/graphics/icons/etool/whatsnew48.gif
-root.action-links.workbench.small-link-icon = css/graphics/icons/etool/wb48.gif
-
-root.links-background.page-links.overview.small-hover-icon = css/graphics/icons/ctool/overview48.gif
-root.links-background.page-links.tutorials.small-hover-icon = css/graphics/icons/ctool/tutorials48.gif
-root.links-background.page-links.samples.small-hover-icon = css/graphics/icons/ctool/samples48.gif
-root.links-background.page-links.news.small-hover-icon = css/graphics/icons/ctool/whatsnew48.gif
-root.action-links.workbench.small-hover-icon = css/graphics/icons/ctool/wb48.gif

diff --git a/platform/org.eclipse.platform/css/samples/samples.css b/platform/org.eclipse.platform/css/samples/samples.css
deleted file mode 100644
index cdd024a..0000000
--- a/platform/org.eclipse.platform/css/samples/samples.css
+++ /dev/null

@@ -1,79 +0,0 @@
-body {

-	background-image : url(../graphics/contentpage/samples_wtr.jpg);

-}

-

-.page { min-height : 700px; }

-

-/* show the "selected" image for this page */

-#navigation-links a#samples img, #navigation-links a#samples:hover img { background-image : url(../graphics/icons/ctool/samples48sel.gif); }

-

-/* Lay out the real content of the samples page: */

-

-.samples-group {

-	width : 750px;

-	/* To center in Moz (have to use text-align for IE) */	

-	margin : 0px auto;

-	margin-bottom : 10px;

-	text-align : left;

-	float : none;

-	clear : both;

-}

-

-.samples-group H4 { margin-top : 10px; }

-

-.sample-link { 

-	width : 360px;

-	text-align : left; 

-	margin-left : 5px;

-	margin-right : 5px;

-	margin-top : 10px;

-	margin-bottom : -30px;

-	vertical-align : top;

-}

-

-.samples-group > .sample-link {

-	float : left;

-	height : 150px;

-	vertical-align : middle;

-}

-

-.sample-link .link-label {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -50px;

-	left : 60px;

-}

-

-.sample-link p .text {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -45px;

-	left : 53px;

-}

-

-.sample-link img {

-	height : 56px;

-	width : 56px;

-	vertical-align : middle;

-}

-

-.sample-link:hover { border-right : 0px; }

-

-#swt .sample-link img {

-	background-image : url(../graphics/icons/obj48/samplered_obj.gif);

-}

-

-#swt .sample-link:hover img {

-	background-image : url(../graphics/icons/obj48/sampleredhov_obj.gif);

-}

-

-#workbench .sample-link img {

-	background-image : url(../graphics/icons/obj48/samplepurp_obj.gif);

-}

-

-#workbench .sample-link:hover img {

-	background-image : url(../graphics/icons/obj48/samplepurphov_obj.gif);

-}

-


diff --git a/platform/org.eclipse.platform/css/samples/swt.properties b/platform/org.eclipse.platform/css/samples/swt.properties
deleted file mode 100644
index 4dfd8b3..0000000
--- a/platform/org.eclipse.platform/css/samples/swt.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-
-samples.layout.link-vspacing = 20
-
-samples.link-icon = css/graphics/icons/obj48/samplepurp_obj.gif
-samples.page-content.swt.standalone.link-icon = css/graphics/icons/obj48/samplered_obj.gif
-samples.page-content.swt.views.link-icon = css/graphics/icons/obj48/samplered_obj.gif
-
-samples.page-content.swt.layout.ncolumns = 2
-samples.page-content.workbench.layout.ncolumns = 2
-
-description-style-id = group-description
-samples.subtitle-id = samples/page-content/page-title
-samples.description-id = samples/page-content/page-description
\ No newline at end of file

diff --git a/platform/org.eclipse.platform/css/shared.css b/platform/org.eclipse.platform/css/shared.css
deleted file mode 100644
index 97bdef4..0000000
--- a/platform/org.eclipse.platform/css/shared.css
+++ /dev/null

@@ -1,236 +0,0 @@
-/* 

- * Set up general fonts, sizes and colors 

- */

-body { font-family : Arial, sans-serif; }

-

-H1, H2, H3, H4, p, a { color : #4D4D4D; }

-

-.intro-header H1 {

-	font-size : 16pt;

-	font-weight : normal;

-	color : #E5E5E5;

-}

-

-h2 {

-	font-size : 13pt;

-	font-weight : normal;

-	color : #7B8694;

-}

-

-.page-title {

-	font-size : 14pt;

-	font-weight : normal;

-	color : #8C96A2;

-	float : none;

-	clear : both;

-}

-

-.page-description { 

-	font-size : 10pt;

-	float : none;

-	clear : both;

-}

-

-H4 .div-label {

-	font-size : 10pt;

-	font-weight : bold;

-}

-

-a {

-	font-weight : bold;

-	text-decoration : none;

-	color : #4D4D4D;

-}

-

-a .link-label {

-	font-size : 10pt;

-	font-weight : normal;

-}

-

-#navigation-links a .link-label {

-	font-size : 9pt;

-	font-weight : normal;

-	color : #E5E5E5;

-}

-

-a .text {

-	font-size : 8pt;

-	font-weight : normal;

-}

-

-p .group-description {

-	font-size : 10pt;

-	font-weight : normal;

-}

-

-

-/* 

- * Set up other general properties like padding/margins

- */

-html, body { width : 100%; height : 100%; }

-

-html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; }

-

-.intro-header H1 { padding-top : 10px; margin-left : 10px; }

-

-H4 .div-label {

-	padding : 10px;

-	margin-bottom : 5px;

-}

-

-a img {

-	border-width : 0;

-	background-repeat : no-repeat;

-}

-

-/*

- * to get scrollbars working in both IE and Mozilla

- */

-html,body { overflow: auto; }

-html>body { overflow: visible; }

-

-/*

- * Set up the body, decorative background, and navigation for the content 

- * pages. 

- * Note: the root page handles its own background and navigation; these

- * settings primarily apply to the content pages

- */

-body {

-	background-color : #FFFFFF;

-	background-repeat : no-repeat;

-	background-position : bottom right;

-}

-

-#background-image {

-	width : 100%;

-	height : 164px;

-	background-image : url(graphics/contentpage/background.jpg);

-	background-repeat : no-repeat;

-	background-position : top left;	

-	position : absolute;

-	top : 0px;

-	z-index : -100;

-}

-

-#curve-image { 

-	width : 100%;

-	height : 164px;

-	position : absolute;

-	top : 0px;

-	background-image : url(graphics/contentpage/backgroundcurve.gif);

-	background-repeat : no-repeat;

-	background-position : top center;

-	margin : 0;

-	padding : 0;

-}

-

-.intro-header {	background-color : transparent; z-index : 100;}

-

-body, .page{

-	min-width : 770px;

-	/* since IE doesn't support min-width, try expression */

-	width:expression(document.body.clientWidth < 770? "770px": "auto" );

-	min-height : 425px;

-	height : 100%;

-	height : expression(document.body.clientHeight < 425? "425px": "100%" );

-}

-

-.page { 

-	background-image : url(graphics/contentpage/wordmark.gif);

-	background-repeat : no-repeat;

-	background-position : bottom left;

-	min-height : 475px;

-}

-

-#page-content {

-	background-repeat : no-repeat;

-	background-position : bottom right;

-	height : 70%;

-}

-

-/* 

- * Lay out the navigation links 

- * (Root page does something similar for its navigation)

- */

-#navigation-links {

-	position : relative;

-	left : 10px;

-	top : 5px;

-	height : 60;

-	width : 98%;

-}

-

-#navigation-links a {

-	padding-left : 5px;

-	padding-right : 5px;

-	float : left;

-	text-align : center;

-}

-

-#navigation-links a img {

-	height : 52px;

-	width : 52px;

-	vertical-align : middle;

-}

-

-#navigation-links a .link-label { display : block; margin-top : 5px;}

-

-#navigation-links a .text { display : none; }

-

-#navigation-links a:hover { border-right : 0px; }

-

-/* properties for each of the navigation-links  */

-#navigation-links a#overview img { background-image : url(graphics/icons/etool/overview48.gif); }

-#navigation-links a#overview:hover img { background-image : url(graphics/icons/ctool/overview48.gif); }

-#navigation-links a#overview:active img { background-image : url(graphics/icons/ctool/overview48sel.gif); }

-

-#navigation-links a#tutorials img { background-image : url(graphics/icons/etool/tutorials48.gif); }

-#navigation-links a#tutorials:hover img { background-image : url(graphics/icons/ctool/tutorials48.gif); }

-#navigation-links a#tutorials:active img { background-image : url(graphics/icons/ctool/tutorials48sel.gif); }

-

-#navigation-links a#samples img { background-image : url(graphics/icons/etool/samples48.gif); }

-#navigation-links a#samples:hover img { background-image : url(graphics/icons/ctool/samples48.gif); }

-#navigation-links a#samples:active img { background-image : url(graphics/icons/ctool/samples48sel.gif); }

-

-#navigation-links a#news img { background-image : url(graphics/icons/etool/whatsnew48.gif); }

-#navigation-links a#news:hover img { background-image : url(graphics/icons/ctool/whatsnew48.gif); }

-#navigation-links a#news:active img { background-image : url(graphics/icons/ctool/whatsnew48sel.gif); }

-

-#navigation-links a#workbench { position : absolute;  right : 0px; top : -35px; text-align : right;}

-#navigation-links a#workbench .link-label { visibility : hidden; }

-#navigation-links a#workbench:hover .link-label { visibility : visible; }

-#navigation-links a#workbench .text { display : none; }

-#navigation-links a#workbench img { background-image : url(graphics/icons/etool/wb48.gif); width : 53px; height : 53px;}

-#navigation-links a#workbench:hover img { background-image : url(graphics/icons/ctool/wb48.gif); }

-

-/* 

- * Lay out the page title and description 

- */

-h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */

-

-/* position the page content so that the page title overlays the bottom

- * of the background image, but make sure the content is always on top 

- * (using z-index) */

-#page-content {

-	float : none;

-	clear : both;

-	text-align : center;

-	margin-top : 35px;

-}

-

-.page > #page-content { margin-top : 50px; }

-

-#page-content p { 

-	padding-bottom : 15px; 

-	text-align : left; 

-	float : none;

-	clear : both;

-}

-

-.page-title, .page-description {

-	text-align : left;

-	margin-right : 10px;

-	float : none;

-	clear : both;

-}

-


diff --git a/platform/org.eclipse.platform/css/shared_swt.properties b/platform/org.eclipse.platform/css/shared_swt.properties
deleted file mode 100644
index 931b93f..0000000
--- a/platform/org.eclipse.platform/css/shared_swt.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-
-title.image = css/graphics/swt/form_banner.gif
-
-
-

diff --git a/platform/org.eclipse.platform/css/tutorials/swt.properties b/platform/org.eclipse.platform/css/tutorials/swt.properties
deleted file mode 100644
index f217aa7..0000000
--- a/platform/org.eclipse.platform/css/tutorials/swt.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-
-tutorials.layout.link-vspacing = 40
-
-tutorials.subtitle-id = tutorials/page-content/page-title
-tutorials.description-id = tutorials/page-content/page-description
\ No newline at end of file

diff --git a/platform/org.eclipse.platform/css/tutorials/tutorials.css b/platform/org.eclipse.platform/css/tutorials/tutorials.css
deleted file mode 100644
index 053efe8..0000000
--- a/platform/org.eclipse.platform/css/tutorials/tutorials.css
+++ /dev/null

@@ -1,79 +0,0 @@
-body {

-	background-image : url(../graphics/contentpage/tutorials_wtr.jpg);

-}

-

-.page { min-height : 700px; }

-

-/* show the "selected" image for this page */

-#navigation-links a#tutorials img, #navigation-links a#tutorials:hover img { background-image : url(../graphics/icons/ctool/tutorials48sel.gif); }

-

-/* 

- * Set up the content of the tutorials page into two

- * columns that are centered in the page

- */

-

-

-/* a group of tutorial links */

-.tutorials-group {

-	/* To center in Moz (have to use text-align for IE) */

-	margin-left : auto;

-	margin-right : auto;

-	width : 750px;

-	margin-bottom : 30px;

-	float : none;

-	clear : both;

-	text-align : left;

-}

-

-.tutorials-link { 

-	width : 360px;

-	text-align : left; 

-	margin-left : 5px;

-	margin-right : 5px;

-	margin-top : 10px;

-	margin-bottom : -20px;

-	vertical-align : top;

-}

-

-.tutorials-group > .tutorials-link {

-	float : left;

-	height : 150px;

-	vertical-align : middle;

-}

-

-

-.tutorials-link img  {

-	height : 57px;

-	width : 57px;

-	vertical-align : middle;

-}

-

-.tutorials-group h4 {

-	float : none;

-	clear : both;

-}

-

-p #group-description {

-	padding-bottom : 10px;

-	float : none;

-	clear : both;

-}

-

-.tutorials-link .link-label {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -50px;

-	left : 60px;

-}

-

-

-.tutorials-link p .text {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -45px;

-	left : 53px;

-}

-

-.tutorials-link:hover { border-right : 0px; }


diff --git a/platform/org.eclipse.platform/css/whatsnew/swt.properties b/platform/org.eclipse.platform/css/whatsnew/swt.properties
deleted file mode 100644
index e02c2c5..0000000
--- a/platform/org.eclipse.platform/css/whatsnew/swt.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-
-news.page-content.news-links.layout.ncolumns = 2
-news.layout.link-vspacing = 30
-
-news.page-content.news-links.new-and-noteworthy.link-icon = css/graphics/icons/obj48/new_obj.gif
-news.page-content.news-links.migration.link-icon = css/graphics/icons/obj48/migrate_obj.gif
-news.page-content.news-links.updates.link-icon = css/graphics/icons/obj48/updates_obj.gif
-news.page-content.news-links.eclipse.link-icon = css/graphics/icons/obj48/community_obj.gif
-
-news.subtitle-id = news/page-content/page-title

diff --git a/platform/org.eclipse.platform/css/whatsnew/whatsnew.css b/platform/org.eclipse.platform/css/whatsnew/whatsnew.css
deleted file mode 100644
index 653025b..0000000
--- a/platform/org.eclipse.platform/css/whatsnew/whatsnew.css
+++ /dev/null

@@ -1,76 +0,0 @@
-body {

-	background-image : url(../graphics/contentpage/whatsnew_wtr.jpg);

-}

-

-.page { min-height : 500px; }

-

-/* show the "selected" image for this page */

-#navigation-links a#news img, #navigation-links a#news:hover img { background-image : url(../graphics/icons/ctool/whatsnew48sel.gif); }

-

-/* 

- * Set up the content of the Whats New page to be displayed in 

- * two columns that are centered in the middle of the page.

- */

-

-#news-links {

-	text-align : left;

-	width : 760px;

-	/* To center in Moz (have to use text-align for IE) */	

-	margin: 0px auto;

-}

-

-#news-links a { 

-	width : 370px;

-	text-align : left; 

-	margin-left : 5px;

-	margin-right : 5px;

-	margin-top : 5px;

-	margin-bottom : -20px;

-	vertical-align : top;

-}

-

-#news-links > a { vertical-align : middle; }

-

-#news-links a img {

-	height : 57px;

-	width : 57px;

-	vertical-align : middle;

-}

-

-#news-links a .link-label {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -50px;

-	left : 60px;

-}

-

-#news-links a p .text {

-	display : block;

-	width : 300px;

-	position : relative;

-	top : -45px;

-	left : 53px;

-}

-

-/* Special case for Mozilla, because the links are displayed

-   in 1 vertical column instead of 2 centered columns */

-#news-links > a { 	width : 700px; }

-#news-links a > .link-label { width : 700px; }

-#news-links a p > .text { width : 700px; }

-

-#news-links a:hover { border-right : 5px; }

-

-a#new-and-noteworthy img { background-image : url(../graphics/icons/obj48/new_obj.gif); }

-a#new-and-noteworthy:hover img { background-image : url(../graphics/icons/obj48/newhov_obj.gif); }

-

-a#migration img { background-image : url(../graphics/icons/obj48/migrate_obj.gif); }

-a#migration:hover img { background-image : url(../graphics/icons/obj48/migratehov_obj.gif); }

-

-a#updates img { background-image : url(../graphics/icons/obj48/updates_obj.gif); }

-a#updates:hover img { background-image : url(../graphics/icons/obj48/updateshov_obj.gif); }

-

-a#eclipse img { background-image : url(../graphics/icons/obj48/community_obj.gif); }

-a#eclipse:hover img { background-image : url(../graphics/icons/obj48/communityhov_obj.gif); }

-

-


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/introContent.xml b/platform/org.eclipse.platform/introContent.xml
deleted file mode 100644
index 15b1769..0000000
--- a/platform/org.eclipse.platform/introContent.xml
+++ /dev/null

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<introContent>
-	<page
-               alt-style="css/root_swt.properties"
-               style="css/root.css"
-               id="root"
-               style-id="page"> 
-            <title style-id="intro-header">Welcome to Eclipse Platform 3.0</title>
-            <group id="links-background">
-	            <group
-                  id="page-links">
-	               <link
-                     label="Overview"
-                     url="http://org.eclipse.ui.intro/showPage?id=overview"
-                     id="overview"
-					 style-id="left">
-	                  <text>Find out what Eclipse is all about</text>
-	               </link>
-	               <link
-                     label="Tutorials"
-                     url="http://org.eclipse.ui.intro/showPage?id=tutorials"
-                     id="tutorials"
-					 style-id="left">
-	                  <text>Let us guide you through Eclipse end-to-end tutorials</text>
-	               </link>
-	               <link
-                     label="Samples"
-                     url="http://org.eclipse.ui.intro/showPage?id=samples"
-                     id="samples"
-					 style-id="right">
-	                  <text>Explore Eclipse development through code samples</text>
-	               </link>
-	               <link
-                     label="What&apos;s New" 
-                     url="http://org.eclipse.ui.intro/showPage?id=news"
-                     id="news"
-					 style-id="right">
-	                  <text>Find out what is new in this release</text>
-	               </link>
-	            </group>
-	        </group>
-            <group
-                  id="action-links">
-               <link
-                     url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.ui.intro.contextHelp"
-                     label="Workbench"
-                     id="workbench">
-                  <text>Go to the workbench but stay around helping me as I browse</text>
-               </link>
-            </group>
-         </page>
-         <page
-               style="css/overview/overview.css"
-               alt-style="css/overview/swt.properties"
-               id="overview"
-               style-id="page">
-   			<title style-id="intro-header">Welcome to Eclipse Platform 3.0</title>
-			<group
-                  id="background-image">
-            </group>
-            <group
-                  id="curve-image">
-            </group>
-            <group 
-            	  id="navigation-links" filteredFrom="swt">
-               <include
-                     path="root/links-background/page-links">
-               </include>
-			   <include
-                     path="root/action-links">
-               </include>
-            </group>
-            <group id="page-content">
-	            <text
-	                  style-id="page-title" id="page-title">OVERVIEW</text>
-	            <text
-	                  style-id="page-description" id="page-description">Eclipse is a kind of universal tool platform - an open extensible IDE for anything and nothing in particular. It provides a feature-rich development environment that allows the developer to efficiently create tools that integrate seamlessly into the Eclipse Platform.</text>
-	            <group
-	                  id="overview-links">
-	               <link
-	                     label="Workbench basics"
-	                     url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.platform.doc.user/concepts/concepts-2.htm"
-	                     id="basics">
-	                  <text>Learn about basic Eclipse workbench concepts</text>
-	               </link>
-	               <link
-	                     label="Team support"
-	                     url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.platform.doc.user/concepts/concepts-26.htm"
-	                     id="team">
-	                  <text>Find out how to collaborate with other developers</text>
-	               </link>
-	            </group>
-            </group>
-         </page>
-         <page
-               style="css/tutorials/tutorials.css"
-               alt-style="css/tutorials/swt.properties"
-               id="tutorials"
-               style-id="page">
-		  <title style-id="intro-header">Welcome to Eclipse Platform 3.0</title>
-            <group
-                  id="background-image">
-            </group>
-            <group
-                  id="curve-image">
-            </group>
-            <include
-                  path="overview/navigation-links">
-            </include>
-            <group
-            	  id="page-content">
-	           <text
-	                 style-id="page-title" id="page-title">TUTORIALS</text>
-	           <text
-	                 style-id="page-description" id="page-description">Learn how to be productive using Eclipse by completing end-to-end tutorials that will guide you along the way.</text>
-            </group>
-         </page>
-         <page
-               style="css/samples/samples.css"
-               alt-style="css/samples/swt.properties"
-               id="samples"
-               style-id="page">
-            <title style-id="intro-header">Welcome to Eclipse Platform 3.0</title>
-            <group
-                  id="background-image">
-            </group>
-            <group
-                  id="curve-image">
-            </group>
-            <include
-                  path="overview/navigation-links">
-            </include>
-            <group
-            	  id="page-content">
-	            <text
-	                  style-id="page-title" id="page-title" >SAMPLES</text>
-	            <text
-	                  style-id="page-description" id="page-description" >Explore Eclipse by installing prefabricated samples (may require Internet connection).</text>
-	            <group
-	                  label="SWT"
-	                  id="swt"
-	                  style-id="samples-group">
-	               <text
-	                     style-id="group-description">Run SWT samples using either standalone SWT launcher or integrated into workbench views.</text>
-	               <link
-	                     label="Stand-alone SWT launcher"
-	                     url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.swt.examples"
-	                     id="standalone"
-	                     style-id="sample-link">
-	                  <text>A new window will open that will allow you to select standalone samples from the list</text>
-	               </link>
-	               <link
-	                     label="Workbench views"
-	                     url="http://org.eclipse.ui.intro/showMessage?message=Action not implemented."
-	                     id="views"
-	                     style-id="sample-link">
-	                  <text>Samples will be integrated in the workbench views in the current perspective</text>
-	               </link>
-	            </group>
-	            <group
-	                  label="Workbench"
-	                  id="workbench"
-	                  style-id="samples-group">
-	               <text
-	                     style-id="group-description">The following samples demonstrate how to tightly integrate into the Eclipse workbench.</text>
-	               <link
-	                     label="Multi-page editor"
-	                     url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.multipageeditor"
-	                     id="multi-page-editor"
-	                     style-id="sample-link">
-	                  <text>Shows how to create an editor with multiple pages</text>
-	               </link>
-	               <link
-	                     label="Property sheet and outline"
-	                     url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.propertysheet"
-	                     id="property-sheet"
-	                     style-id="sample-link">
-	                  <text>Demonstrates how to use property sheet and outline views</text>
-	               </link>
-	               <link
-	                     label="Readme tool"
-	                     url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.readmetool"
-	                     id="readmetool"
-	                     style-id="sample-link">
-	                  <text>Shows how to create your own extension points</text>
-	               </link>
-	            </group>
-            </group>
-         </page>
-         <page
-               style="css/whatsnew/whatsnew.css"
-               alt-style="css/whatsnew/swt.properties"
-               id="news"
-               style-id="page">
-            <title style-id="intro-header">Welcome to Eclipse Platform 3.0</title>
-            <group
-                  id="background-image">
-            </group>
-            <group
-                  id="curve-image">
-            </group>
-            <include
-                  path="overview/navigation-links">
-            </include>
-            <group
-            	  id="page-content">
-	            <text
-	                  style-id="page-title" id="page-title">WHAT&apos;S NEW</text>
-	            <group
-	                  id="news-links">
-	               <link
-	                     label="New and noteworthy"
-	                     url="http://org.eclipse.ui.intro/showMessage?message=Action not implemented."
-	                     id="new-and-noteworthy">
-	                  <text>Find out about the major new features in this release</text>
-	               </link>
-	               <link
-	                     label="Migration from the previous release"
-	                     url="http://org.eclipse.ui.intro/showMessage?message=Action not implemented."
-	                     id="migration">
-	                  <text>Learn what you need to do to make your old code work in Eclipse 3.0</text>
-	               </link>
-	               <link
-	                     label="New Updates"
-	                     url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.update.ui&amp;class=org.eclipse.update.internal.ui.InstallWizardAction"
-	                     id="updates">
-	                  <text>Get the latest updates from Eclipse.org</text>
-	               </link>
-	               <link
-	                     label="Eclipse community"
-	                     url="http://www.eclipse.org"
-	                     id="eclipse">
-	                  <text>Join the community, read articles and news on Eclipse.org</text>
-	               </link>
-	            </group>
-            </group>
-         </page>
-	
-</introContent>

diff --git a/platform/org.eclipse.platform/plugin.properties b/platform/org.eclipse.platform/plugin.properties
deleted file mode 100644
index a5b6e0f..0000000
--- a/platform/org.eclipse.platform/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=Eclipse Platform
-providerName=Eclipse.org
-
-
-cheatsheet.cvs.name= CVS Tasks
-cheatsheet.cvs.desc= Go through the main CVS tasks using the cheat sheet
\ 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 6bc1acc..0000000
--- a/platform/org.eclipse.platform/plugin.xml
+++ /dev/null

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.platform"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName">
-
-   <runtime>
-      <library name="startup.jar"/>
-      <library name="platform.jar">
-         <export name="*"/>
-      </library>
-   </runtime>   
-   <requires>
-      <import plugin="org.eclipse.ui.intro"/>
-      <import plugin="org.eclipse.ui.cheatsheets"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui"/>
-   </requires>
-   
-
-   <extension  
-         point="org.eclipse.ui.intro">
-      <intro
-            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
-            id="org.eclipse.platform.intro">
-      </intro>
-      <introProductBinding
-            introId="org.eclipse.platform.intro"
-            productId="org.eclipse.platform">
-      </introProductBinding>
-   </extension>
-   <extension   
-         id="intro"
-         point="org.eclipse.ui.intro.config">
-      <config
-            introId="org.eclipse.platform.intro"
-            id="org.eclipse.platform.introConfig"
-            content="introContent.xml">
-         <presentation
-               home-page-id="root">
-            <implementation
-                  ws="win32"
-                  style="css/shared.css"
-                  kind="html"
-                  os="win32">
-            </implementation>
-            <implementation
-                  style="css/shared_swt.properties"
-                  kind="swt">
-            </implementation>
-         </presentation>
-      </config>
-   </extension>
-   <extension
-         point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-      <cheatsheet
-            name="%cheatsheet.cvs.name"
-            contentFile="cheatsheets/CVS_1.xml"
-            id="org.eclipse.platform.cvs_1">
-         <description>
-            %cheatsheet.cvs.desc
-         </description>
-      </cheatsheet>
-   </extension>
-   <!-- =====================================================  -->
-   <!-- Standby Content Part contributions                     -->
-   <!-- =====================================================  -->
-   <extension point="org.eclipse.ui.intro.configExtension">
-      <standbyContentPart
-            id="org.eclipse.platform.cheatsheet"
-            class="org.eclipse.platform.internal.CheatSheetStandbyContent"
-            pluginId="org.eclipse.platform"/>
-   </extension>
-
-</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 6f23767..0000000
--- a/platform/org.eclipse.platform/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.platform/src-intro/org/eclipse/platform/internal/CheatSheetStandbyContent.java b/platform/org.eclipse.platform/src-intro/org/eclipse/platform/internal/CheatSheetStandbyContent.java
deleted file mode 100644
index 79b416e..0000000
--- a/platform/org.eclipse.platform/src-intro/org/eclipse/platform/internal/CheatSheetStandbyContent.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.platform.internal;
-
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.cheatsheets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.ui.intro.config.IStandbyContentPart;
-
-public final class CheatSheetStandbyContent implements IStandbyContentPart {
-
-    private IIntroPart introPart;
-    private ICheatSheetViewer viewer;
-    private Composite container;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#createControl(org.eclipse.swt.widgets.Composite,
-     *      org.eclipse.ui.forms.widgets.FormToolkit)
-     */
-    public void createPartControl(Composite parent, FormToolkit toolkit) {
-        container = toolkit.createComposite(parent);
-        FillLayout layout = new FillLayout();
-        layout.marginWidth = layout.marginHeight = 0;
-        container.setLayout(layout);
-
-        viewer = CheatSheetViewerFactory.createCheatSheetView();
-        viewer.createPartControl(container);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#getControl()
-     */
-    public Control getControl() {
-        return container;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#init(org.eclipse.ui.intro.IIntroPart)
-     */
-    public void init(IIntroPart introPart) {
-        this.introPart = introPart;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#setInput(java.lang.Object)
-     */
-    public void setInput(Object input) {
-        viewer.setInput((String)input);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#setFocus()
-     */
-    public void setFocus() {
-    	viewer.setFocus();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#dispose()
-     */
-    public void dispose() {
-    	viewer.dispose();
-    }
-}

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 8de30ac..0000000
--- a/platform/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java
+++ /dev/null

@@ -1,1507 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.*;
-
-/**
- * The launcher for Eclipse.
- * TODO fill in the rest of the doc here relating to command line args and system props.
- * Most of the content will atually go in the User and ISV doc but special/internal things will be 
- * documented here.
- */
-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 URL installLocation = null;
-
-	/**
-	 * The location of the configuration information for this instance
-	 */
-	protected URL configurationLocation = null;
-
-	/**
-	 * The location of the configuration information in the install root
-	 */
-	protected String parentConfigurationLocation = null;
-
-	/**
-	 * The id of the bundle that will contain the framework to run.  Defaults to org.eclipse.osgi.
-	 */
-	protected String framework = OSGI;
-
-	/**
-	 * The extra development time class path entries.
-	 */
-	protected String devClassPath = null;
-
-	/**
-	 * Indicates whether this instance is running in development mode.
-	 */
-	protected boolean inDevelopmentMode = false;
-
-	private String exitData = null;
-	private String vm = null;
-	private String[] vmargs = null;
-	private String[] commands = null;
-
-	// splash handling
-	private String showSplash = null;
-	private String endSplash = null;
-	private boolean initialize = false;
-	private Process showProcess = null;
-	private boolean splashDown = false;
-	private final Runnable endSplashHandler = new Runnable() {
-		public void run() {
-			takeDownSplash();
-		}
-	};
-
-	// command line args
-	private static final String FRAMEWORK = "-framework"; //$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 VM = "-vm"; //$NON-NLS-1$
-	private static final String VMARGS = "-vmargs"; //$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 CONFIGURATION = "-configuration"; //$NON-NLS-1$
-	private static final String EXITDATA = "-exitdata"; //$NON-NLS-1$
-	private static final String NOSPLASH = "-nosplash"; //$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 SPLASH_IMAGE = "splash.bmp"; //$NON-NLS-1$
-
-	private static final String OSGI = "org.eclipse.osgi"; //$NON-NLS-1$
-	private static final String STARTER = "org.eclipse.core.runtime.adaptor.EclipseStarter"; //$NON-NLS-1$
-	private static final String PLATFORM_URL = "platform:/base/"; //$NON-NLS-1$
-	private static final String ECLIPSE_PROPERTIES = "eclipse.properties"; //$NON-NLS-1$
-	private static final String FILE_SCHEME = "file:"; //$NON-NLS-1$	
-
-	// constants: configuration file location
-	private static final String CONFIG_DIR = "configuration/"; //$NON-NLS-1$
-	private static final String CONFIG_FILE = "config.ini"; //$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 ECLIPSE = "eclipse"; //$NON-NLS-1$
-	private static final String PRODUCT_SITE_MARKER = ".eclipseproduct"; //$NON-NLS-1$
-	private static final String PRODUCT_SITE_ID = "id"; //$NON-NLS-1$
-	private static final String PRODUCT_SITE_VERSION = "version"; //$NON-NLS-1$
-
-	// constants: System property keys and/or configuration file elements
-	private static final String PROP_USER_HOME = "user.home"; //$NON-NLS-1$
-	private static final String PROP_USER_DIR = "user.dir"; //$NON-NLS-1$
-	private static final String PROP_INSTALL_AREA = "osgi.install.area"; //$NON-NLS-1$
-	private static final String PROP_CONFIG_AREA = "osgi.configuration.area"; //$NON-NLS-1$
-	private static final String PROP_BASE_CONFIG_AREA = "osgi.baseConfiguration.area"; //$NON-NLS-1$
-	private static final String PROP_SHARED_CONFIG_AREA = "osgi.sharedConfiguration.area"; //$NON-NLS-1$
-	private static final String PROP_CONFIG_CASCADED = "osgi.configuration.cascaded"; //$NON-NLS-1$
-	private static final String PROP_FRAMEWORK = "osgi.framework"; //$NON-NLS-1$
-	private static final String PROP_SPLASHPATH = "osgi.splashPath"; //$NON-NLS-1$
-	private static final String PROP_SPLASHLOCATION = "osgi.splashLocation"; //$NON-NLS-1$
-	private static final String PROP_CLASSPATH = "osgi.frameworkClassPath"; //$NON-NLS-1$
-	private static final String PROP_LOGFILE = "osgi.logfile"; //$NON-NLS-1$
-	private static final String PROP_EOF = "eof"; //$NON-NLS-1$
-
-	private static final String PROP_EXITCODE = "eclipse.exitcode"; //$NON-NLS-1$
-	private static final String PROP_EXITDATA = "eclipse.exitdata"; //$NON-NLS-1$
-	private static final String PROP_VM = "eclipse.vm"; //$NON-NLS-1$
-	private static final String PROP_VMARGS = "eclipse.vmargs"; //$NON-NLS-1$
-	private static final String PROP_COMMANDS = "eclipse.commands"; //$NON-NLS-1$
-
-	// Data mode constants for user, configuration and data locations.
-	private static final String NONE = "@none"; //$NON-NLS-1$
-	private static final String NO_DEFAULT = "@noDefault"; //$NON-NLS-1$
-	private static final String USER_HOME = "@user.home"; //$NON-NLS-1$
-	private static final String USER_DIR = "@user.dir"; //$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 File logFile = null;
-	protected BufferedWriter log = null;
-	protected boolean newSession = true;
-
-	/**
-	 * 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 {
-		System.getProperties().setProperty("eclipse.startTime", Long.toString(System.currentTimeMillis())); //$NON-NLS-1$
-		commands = args;
-		String[] passThruArgs = processCommandLine(args);
-		setupVMProperties();
-		processConfiguration();
-		// need to ensure that getInstallLocation is called at least once to initialize the value.
-		// Do this AFTER processing the configuration to allow the configuration to set
-		// the install location.  
-		getInstallLocation();
-
-		// 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
-		URLClassLoader loader = new URLClassLoader(bootPath, null);
-		Class clazz = loader.loadClass(STARTER);
-		Method method = clazz.getDeclaredMethod("run", new Class[] {String[].class, Runnable.class}); //$NON-NLS-1$
-		try {
-			return method.invoke(clazz, new Object[] {passThruArgs, endSplashHandler});
-		} catch (InvocationTargetException e) {
-			if (e.getTargetException() instanceof Error)
-				throw (Error) e.getTargetException();
-			else if (e.getTargetException() instanceof Exception)
-				throw (Exception) e.getTargetException();
-			else
-				//could be a subclass of Throwable!
-				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
-	 */
-	private 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[list.size()]);
-	}
-
-	/**
-	 * 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
-	 */
-	private URL[] getDevPath(URL base) throws IOException {
-		ArrayList result = new ArrayList(5);
-		if (inDevelopmentMode)
-			addDevEntries(base, result); //$NON-NLS-1$
-		//The jars from the base always need to be added, even when running in dev mode (bug 46772)
-		addBaseJars(base, result);
-		return (URL[]) result.toArray(new URL[result.size()]);
-	}
-
-	private void addBaseJars(URL base, ArrayList result) throws IOException {
-		String baseJarList = System.getProperty(PROP_CLASSPATH);
-		if (baseJarList == null) {
-			URL url = new URL(base, ECLIPSE_PROPERTIES);
-			if (debug)
-				System.out.println("Loading framework classpath from:\n    " + url.toExternalForm()); //$NON-NLS-1$
-			Properties defaults = loadProperties(url);
-			baseJarList = defaults.getProperty(PROP_CLASSPATH);
-			if (baseJarList == null)
-				throw new IOException("Unable to initialize " + PROP_CLASSPATH); //$NON-NLS-1$
-			System.getProperties().put(PROP_CLASSPATH, baseJarList);
-		}
-		String[] baseJars = getArrayFromList(baseJarList);
-		for (int i = 0; i < baseJars.length; i++) {
-			String string = baseJars[i];
-			try {
-				// if the string is a file: URL then *carefully* construct the URL.  Otherwise
-				// just try to build a URL. In either case, if we fail, use string as something to tack
-				// on the end of the base.
-				URL url = null;
-				if (string.startsWith("file:")) //$NON-NLS-1$
-					url = new File(string.substring(5)).toURL();
-				else
-					url = new URL(string);
-				addEntry(url, result);
-			} catch (MalformedURLException e) {
-				addEntry(new URL(base, string), result);
-			}
-		}
-	}
-
-	private void addEntry(URL url, List result) {
-		if (new File(url.getFile()).exists())
-			result.add(url);
-	}
-
-	private void addDevEntries(URL base, List result) throws MalformedURLException {
-		String[] locations = getArrayFromList(devClassPath);
-		for (int i = 0; i < locations.length; i++) {
-			String location = locations[i];
-			char lastChar = location.charAt(location.length() - 1);
-			URL url;
-			if ((location.endsWith(".jar") || (lastChar == '/' || lastChar == '\\'))) //$NON-NLS-1$
-				url = new URL(base, location);
-			else
-				url = new URL(base, location + "/"); //$NON-NLS-1$
-			addEntry(url, result);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	private URL[] getBootPath(String base) throws IOException {
-		URL url = null;
-		if (base != null) {
-			url = buildURL(base, true);
-		} else {
-			// search in the root location
-			url = getInstallLocation();
-			String path = new File(url.getFile(), "plugins").toString(); //$NON-NLS-1$
-			path = searchFor(framework, path);
-			if (path == null)
-				throw new RuntimeException("Could not find framework"); //$NON-NLS-1$
-			if (url.getProtocol().equals("file")) //$NON-NLS-1$
-				url = new File(path).toURL();
-			else
-				url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-		}
-		if (System.getProperty(PROP_FRAMEWORK) == null)
-			System.getProperties().put(PROP_FRAMEWORK, url.toExternalForm());
-		if (debug)
-			System.out.println("Framework located:\n    " + url.toExternalForm()); //$NON-NLS-1$
-		// add on any dev path elements
-		URL[] result = getDevPath(url);
-		if (debug) {
-			System.out.println("Framework classpath:"); //$NON-NLS-1$
-			for (int i = 0; i < result.length; i++)
-				System.out.println("    " + result[i].toExternalForm()); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	/**
-	 * Searches for the given target 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 target directory was found
-	 * @param start the location to begin searching
-	 */
-	private String searchFor(final String target, String start) {
-		FileFilter filter = new FileFilter() {
-			public boolean accept(File candidate) {
-				return candidate.isDirectory() && (candidate.getName().equals(target) || candidate.getName().startsWith(target + "_")); //$NON-NLS-1$
-			}
-		};
-		File[] candidates = new File(start).listFiles(filter); //$NON-NLS-1$
-		if (candidates == null)
-			return null;
-		String result = null;
-		Object maxVersion = null;
-		for (int i = 0; i < candidates.length; i++) {
-			String name = candidates[i].getName();
-			String version = ""; //$NON-NLS-1$ // Note: directory with version suffix is always > than directory without version suffix
-			int index = name.indexOf('_');
-			if (index != -1)
-				version = name.substring(index + 1);
-			Object currentVersion = getVersionElements(version);
-			if (maxVersion == null) {
-				result = candidates[i].getAbsolutePath();
-				maxVersion = currentVersion;
-			} else {
-				if (compareVersion((Object[]) maxVersion, (Object[]) currentVersion) < 0) {
-					result = candidates[i].getAbsolutePath();
-					maxVersion = currentVersion;
-				}
-			}
-		}
-		if (result == null)
-			return null;
-		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;
-	}
-
-	private static URL buildURL(String spec, boolean trailingSlash) {
-		if (spec == null)
-			return null;
-		boolean isFile = spec.startsWith("file:"); //$NON-NLS-1$
-		try {
-			if (isFile)
-				return adjustTrailingSlash(new File(spec.substring(5)).toURL(), trailingSlash);
-			else
-				return new URL(spec);
-		} catch (MalformedURLException e) {
-			// if we failed and it is a file spec, there is nothing more we can do
-			// otherwise, try to make the spec into a file URL.
-			if (isFile)
-				return null;
-			try {
-				return adjustTrailingSlash(new File(spec).toURL(), trailingSlash);
-			} catch (MalformedURLException e1) {
-				return null;
-			}
-		}
-	}
-
-	private static URL adjustTrailingSlash(URL url, boolean trailingSlash) throws MalformedURLException {
-		String file = url.getFile();
-		if (trailingSlash == (file.endsWith("/"))) //$NON-NLS-1$
-			return url;
-		file = trailingSlash ? file + "/" : file.substring(0, file.length() - 1); //$NON-NLS-1$
-		return new URL(url.getProtocol(), url.getHost(), file);
-	}
-
-	private URL buildLocation(String property, URL defaultLocation, String userDefaultAppendage) {
-		URL result = null;
-		String location = System.getProperty(property);
-		System.getProperties().remove(property);
-		// if the instance location is not set, predict where the workspace will be and 
-		// put the instance area inside the workspace meta area.
-		try {
-			if (location == null)
-				result = defaultLocation;
-			else if (location.equalsIgnoreCase(NONE))
-				return null;
-			else if (location.equalsIgnoreCase(NO_DEFAULT))
-				result = buildURL(location, true);
-			else {
-				if (location.equalsIgnoreCase(USER_HOME))
-					location = computeDefaultUserAreaLocation(userDefaultAppendage);
-				if (location.equalsIgnoreCase(USER_DIR))
-					location = new File(System.getProperty(PROP_USER_DIR), userDefaultAppendage).getAbsolutePath();
-				result = buildURL(location, true);
-			}
-		} finally {
-			if (result != null)
-				System.getProperties().put(property, result.toExternalForm());
-		}
-		return result;
-	}
-
-	/** 
-	 * Retuns the default file system path for the configuration location.
-	 * By default the configuration information is in the installation directory
-	 * if this is writeable.  Otherwise it is located somewhere in the user.home
-	 * area relative to the current product. 
-	 * @return the default file system path for the configuration information
-	 */
-	private String computeDefaultConfigurationLocation() {
-		// 1) We store the config state relative to the 'eclipse' directory if possible
-		// 2) If this directory is read-only 
-		//    we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home> 
-		//    is unique for each local user, and <application-id> is the one 
-		//    defined in .eclipseproduct marker file. If .eclipseproduct does not
-		//    exist, use "eclipse" as the application-id.
-
-		URL install = getInstallLocation();
-		// TODO a little dangerous here.  Basically we have to assume that it is a file URL.
-		if (install.getProtocol().equals("file")) { //$NON-NLS-1$
-			File installDir = new File(install.getFile());
-			if (installDir.canWrite())
-				return installDir.getAbsolutePath() + File.separator + CONFIG_DIR;
-		}
-		// We can't write in the eclipse install dir so try for some place in the user's home dir
-		return computeDefaultUserAreaLocation(CONFIG_DIR);
-	}
-
-	/**
-	 * Returns a files system path for an area in the user.home region related to the
-	 * current product.  The given appendage is added to this base location
-	 * @param pathAppendage the path segments to add to computed base
-	 * @return a file system location in the user.home area related the the current
-	 *   product and the given appendage
-	 */
-	private String computeDefaultUserAreaLocation(String pathAppendage) {
-		//    we store the state in <user.home>/.eclipse/<application-id>_<version> where <user.home> 
-		//    is unique for each local user, and <application-id> is the one 
-		//    defined in .eclipseproduct marker file. If .eclipseproduct does not
-		//    exist, use "eclipse" as the application-id.
-		URL installURL = getInstallLocation();
-		if (installURL == null)
-			return null;
-		File installDir = new File(installURL.getFile());
-		String appName = "." + ECLIPSE; //$NON-NLS-1$
-		File eclipseProduct = new File(installDir, PRODUCT_SITE_MARKER);
-		if (eclipseProduct.exists()) {
-			Properties props = new Properties();
-			try {
-				props.load(new FileInputStream(eclipseProduct));
-				String appId = props.getProperty(PRODUCT_SITE_ID);
-				if (appId == null || appId.trim().length() == 0)
-					appId = ECLIPSE;
-				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
-				if (appVersion == null || appVersion.trim().length() == 0)
-					appVersion = ""; //$NON-NLS-1$
-				appName += File.separator + appId + "_" + appVersion; //$NON-NLS-1$
-			} catch (IOException e) {
-				// Do nothing if we get an exception.  We will default to a standard location 
-				// in the user's home dir.
-			}
-		}
-		String userHome = System.getProperty(PROP_USER_HOME);
-		return new File(userHome, appName + "/" + pathAppendage).getAbsolutePath(); //$NON-NLS-1$
-	}
-
-	/**
-	 * Runs this launcher with the arguments specified in the given string.
-	 * 
-	 * @param argString the arguments string
-	 */
-	public static void main(String argString) {
-		Vector list = new Vector(5);
-		for (StringTokenizer tokens = new StringTokenizer(argString, " "); tokens.hasMoreElements();) //$NON-NLS-1$
-			list.addElement(tokens.nextElement());
-		main((String[]) list.toArray(new String[list.size()]));
-	}
-
-	/**
-	 * 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>.
-	 * </p>
-	 * 
-	 * @param args the command line arguments
-	 * @see #run(String[])
-	 */
-	public static void main(String[] args) {
-		int result = new Main().run(args);
-		System.exit(result);
-	}
-
-	/**
-	 * Runs the platform with the given arguments.  The arguments must identify
-	 * an application to run (e.g., <code>-application com.example.application</code>).
-	 * Returns 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.
-	 *
-	 * @param args the command line arguments
-	 */
-	public int run(String[] args) {
-		int result = 0;
-		try {
-			basicRun(args);
-			String exitCode = System.getProperty(PROP_EXITCODE);
-			try {
-				result = exitCode == null ? 0 : Integer.parseInt(exitCode);
-			} catch (NumberFormatException e) {
-				result = 17;
-			}
-		} catch (Throwable e) {
-			// try and take down the splash screen.
-			takeDownSplash();
-			// only log the exceptions if they have not been caught by the 
-			// EclipseStarter (i.e., if the exitCode is not 13) 
-			if (!"13".equals(System.getProperty(PROP_EXITCODE))) { //$NON-NLS-1$
-				log("Exception launching the Eclipse Platform:"); //$NON-NLS-1$
-				log(e);
-				String message = "An error has occurred"; //$NON-NLS-1$
-				if (logFile == null)
-					message += " and could not be logged: \n" + e.getMessage(); //$NON-NLS-1$
-				else
-					message += ".  See the log file\n" + logFile.getAbsolutePath(); //$NON-NLS-1$
-				System.getProperties().put(PROP_EXITDATA, message);
-			}
-			// 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.
-			result = 13;
-		}
-		// Return an int exit code and ensure the system property is set.
-		System.getProperties().put(PROP_EXITCODE, Integer.toString(result));
-		setExitData();
-		return result;
-	}
-
-	private void setExitData() {
-		String data = System.getProperty(PROP_EXITDATA);
-		if (exitData == null || data == null)
-			return;
-		runCommand(exitData, data, " " + EXITDATA); //$NON-NLS-1$
-	}
-
-	/**
-	 * Processes the command line arguments.  The general principle is to NOT
-	 * consume the arguments and leave them to be processed by Eclipse proper.
-	 * There are a few args which are directed towards main() and a few others which
-	 * we need to know about.  Very few should actually be consumed here.
-	 * 
-	 * @return the arguments to pass through to the launched application
-	 * @param args the command line arguments
-	 */
-	protected String[] processCommandLine(String[] args) {
-		if (args.length == 0)
-			return args;
-		int[] configArgs = new int[args.length];
-		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;
-			}
-
-			// look for and consume the nosplash directive.  This supercedes any
-			// -showsplash command that might be present.
-			if (args[i].equalsIgnoreCase(NOSPLASH)) {
-				splashDown = true;
-				found = true;
-			}
-
-			// check if this is initialization pass
-			if (args[i].equalsIgnoreCase(INITIALIZE)) {
-				initialize = 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;
-			}
-
-			// look for the VM args arg.  We have to do that before looking to see
-			// if the next element is a -arg as the thing following -vmargs may in
-			// fact be another -arg.
-			if (args[i].equalsIgnoreCase(VMARGS)) {
-				// consume the -vmargs arg itself
-				args[i] = null;
-				i++;
-				vmargs = new String[args.length - i];
-				for (int j = 0; i < args.length; i++) {
-					vmargs[j++] = args[i];
-					args[i] = null;
-				}
-				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 development mode and class path entries.  
-			if (args[i - 1].equalsIgnoreCase(DEV)) {
-				inDevelopmentMode = true;
-				devClassPath = processDevArg(arg);
-				continue;
-			}
-
-			// look for the framework to run
-			if (args[i - 1].equalsIgnoreCase(FRAMEWORK)) {
-				framework = arg;
-				found = true;
-			}
-
-			// look for explicitly set install root
-			// Consume the arg here to ensure that the launcher and Eclipse get the 
-			// same value as each other.  
-			if (args[i - 1].equalsIgnoreCase(INSTALL)) {
-				System.getProperties().put(PROP_INSTALL_AREA, arg);
-				found = true;
-			}
-
-			// look for the configuration to use.  
-			// Consume the arg here to ensure that the launcher and Eclipse get the 
-			// same value as each other.  
-			if (args[i - 1].equalsIgnoreCase(CONFIGURATION)) {
-				System.getProperties().put(PROP_CONFIG_AREA, arg);
-				found = true;
-			}
-
-			// look for the command to use to set exit data in the launcher
-			if (args[i - 1].equalsIgnoreCase(EXITDATA)) {
-				exitData = arg;
-				found = true;
-			}
-
-			// look for the command to use to show the splash screen
-			if (args[i - 1].equalsIgnoreCase(SHOWSPLASH)) {
-				showSplash = arg;
-				found = true;
-			}
-
-			// look for the command to use to end the splash screen
-			if (args[i - 1].equalsIgnoreCase(ENDSPLASH)) {
-				endSplash = arg;
-				found = true;
-			}
-
-			// look for the VM location arg
-			if (args[i - 1].equalsIgnoreCase(VM)) {
-				vm = 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 - (vmargs == null ? 0 : vmargs.length + 1)];
-		configArgIndex = 0;
-		int j = 0;
-		for (int i = 0; i < args.length; i++) {
-			if (i == configArgs[configArgIndex])
-				configArgIndex++;
-			else if (args[i] != null)
-				passThruArgs[j++] = args[i];
-		}
-		return passThruArgs;
-	}
-
-	private String processDevArg(String arg) {
-		if (arg == null)
-			return null;
-		try {
-			URL location = new URL(arg);
-			Properties props = load(location, null);
-			String result = props.getProperty(OSGI);
-			return result == null ? props.getProperty("*") : result; //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			// the arg was not a URL so use it as is.
-			return arg;
-		} catch (IOException e) {
-			// TODO consider logging here
-			return null;
-		}
-	}
-
-	private URL getConfigurationLocation() {
-		if (configurationLocation != null)
-			return configurationLocation;
-		configurationLocation = buildLocation(PROP_CONFIG_AREA, null, CONFIG_DIR);
-		if (configurationLocation == null)
-			configurationLocation = buildURL(computeDefaultConfigurationLocation(), true);
-		if (configurationLocation != null)
-			System.getProperties().put(PROP_CONFIG_AREA, configurationLocation.toExternalForm());
-		if (debug)
-			System.out.println("Configuration location:\n    " + configurationLocation); //$NON-NLS-1$
-		return configurationLocation;
-	}
-
-	private void processConfiguration() {
-		// if the configuration area is not already defined, discover the config area by
-		// trying to find a base config area.  This is either defined in a system property or
-		// is computed relative to the install location.
-		// Note that the config info read here is only used to determine a value 
-		// for the user configuration area
-		URL baseConfigurationLocation = null;
-		Properties baseConfiguration = null;
-		if (System.getProperty(PROP_CONFIG_AREA) == null) {
-			String baseLocation = System.getProperty(PROP_BASE_CONFIG_AREA);
-			if (baseLocation != null)
-				// here the base config cannot have any symbolic (e..g, @xxx) entries.  It must just
-				// point to the config file.
-				baseConfigurationLocation = buildURL(baseLocation, true);
-			if (baseConfigurationLocation == null)
-				try {
-					// here we access the install location but this is very early.  This case will only happen if
-					// the config area is not set and the base config area is not set (or is bogus).
-					// In this case we compute based on the install location.
-					baseConfigurationLocation = new URL(getInstallLocation(), CONFIG_DIR);
-				} catch (MalformedURLException e) {
-					// leave baseConfigurationLocation null
-				}
-			baseConfiguration = loadConfiguration(baseConfigurationLocation);
-			if (baseConfiguration != null) {
-				// if the base sets the install area then use that value if the property.  We know the 
-				// property is not already set.
-				String location = baseConfiguration.getProperty(PROP_CONFIG_AREA);
-				if (location != null)
-					System.getProperties().put(PROP_CONFIG_AREA, location);
-				// if the base sets the install area then use that value if the property is not already set.
-				// This helps in selfhosting cases where you cannot easily compute the install location
-				// from the code base.
-				location = baseConfiguration.getProperty(PROP_INSTALL_AREA);
-				if (location != null && System.getProperty(PROP_INSTALL_AREA) == null)
-					System.getProperties().put(PROP_INSTALL_AREA, location);
-			}
-		}
-
-		// Now we know where the base configuration is supposed to be.  Go ahead and load
-		// it and merge into the System properties.  Then, if cascaded, read the parent configuration
-		// Note that the parent may or may not be the same parent as we read above since the 
-		// base can define its parent.  The first parent we read was either defined by the user
-		// on the command line or was the one in the install dir.  
-		// if the config or parent we are about to read is the same as the base config we read above,
-		// just reuse the base
-		Properties configuration = baseConfiguration;
-		if (configuration == null || !getConfigurationLocation().equals(baseConfigurationLocation.toExternalForm()))
-			configuration = loadConfiguration(getConfigurationLocation());
-		mergeProperties(System.getProperties(), configuration);
-		if ("false".equalsIgnoreCase(System.getProperty(PROP_CONFIG_CASCADED))) //$NON-NLS-1$
-			// if we are not cascaded then remove the parent property even if it was set.
-			System.getProperties().remove(PROP_SHARED_CONFIG_AREA);
-		else {
-			URL sharedConfigURL = buildLocation(PROP_SHARED_CONFIG_AREA, null, CONFIG_DIR);
-			if (sharedConfigURL == null)
-				try {
-					// there is no shared config value so compute one
-					sharedConfigURL = new URL(getInstallLocation(), CONFIG_DIR);
-				} catch (MalformedURLException e) {
-					// leave sharedConfigurationLocation null
-				}
-			// if the parent location is different from the config location, read it too.
-			if (sharedConfigURL != null) {
-				if (sharedConfigURL.equals(getConfigurationLocation()))
-					// remove the property to show that we do not have a parent.
-					System.getProperties().remove(PROP_SHARED_CONFIG_AREA);
-				else {
-					// if the parent we are about to read is the same as the base config we read above,
-					// just reuse the base
-					configuration = baseConfiguration;
-					if (!sharedConfigURL.equals(baseConfigurationLocation))
-						configuration = loadConfiguration(sharedConfigURL);
-					mergeProperties(System.getProperties(), configuration);
-					System.getProperties().put(PROP_SHARED_CONFIG_AREA, sharedConfigURL.toExternalForm());
-					if (debug)
-						System.out.println("Shared configuration location:\n    " + sharedConfigURL.toExternalForm()); //$NON-NLS-1$
-				}
-			}
-		}
-		// setup the path to the framework
-		String urlString = System.getProperty(PROP_FRAMEWORK, null);
-		if (urlString != null) {
-			URL url = buildURL(urlString, true);
-			System.getProperties().put(PROP_FRAMEWORK, url.toExternalForm());
-			bootLocation = resolve(urlString);
-		}
-	}
-
-	/**
-	 * Returns url of the location this class was loaded from
-	 */
-	private URL getInstallLocation() {
-		if (installLocation != null)
-			return installLocation;
-
-		// value is not set so compute the default and set the value
-		String installArea = System.getProperty(PROP_INSTALL_AREA);
-		if (installArea != null) {
-			installLocation = buildURL(installArea, true);
-			if (installLocation == null)
-				throw new IllegalStateException("Install location is invalid: " + installArea); //$NON-NLS-1$
-			System.getProperties().put(PROP_INSTALL_AREA, installLocation.toExternalForm());
-			if (debug)
-				System.out.println("Install location:\n    " + installLocation); //$NON-NLS-1$
-			return installLocation;
-		}
-
-		URL result = Main.class.getProtectionDomain().getCodeSource().getLocation();
-		String path = decode(result.getFile());
-		// normalize to not have leading / so we can check the form
-		File file = new File(path);
-		path = file.toString().replace('\\', '/');
-		// TODO need a better test for windows
-		// If on Windows then canonicalize the drive letter to be lowercase.
-		// remember that there may be UNC paths 
-		if (File.separatorChar == '\\')
-			if (Character.isUpperCase(path.charAt(0))) {
-				char[] chars = path.toCharArray();
-				chars[0] = Character.toLowerCase(chars[0]);
-				path = new String(chars);
-			}
-		if (path.endsWith(".jar")) //$NON-NLS-1$
-			path = path.substring(0, path.lastIndexOf("/") + 1); //$NON-NLS-1$
-		try {
-			try {
-				// create a file URL (via File) to normalize the form (e.g., put 
-				// the leading / on if necessary)
-				path = new File(path).toURL().getFile();
-			} catch (MalformedURLException e1) {
-				// will never happen.  The path is straight from a URL.  
-			}
-			installLocation = new URL(result.getProtocol(), result.getHost(), result.getPort(), path);
-			System.getProperties().put(PROP_INSTALL_AREA, installLocation.toExternalForm());
-		} catch (MalformedURLException e) {
-			// TODO Very unlikely case.  log here.  
-		}
-		if (debug)
-			System.out.println("Install location:\n    " + installLocation); //$NON-NLS-1$
-		return installLocation;
-	}
-
-	/*
-	 * Load the given configuration file
-	 */
-	private Properties loadConfiguration(URL url) {
-		Properties result = null;
-		try {
-			url = new URL(url, CONFIG_FILE);
-		} catch (MalformedURLException e) {
-			return null;
-		}
-		try {
-			if (debug)
-				System.out.print("Configuration file:\n    " + url.toString()); //$NON-NLS-1$
-			result = loadProperties(url);
-			if (debug)
-				System.out.println(" loaded"); //$NON-NLS-1$
-		} catch (IOException e) {
-			if (debug)
-				System.out.println(" not found or not read"); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	private Properties loadProperties(URL url) throws IOException {
-		// try to load saved configuration file (watch for failed prior save())
-		if (url == null)
-			return null;
-		Properties result = null;
-		IOException originalException = null;
-		try {
-			result = load(url, null); // try to load config file
-		} catch (IOException e1) {
-			originalException = e1;
-			try {
-				result = load(url, CONFIG_FILE_TEMP_SUFFIX); // check for failures on save
-			} catch (IOException e2) {
-				try {
-					result = load(url, CONFIG_FILE_BAK_SUFFIX); // check for failures on save
-				} catch (IOException e3) {
-					throw originalException; // we tried, but no config here ...
-				}
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * 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 (!PROP_EOF.equals(props.getProperty(PROP_EOF)))
-				throw new IOException("Incomplete configuration file: " + url.toExternalForm()); //$NON-NLS-1$
-		} finally {
-			if (is != null)
-				try {
-					is.close();
-				} catch (IOException e) {
-					//ignore failure to close
-				}
-		}
-		return props;
-	}
-
-	/*
-	 * 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[] defaultPath) {
-		// run without splash if we are initializing or nosplash 
-		// was specified (splashdown = true)
-		if (initialize || splashDown) {
-			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 location
-		String location = getSplashLocation(defaultPath);
-		if (debug)
-			System.out.println("Splash location:\n    " + location); //$NON-NLS-1$
-		if (location == null)
-			return;
-		showProcess = runCommand(showSplash, location, " " + SHOWSPLASH); //$NON-NLS-1$
-	}
-
-	private Process runCommand(String command, String data, String separator) {
-		// 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[] args = new String[(data != null ? 4 : 3)];
-		// get the executable part
-		int sIndex = 0;
-		int eIndex = command.indexOf(separator);
-		if (eIndex == -1)
-			return null; // invalid command
-		args[0] = command.substring(sIndex, eIndex);
-		// get the command part
-		sIndex = eIndex + 1;
-		eIndex = command.indexOf(" ", sIndex); //$NON-NLS-1$
-		if (eIndex == -1)
-			return null; // invalid command
-		args[1] = command.substring(sIndex, eIndex);
-
-		// get the magic arg part
-		args[2] = command.substring(eIndex + 1);
-
-		// add on our data
-		if (data != null)
-			args[3] = data;
-
-		Process result = null;
-		try {
-			result = Runtime.getRuntime().exec(args);
-		} catch (Exception e) {
-			log("Exception running command: " + command); //$NON-NLS-1$
-			log(e);
-		}
-		return result;
-	}
-
-	/*
-	 * take down the splash screen. Try both take-down methods just in case
-	 * (only one should ever be set)
-	 */
-	protected 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.  First search the defined splash path.
-	 * If that does not work, look for a default splash.  Currently the splash must be in the file system
-	 * so the return value here is the file system path.
-	 */
-	private String getSplashLocation(URL[] bootPath) {
-		String result = System.getProperty(PROP_SPLASHLOCATION);
-		if (result != null)
-			return result;
-		String splashPath = System.getProperty(PROP_SPLASHPATH);
-		if (splashPath != null) {
-			String[] entries = getArrayFromList(splashPath);
-			ArrayList path = new ArrayList(entries.length);
-			for (int i = 0; i < entries.length; i++) {
-				String entry = resolve(entries[i]);
-				if (entry == null || entry.startsWith(FILE_SCHEME)) {
-					File entryFile = new File(entry.substring(5).replace('/', File.separatorChar));
-					entry = searchFor(entryFile.getName(), entryFile.getParent());
-					if (entry != null)
-						path.add(entry);
-				} else
-					log("Invalid splash path entry: " + entries[i]); //$NON-NLS-1$
-			}
-			// see if we can get a splash given the splash path
-			result = searchForSplash((String[]) path.toArray(new String[path.size()]));
-			if (result != null) {
-				System.getProperties().put(PROP_SPLASHLOCATION, result);
-				return result;
-			}
-		}
-
-		// can't find it on the splashPath so look for a default splash
-		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);
-				result = searchForSplash(new String[] {temp});
-				if (result != null)
-					System.getProperties().put(PROP_SPLASHLOCATION, result);
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * Do a locale-sensitive lookup of splash image
-	 */
-	private String searchForSplash(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 result = new File(path);
-				if (result.exists())
-					return result.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;
-	}
-
-	/*
-	 * resolve platform:/base/ URLs
-	 */
-	private String resolve(String urlString) {
-		// handle the case where people mistakenly spec a refererence: url.
-		if (urlString.startsWith("reference:")) { //$NON-NLS-1$
-			urlString = urlString.substring(10);
-			System.getProperties().put(PROP_FRAMEWORK, urlString);
-		}
-		if (urlString.startsWith(PLATFORM_URL)) {
-			String path = urlString.substring(PLATFORM_URL.length());
-			return getInstallLocation() + path;
-		} else
-			return urlString;
-	}
-
-	/*
-	 * Entry point for logging.
-	 */
-	private synchronized void log(Object obj) {
-		if (obj == null)
-			return;
-		try {
-			openLogFile();
-			try {
-				if (newSession) {
-					log.write(SESSION);
-					log.write(' ');
-					String timestamp = new Date().toString();
-					log.write(timestamp);
-					log.write(' ');
-					for (int i = SESSION.length() + timestamp.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 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 void computeLogFileLocation() {
-		String logFileProp = System.getProperty(PROP_LOGFILE);
-		if (logFileProp != null) {
-			if (logFile == null || !logFileProp.equals(logFile.getAbsolutePath())) {
-				logFile = new File(logFileProp);
-				logFile.getParentFile().mkdirs();
-			}
-			return;
-		}
-
-		// compute the base location and then append the name of the log file
-		URL base = buildURL(System.getProperty(PROP_CONFIG_AREA), false);
-		if (base == null)
-			return;
-		logFile = new File(base.getPath(), Long.toString(System.currentTimeMillis()) + ".log"); //$NON-NLS-1$
-		logFile.getParentFile().mkdirs();
-		System.setProperty(PROP_LOGFILE, logFile.getAbsolutePath());
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-		}
-	}
-
-	private 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 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 void closeLogFile() throws IOException {
-		try {
-			if (log != null) {
-				log.flush();
-				log.close();
-			}
-		} finally {
-			log = null;
-		}
-	}
-
-	private void mergeProperties(Properties destination, Properties source) {
-		if (destination == null || source == null)
-			return;
-		for (Enumeration e = source.keys(); e.hasMoreElements();) {
-			String key = (String) e.nextElement();
-			if (!key.equals(PROP_EOF)) {
-				String value = source.getProperty(key);
-				if (destination.getProperty(key) == null)
-					destination.put(key, value);
-			}
-		}
-	}
-
-	private void setupVMProperties() {
-		if (vm != null)
-			System.getProperties().put(PROP_VM, vm);
-		setMultiValueProperty(PROP_VMARGS, vmargs);
-		setMultiValueProperty(PROP_COMMANDS, commands);
-	}
-
-	private void setMultiValueProperty(String property, String[] value) {
-		if (value != null) {
-			StringBuffer result = new StringBuffer(300);
-			for (int i = 0; i < value.length; i++) {
-				if (value[i] != null) {
-					result.append(value[i]);
-					result.append('\n');
-				}
-			}
-			System.getProperties().put(property, result.toString());
-		}
-	}
-}
\ No newline at end of file

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 26eb707..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.ide"  class="org.eclipse.ui.actions.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/platform/org.eclipse.sdk/.project b/platform/org.eclipse.sdk/.project
deleted file mode 100644
index 2e498c2..0000000
--- a/platform/org.eclipse.sdk/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.sdk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/platform/org.eclipse.sdk/about.html b/platform/org.eclipse.sdk/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/platform/org.eclipse.sdk/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.sdk/about.ini b/platform/org.eclipse.sdk/about.ini
deleted file mode 100644
index 42c1189..0000000
--- a/platform/org.eclipse.sdk/about.ini
+++ /dev/null

@@ -1,31 +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)

-aboutText=%blurb

-

-# Property "windowImage" contains path to window icon (16x16)

-# needed for primary features only

-

-# Property "featureImage" contains path to feature image (32x32)

-featureImage=eclipse32.gif

-

-# Property "aboutImage" contains path to product image (500x330 or 115x164)

-# needed for primary features only

-

-# Property "appName" contains name of the application (translated)

-# needed for primary features only

-

-# Property "welcomePage" contains path to welcome page (special XML-based format)

-# optional

-

-# Property "welcomePerspective" contains the id of the perspective in which the

-# welcome page is to be opened.

-# optional

-

-

-

-


diff --git a/platform/org.eclipse.sdk/about.mappings b/platform/org.eclipse.sdk/about.mappings
deleted file mode 100644
index 720ca87..0000000
--- a/platform/org.eclipse.sdk/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.sdk/about.properties b/platform/org.eclipse.sdk/about.properties
deleted file mode 100644
index b1489ff..0000000
--- a/platform/org.eclipse.sdk/about.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-# 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.
-
-blurb=Eclipse Project SDK\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/eclipse
-

diff --git a/platform/org.eclipse.sdk/build.properties b/platform/org.eclipse.sdk/build.properties
deleted file mode 100644
index 043a4f2..0000000
--- a/platform/org.eclipse.sdk/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-bin.includes=\
-about.html,\
-about.ini,\
-about.mappings,\
-about.properties,\
-eclipse32.gif,\
-plugin.xml,\
-plugin.properties

diff --git a/platform/org.eclipse.sdk/eclipse32.gif b/platform/org.eclipse.sdk/eclipse32.gif
deleted file mode 100644
index f71a8f6..0000000
--- a/platform/org.eclipse.sdk/eclipse32.gif
+++ /dev/null
Binary files differ

diff --git a/platform/org.eclipse.sdk/plugin.properties b/platform/org.eclipse.sdk/plugin.properties
deleted file mode 100644
index 65ece4d..0000000
--- a/platform/org.eclipse.sdk/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-pluginName=Eclipse Project SDK
-providerName=Eclipse.org
-
-activity.java=Java Development
-activity.java.desc=Grants the ability to develop Java applications.
-activity.plugin=Plug-in Development
-activity.plugin.desc=Grants the ability to develop plug-ins, fragments, and features.
-activity.cat.java=Java
-activity.cat.java.desc=Activities related to Java development.
-activity.cat.plugin=Plug-in Development
-activity.cat.plugin.desc=Activities related to plug-in development.
-
-
-

diff --git a/platform/org.eclipse.sdk/plugin.xml b/platform/org.eclipse.sdk/plugin.xml
deleted file mode 100644
index c20adf1..0000000
--- a/platform/org.eclipse.sdk/plugin.xml
+++ /dev/null

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.sdk"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName">
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            name="%activity.java"
-            description="%activity.java.desc"
-            id="org.eclipse.javaDevelopment">
-      </activity>
-      <activity
-            name="%activity.plugin"
-            description="%activity.plugin.desc"
-            id="org.eclipse.plugInDevelopment">
-      </activity>
-      <activityPatternBinding
-            activityId="org.eclipse.javaDevelopment"
-            pattern="org.eclipse.jdt.debug/debugModel">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.javaDevelopment"
-            pattern="org\.eclipse\.jdt\..*/.*">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.javaDevelopment"
-            pattern="org\.eclipse\.jdt\.core/javanature">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.plugInDevelopment"
-            pattern="org\.eclipse\.pde\..*/.*">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.plugInDevelopment"
-            pattern="org\.eclipse\.pde/PluginNature">
-      </activityPatternBinding>
-      <category
-            name="%activity.cat.java"
-            description="%activity.cat.java.desc"
-            id="org.eclipse.categories.javaCategory">
-      </category>
-      <category
-            name="%activity.cat.plugin"
-            description="%activity.cat.plugin.desc"
-            id="org.eclipse.categories.pdeCategory">
-      </category>
-      <categoryActivityBinding
-            activityId="org.eclipse.javaDevelopment"
-            categoryId="org.eclipse.categories.javaCategory">
-      </categoryActivityBinding>
-      <categoryActivityBinding
-            activityId="org.eclipse.plugInDevelopment"
-            categoryId="org.eclipse.categories.pdeCategory">
-      </categoryActivityBinding>
-      <activityActivityBinding
-            childActivityId="org.eclipse.javaDevelopment"
-            parentActivityId="org.eclipse.plugInDevelopment">
-      </activityActivityBinding>
-      <defaultEnablement
-            id="org.eclipse.javaDevelopment">
-      </defaultEnablement>
-      <defaultEnablement
-            id="org.eclipse.plugInDevelopment">
-      </defaultEnablement>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <primaryWizard
-            id="org.eclipse.jdt.ui.wizards.JavaProjectWizard">
-      </primaryWizard>
-      <primaryWizard
-            id="org.eclipse.pde.ui.NewProjectWizard">
-      </primaryWizard>
-      <primaryWizard
-            id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
-      </primaryWizard>
-      <primaryWizard
-            id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
-      </primaryWizard>
-      <primaryWizard
-            id="org.eclipse.pde.ui.NewSchemaFileWizard">
-      </primaryWizard>
-   </extension>
-
-</plugin>

diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java
index 6653dad..d749c1a 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java

@@ -157,7 +157,7 @@
 			featureElement.setAttribute(CFG_FEATURE_ENTRY_VERSION, version); 
 		if (pluginVersion != null && !pluginVersion.equals(version) && pluginVersion.length() > 0)
 			featureElement.setAttribute(CFG_FEATURE_ENTRY_PLUGIN_VERSION, pluginVersion); 
-		if (pluginIdentifier != null && pluginIdentifier.equals(id) && pluginIdentifier.length() > 0)
+		if (pluginIdentifier != null && !pluginIdentifier.equals(id) && pluginIdentifier.length() > 0)
 			featureElement.setAttribute(CFG_FEATURE_ENTRY_PLUGIN_IDENTIFIER, pluginIdentifier);
 		if (application != null)
 			featureElement.setAttribute(CFG_FEATURE_ENTRY_APPLICATION, application);

diff --git a/update/org.eclipse.update.core.linux/.classpath b/update/org.eclipse.update.core.linux/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/update/org.eclipse.update.core.linux/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-	<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 178e2b7..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.eclipse.core.boot</project>

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

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

-		<project>org.eclipse.update.configurator</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 68d414f..0000000
--- a/update/org.eclipse.update.core.linux/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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
-src.includes = src/,\
-               fragment.xml,\
-               about.html

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 6740684..0000000
--- a/update/org.eclipse.update.core.linux/fragment.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.update.core.linux"
-   name="%fragmentNameLinux"
-   version="3.0.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.update.core"
-   plugin-version="3.0.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 ace0b9e..0000000
--- a/update/org.eclipse.update.core.linux/src/build.xml
+++ /dev/null

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="*.c"/>
-      <mapper type="glob" from="*.c" 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.c b/update/org.eclipse.update.core.linux/src/update.c
deleted file mode 100644
index 2acb3a4..0000000
--- a/update/org.eclipse.update.core.linux/src/update.c
+++ /dev/null

@@ -1,162 +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;

-

-	cls = (*jnienv) -> GetObjectClass(jnienv, file);

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

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

-	lpDirectoryName = (*jnienv) -> GetStringUTFChars(jnienv, (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(jnienv, file);

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

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

-	lpDirectoryName = (*jnienv) -> GetStringUTFChars(jnienv, (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(jnienv, file);

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

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

-	lpDirectoryName = (*jnienv) -> GetStringUTFChars(jnienv, (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(jnienv, "java/lang/String");

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

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

-

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

-	returnArray = NULL;

-

-	int i;

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

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

-

-		str = (*jnienv) -> NewStringUTF(jnienv, driveName);

-		(*jnienv) -> SetObjectArrayElement(jnienv, 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/.project b/update/org.eclipse.update.core.win32/.project
deleted file mode 100644
index 8c9b28f..0000000
--- a/update/org.eclipse.update.core.win32/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<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.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 99cd557..0000000
--- a/update/org.eclipse.update.core.win32/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.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
-src.includes = fragment.xml,\
-               about.html,\
-               src/

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 81d8e7b..0000000
--- a/update/org.eclipse.update.core.win32/fragment.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.update.core.win32"
-   name="%fragmentNameWin"
-   version="3.0.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.update.core"
-   plugin-version="3.0.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 92286b7..0000000
--- a/update/org.eclipse.update.core.win32/src/build.xml
+++ /dev/null

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.core/.classpath b/update/org.eclipse.update.core/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/update/org.eclipse.update.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

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

-</classpath>


diff --git a/update/org.eclipse.update.core/.cvsignore b/update/org.eclipse.update.core/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.core/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/.options b/update/org.eclipse.update.core/.options
deleted file mode 100644
index 7bf6197..0000000
--- a/update/org.eclipse.update.core/.options
+++ /dev/null

@@ -1,9 +0,0 @@
-org.eclipse.update.core/debug=true

-org.eclipse.update.core/debug/warning=false

-org.eclipse.update.core/debug/parsing=false

-org.eclipse.update.core/debug/install=false

-org.eclipse.update.core/debug/configuration=false

-org.eclipse.update.core/debug/type=false

-org.eclipse.update.core/debug/web=false

-org.eclipse.update.core/debug/installhandler=false

-org.eclipse.update.core/debug/reconciler=false


diff --git a/update/org.eclipse.update.core/.project b/update/org.eclipse.update.core/.project
deleted file mode 100644
index 4a0c6a2..0000000
--- a/update/org.eclipse.update.core/.project
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

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

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

-		<project>org.eclipse.update.configurator</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/Scrapbook.jpage b/update/org.eclipse.update.core/Scrapbook.jpage
deleted file mode 100644
index c2633ae..0000000
--- a/update/org.eclipse.update.core/Scrapbook.jpage
+++ /dev/null

@@ -1,431 +0,0 @@
-		java.util.Enumeration enum =  System.getProperties().keys();

-		String key = null;

-		while (enum.hasMoreElements()){

-			key = (String)enum.nextElement();

-			System.out.print(key);

-			for (int i =0;i<(30-key.length());i++)System.out.print(" ");

-			System.out.println("->"+System.getProperty(key));

-		}

-

-

-new java.net.URL("file://C:/temp/org.eclipse.update.core.feature1_1.0.0/org.eclipse.update.core.feature1.plugin1_1.1.1.jar").openStream()

-

-(new java.io.File("C:\\chris chris\hello\\")).mkdirs();

-

-java.net.URL a =  new java.net.URL("http","www.oti.com","/feature/blah.jar");

-java.net.URL b =  new java.net.URL("jar",null,a.toExternalForm()+"!/hello.txt");

-b

-

-new java.net.URL("file",null,System.getProperty("java.io.tmpdir"));

-new java.net.URL("file",null,System.getProperty("user.home"));

-

-String tempDir = "c:\\TEMP\\features2.jar";

-java.net.URL TEMP_SITE = new java.net.URL("file",null,tempDir);

-java.net.URL file = new java.net.URL("jar",null,TEMP_SITE.toExternalForm()+"!/feature.xml");

-file.openStream();

-file

-

-java.io.File f =  new java.io.File("c:\\temp\\xtf\\file.jar");

-f.mkdirs()

-

-java.util.Locale.getDefault()

-java.util.ResourceBundle

-

-java.net.URL url = new java.net.URL("file",null,"C:\\path"+java.io.File.separator);

-url.getPath().endsWith("/");

-url

-

-java.net.URL url = new java.net.URL("http://machine:8080/path space/file.abc#hello");

-java.net.URL url2 = new java.net.URL(url,"/ ");

-url2.getPath()

-

-java.lang.ClassLoader l = new java.net.URLClassLoader(new java.net.URL[] {new java.net.URL("file",null,"c:\\oti\\wsw205\\eclipse\\install\\features\\org.eclipse.help.feature_1.0.4/") }, null);

-java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("feature", java.util.Locale.getDefault(), l);

-bundle

-

-String[] ss = {"a", "b"}; 

-java.util.List list = new java.util.ArrayList(0);

-list.addAll(java.util.Arrays.asList(ss)); 

-list.add("c");

-list.size();

-

-java.util.List list = new java.util.ArrayList(0);

-list.add("1");

-list.add("2");

-list.add("3");

-list.add("4");

-list.add("5");

-list.add("6");

-list.add("7");

-while (list.size()>5){

-	list.remove(0);

-}

-list.get(0)

-

-

-org.eclipse.update.internal.security.KeyStores k = new org.eclipse.update.internal.security.KeyStores();

-while (k.hasNext()){

-	org.eclipse.update.internal.security.KeystoreHandle handle = (org.eclipse.update.internal.security.KeystoreHandle) k.next();

-	System.out.println("KeyStore:"+handle.getLocation()+":"+handle.getType());

-}

-

-int i = (13/3);

-i

-

-*****************************************

-OLD Feature Code

-

-

-	/**

-	 */

-	private void downloadArchivesLocally(ISite tempSite, String[] archiveIDToInstall, IProgressMonitor monitor) throws CoreException, IOException {

-

-		URL sourceURL;

-		String newFile;

-		URL newURL;

-

-		if (monitor != null) {

-			monitor.beginTask("Download archives bundles to Temporary Space", archiveIDToInstall.length);

-		}

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

-

-			// transform the id by asking the site to map them to real URL inside the SITE

-			if (getSite() != null) {

-				sourceURL = getSite().getSiteContentProvider().getArchivesReferences(archiveIDToInstall[i]);

-				if (monitor != null) {

-					monitor.subTask("..." + archiveIDToInstall[i]);

-				}

-				// the name of the file in the temp directory

-				// should be the regular plugins/pluginID_ver as the Temp site is OUR site

-				newFile = Site.DEFAULT_PLUGIN_PATH + archiveIDToInstall[i];

-				newURL = UpdateManagerUtils.resolveAsLocal(sourceURL, newFile, monitor);

-

-				// transfer the possible mapping to the temp site						

-				 ((Site) tempSite).addArchive(new URLEntry(archiveIDToInstall[i], newURL));

-				if (monitor != null) {

-					monitor.worked(1);

-					if (monitor.isCanceled()) {

-						throw CANCEL_EXCEPTION;

-					}

-				}

-			}

-		}

-

-		// the site of this feature now becomes the TEMP directory

-		// FIXME: make sure there is no other issue

-		// like asking for stuff that hasn't been copied

-		// or reusing this feature

-		// of having an un-manageable temp site

-

-		this.setSite(tempSite);

-

-	}

-

-	/**

-	 */

-	private void downloadDataLocally(IFeature targetFeature, INonPluginEntry[] dataToInstall, IProgressMonitor monitor) throws CoreException, IOException {

-

-		URL sourceURL;

-		// any other data

-		INonPluginEntry[] entries = getNonPluginEntries();

-		if (entries != null) {

-			if (monitor != null) {

-				monitor.beginTask("Installing Other Data information", dataToInstall.length);

-				if (monitor.isCanceled()) {

-					throw CANCEL_EXCEPTION;

-				}

-			}

-

-			for (int j = 0; j < entries.length; j++) {

-				String name = dataToInstall[j].getIdentifier();

-				if (monitor != null) {

-					monitor.subTask("..." + name);

-				}

-

-				// the id is URL format with "/"

-				String dataEntryId = Site.DEFAULT_FEATURE_PATH + getIdentifier().toString() + "/" + name;

-				// transform the id by asking the site to map them to real URL inside the SITE

-				if (getSite() != null) {

-					sourceURL = getSite().getSiteContentProvider().getArchivesReferences(dataEntryId);

-					((Site) targetFeature.getSite()).storeFeatureInfo(getIdentifier(), name, sourceURL.openStream());

-					if (monitor != null) {

-						monitor.worked(1);

-						if (monitor.isCanceled()) {

-							throw CANCEL_EXCEPTION;

-						}

-					}

-				}// getSite==null

-			}

-		}

-	}

-	

-	

-		/**

-		 * Method install.

-		 * @param targetFeature

-		 * @param monitor

-		 * @throws CoreException

-		 */

-	public void old_install(IFeature targetFeature, IProgressMonitor monitor) throws CoreException {

-

-		IPluginEntry[] sourceFeaturePluginEntries = getPluginEntries();

-		IPluginEntry[] targetSitePluginEntries = targetFeature.getSite().getPluginEntries();

-		Site tempSite = (Site) SiteManager.getTempSite();

-

-		// determine list of plugins to install

-		// find the intersection between the two arrays of IPluginEntry...

-		// The one teh site contains and teh one the feature contains

-		IPluginEntry[] pluginsToInstall = intersection(sourceFeaturePluginEntries, targetSitePluginEntries);

-

-		// private abstract - Determine list of content references id /archives id /bundles id that 

-		// map the list of plugins to install

-		String[] archiveIDToInstall = getContentReferenceToInstall(pluginsToInstall);

-

-		try {

-			// download and install data bundles

-			// before we set the site of teh feature to the TEMP site

-			INonPluginEntry[] dataEntries = getNonPluginEntries();

-			if (dataEntries.length > 0) {

-				downloadDataLocally(targetFeature, dataEntries, monitor);

-			}

-

-			// optmization, may be private to implementation

-			// copy *blobs/content references/archives/bundles* in TEMP space

-			if (((Site) getSite()).optimize()) {

-				if (archiveIDToInstall != null) {

-					downloadArchivesLocally(tempSite, archiveIDToInstall, monitor);

-				}

-			}

-

-			// obtain the list of *Streamable Storage Unit*

-			// from the archive

-			if (monitor != null) {

-				int total = pluginsToInstall == null ? 1 : pluginsToInstall.length + 1;

-				monitor.beginTask("Install feature " + getLabel(), total);

-			}

-			if (pluginsToInstall != null) {

-				InputStream inStream = null;

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

-					if (monitor != null) {

-						monitor.subTask("Installing plug-in: " + pluginsToInstall[i]);

-						if (monitor.isCanceled()) {

-							throw CANCEL_EXCEPTION;

-						}

-					}

-

-					open(pluginsToInstall[i]);

-					String[] names = getStorageUnitNames(pluginsToInstall[i]);

-					if (names != null) {

-						for (int j = 0; j < names.length; j++) {

-							if ((inStream = getInputStreamFor(pluginsToInstall[i], names[j])) != null)

-								targetFeature.store(pluginsToInstall[i], names[j], inStream);

-						}

-					}

-					close(pluginsToInstall[i]);

-					if (monitor != null) {

-						monitor.worked(1);

-						if (monitor.isCanceled()) {

-							throw CANCEL_EXCEPTION;

-						}

-					}

-

-				}

-			}

-

-			// install the Feature info

-			InputStream inStream = null;

-			String[] names = getStorageUnitNames(this);

-			if (names != null) {

-				openFeature();

-				if (monitor != null) {

-					monitor.subTask("Installing Feature information");

-					if (monitor.isCanceled()) {

-						throw CANCEL_EXCEPTION;

-					}

-				}

-

-				for (int j = 0; j < names.length; j++) {

-					if ((inStream = getInputStreamFor(this, names[j])) != null)

-						 ((Site) targetFeature.getSite()).storeFeatureInfo(getIdentifier(), names[j], inStream);

-				}

-				closeFeature();

-				if (monitor != null) {

-					monitor.worked(1);

-					if (monitor.isCanceled()) {

-						throw CANCEL_EXCEPTION;

-					}

-				}

-

-			}

-

-		} catch (IOException e) {

-			String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();

-			IStatus status = new Status(IStatus.ERROR, id, IStatus.OK, "Error during Install", e);

-			throw new CoreException(status);

-		} finally {

-			//do not clean up TEMP drive

-			// as other feature may be there... clean up when exiting the plugin

-		}

-	}

-	

-	

-		/**

-	 * @see IPluginContainer#store(IPluginEntry, String, InputStream)

-	 */

-	public void store(IPluginEntry pluginEntry, String contentKey, InputStream inStream) throws CoreException {

-		// check if pluginEntry already exists before passing to the site

-		// anything else ?

-		boolean found = false;

-		int i = 0;

-		IPluginEntry[] entries = getPluginEntries();

-		while (i < entries.length && !found) {

-			if (entries[i].equals(pluginEntry)) {

-				found = true;

-			}

-			i++;

-		}

-		if (!found) {

-			String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();

-			IStatus status = new Status(IStatus.ERROR, id, IStatus.OK, "The plugin:" + pluginEntry.getIdentifier().toString() + " is not part of the plugins of the feature:" + this.getIdentifier().toString(), null);

-			throw new CoreException(status);

-		}

-		getSite().store(pluginEntry, contentKey, inStream);

-	}

-	

-		/**

-	 * perform pre processing before opening a plugin archive

-	 * @param entry the plugin about to be opened

-	 */

-	protected void open(IPluginEntry entry) {

-	};

-

-	/**

-	 * perform post processing to close a plugin archive

-	 * @param entry the plugin about to be closed

-	 */

-	protected void close(IPluginEntry entry) throws IOException {

-	};

-

-	/**

-	 * perform pre processing before opening the feature archive

-	 */

-	protected void openFeature() {

-	};

-

-	/**

-	 * perform post processing to close a feature archive

-	 */

-	public void closeFeature() throws IOException {

-	};

-	

-	

-		/**

-	 * return the list of FILE to be transfered for a Plugin

-	 */

-	protected abstract String[] getStorageUnitNames(IPluginEntry pluginEntry) throws CoreException;

-

-	/**

-	 * return the list of FILE to be transfered from within the Feature

-	 */

-	protected abstract String[] getStorageUnitNames(IFeature feature) throws CoreException;

-

-	/**

-	 * return the Stream of the FILE to be transfered for a Plugin

-	 */

-	protected abstract InputStream getInputStreamFor(IPluginEntry pluginEntry, String name) throws CoreException;

-

-	/**

-	 * return the Stream of FILE to be transfered from within the Feature

-	 */

-	protected abstract InputStream getInputStreamFor(IFeature feature, String name) throws IOException, CoreException;

-

-	/**

-	 * returns the list of archive to transfer/install

-	 * in order to install the list of plugins

-	 * 

-	 * @param pluginsToInstall list of plugin to install 

-	 */

-	protected abstract String[] getContentReferenceToInstall(IPluginEntry[] pluginsToInstall);

-	

-	

-		/**

-	 * remove myself...

-	 */

-	public void old_remove(IProgressMonitor monitor) throws CoreException {

-

-		// remove the feature and the plugins if they are not used and not activated

-

-		// get the plugins from the feature

-		IPluginEntry[] pluginsToRemove = ((SiteLocal) SiteManager.getLocalSite()).getDeltaPluginEntries(this);

-

-		try {

-

-			// obtain the list of *Streamable Storage Unit*

-			// from the archive

-			if (monitor != null) {

-				int total = pluginsToRemove == null ? 1 : pluginsToRemove.length + 1;

-				monitor.beginTask("Uninstall feature " + getLabel(), total);

-			}

-			if (pluginsToRemove != null) {

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

-					if (monitor != null) {

-						monitor.subTask("Removing plug-in: " + pluginsToRemove[i]);

-						if (monitor.isCanceled()) {

-							throw CANCEL_EXCEPTION;

-						}

-					}

-

-					remove(pluginsToRemove[i]);

-

-					if (monitor != null) {

-						monitor.worked(1);

-						if (monitor.isCanceled()) {

-							throw CANCEL_EXCEPTION;

-						}

-					}

-

-				}

-			}

-

-			// remove the Feature info

-			String[] names = getStorageUnitNames(this);

-			if (names != null) {

-				if (monitor != null) {

-					monitor.subTask("Removing Feature information");

-					if (monitor.isCanceled()) {

-						throw CANCEL_EXCEPTION;

-					}

-				}

-

-				((Site) this.getSite()).removeFeatureInfo(getIdentifier());

-

-				closeFeature();

-				if (monitor != null) {

-					monitor.worked(1);

-					if (monitor.isCanceled()) {

-						throw CANCEL_EXCEPTION;

-					}

-				}

-

-			}

-

-		} catch (IOException e) {

-			String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();

-			IStatus status = new Status(IStatus.ERROR, id, IStatus.OK, "Error during Uninstall", e);

-			throw new CoreException(status);

-		}

-	}

-	

-	System.getProperty("java.io.tmpdir")(java.lang.String) /tmp

-	

-	true^false

-	true^true

-

-	

-org.eclipse.core.runtime.IPath p1= (new org.eclipse.core.runtime.Path("/path1/path2/*.txt"));

-org.eclipse.core.runtime.IPath p2= (new org.eclipse.core.runtime.Path("/path1/path2/a.txt"));

-p1.equals(p2);

-

-

-org.eclipse.update.internal.core.URLEncoder.encode(new java.net.URL("http://www.ourwebsite.com/servlet/update?jar=somefeaturejarfile"));(java.net.URL) http://www.ourwebsite.com/servlet/update?jar=somefeaturejarfile

-


diff --git a/update/org.eclipse.update.core/about.html b/update/org.eclipse.update.core/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.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.core/build.properties b/update/org.eclipse.update.core/build.properties
deleted file mode 100644
index 8ee535c..0000000
--- a/update/org.eclipse.update.core/build.properties
+++ /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

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

-source.updatecore.jar = src/

-bin.includes = plugin.xml,\

-               plugin.properties,\

-               *.jar,\

-               about.html,\

-               .options,\

-               os/

-src.includes = about.html,\

-               schema/


diff --git a/update/org.eclipse.update.core/plugin.properties b/update/org.eclipse.update.core/plugin.properties
deleted file mode 100644
index ee432ef..0000000
--- a/update/org.eclipse.update.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= Install/Update Core

-providerName= Eclipse.org

-fragmentNameWin= Install/Update Core for Windows

-fragmentNameLinux= Install/Update Core for Linux

-

-


diff --git a/update/org.eclipse.update.core/plugin.xml b/update/org.eclipse.update.core/plugin.xml
deleted file mode 100644
index 198f3e3..0000000
--- a/update/org.eclipse.update.core/plugin.xml
+++ /dev/null

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin

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

-   name="%pluginName"

-   version="3.0.0"

-   provider-name="%providerName"

-   class="org.eclipse.update.internal.core.UpdateCore">

-

-   <runtime>

-      <library name="updatecore.jar">

-         <export name="*"/>

-         <packages prefixes="org.eclipse.update"/>

-      </library>

-   </runtime>

-   <requires>

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

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

-   </requires>

-

-

-   <extension-point id="featureTypes" name="Install/Update Concrete Feature Type Implementation Factory" schema="schema/featureTypes.exsd"/>

-   <extension-point id="siteTypes" name="Install/Update Concrete Site Type Implementation Factory" schema="schema/siteTypes.exsd"/>

-   <extension-point id="installHandlers" name="Install/Update Global Install Handlers" schema="schema/installHandlers.exsd"/>

-   <!-- The deltaHandler extension point is deprecated. Do not use it -->

-   <extension-point id="deltaHandler" name="Install/Update Delta Handler"/>

-

-   <extension

-         id="preferenceInitializer"

-         point="org.eclipse.core.runtime.preferences">

-      <initializer class="org.eclipse.update.internal.core.UpdatePreferencesInitializer"/>

-   </extension>

-

-   <extension

-         id="packaged"

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

-      <feature-factory

-            class="org.eclipse.update.internal.core.FeaturePackagedFactory">

-      </feature-factory>

-   </extension>

-   <extension

-         id="installed"

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

-      <feature-factory

-            class="org.eclipse.update.internal.core.FeatureExecutableFactory">

-      </feature-factory>

-   </extension>

-   <extension

-         id="http"

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

-      <site-factory

-            class="org.eclipse.update.internal.core.SiteURLFactory">

-      </site-factory>

-   </extension>

-   <extension

-         id="file"

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

-      <site-factory

-            class="org.eclipse.update.internal.core.SiteFileFactory">

-      </site-factory>

-   </extension>

-   <extension

-         id="DefaultInstallHandler"

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

-      <install-handler

-            class="org.eclipse.update.internal.core.DefaultInstallHandler">

-      </install-handler>

-   </extension>

-   <extension

-         id="DeltaInstallHandler"

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

-      <install-handler

-            class="org.eclipse.update.internal.core.DeltaInstallHandler">

-      </install-handler>

-   </extension>

-   <extension

-         id="standaloneUpdate"

-         point="org.eclipse.core.runtime.applications">

-      <application>

-         <run

-               class="org.eclipse.update.standalone.StandaloneUpdateApplication">

-         </run>

-      </application>

-   </extension>

-

-</plugin>


diff --git a/update/org.eclipse.update.core/preferences.ini b/update/org.eclipse.update.core/preferences.ini
deleted file mode 100644
index 7936e7f..0000000
--- a/update/org.eclipse.update.core/preferences.ini
+++ /dev/null

@@ -1,8 +0,0 @@
-# The port number on which the sever listens for http requests.
-# If the port is 0 and arbitrary port is picked by the system.
-
-# Defines the policy url that contains directives for redirecting 
-# updates to different update sites.
-#updatePolicyURL=
-
-

diff --git a/update/org.eclipse.update.core/schema/featureTypes.exsd b/update/org.eclipse.update.core/schema/featureTypes.exsd
deleted file mode 100644
index 7129a6a..0000000
--- a/update/org.eclipse.update.core/schema/featureTypes.exsd
+++ /dev/null

@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.update.core">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.update.core" id="featureTypes" name="Feature Type Factory"/>

-      </appInfo>

-      <documentation>

-         The platform update mechanism supports pluggable feature type
-implementations. A new feature type can be registered in order
-to support
-alternate packaging and verification schemes.
-&lt;p&gt;
-The &lt;code&gt;featureTypes&lt;/code&gt;
-extension point allows alternate feature implementations to be
-registered using a symbolic type identifier. Whenever the 
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete feature implementation.
-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="feature-factory" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  must be specified as &lt;b&gt;org.eclipse.update.core.featureTypes&lt;/b&gt;

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  must be specified. Identifies the new feature type

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  optional displayable label for the new feature type

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="feature-factory">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  fully qualified name of the factory class for the identified feature type

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.update.configuration.IInstallDeltaHandler"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of new feature type registration:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension
-      id=&quot;custom&quot;
-      point=&quot;org.eclipse.update.core.featureTypes&quot;
-      name=&quot;Custom packaged feature&quot;&gt;
-      &lt;feature-factory
-          class=&quot;com.xyz.update.CustomFeatureFactory&quot;&gt;
-      &lt;/feature-factory&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         Registered factory classes must implement 
-&lt;code&gt;&lt;b&gt;org.eclipse.update.core.IFeatureFactory&lt;/b&gt;&lt;/code&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         The platform supplies two standard implementations of feature
-types. One representing the default packaged feature type, and
-the other representing an installed feature type.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2002, 2003 IBM Corporation and others.
-All rights reserved.   This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;.

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/update/org.eclipse.update.core/schema/installHandlers.exsd b/update/org.eclipse.update.core/schema/installHandlers.exsd
deleted file mode 100644
index 28dd832..0000000
--- a/update/org.eclipse.update.core/schema/installHandlers.exsd
+++ /dev/null

@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.update.core">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.update.core" id="installHandlers" name="Global Install Handlers"/>

-      </appInfo>

-      <documentation>

-         Extension point for registering global install handlers. Global
-install handlers can be referenced by features 
-(using the &lt;code&gt;&amp;lt;feature&amp;gt; &amp;lt;install-handler&amp;gt;&lt;/code&gt;
-tags) without having to include a copy of the handler code as
-part of the downloadable feature.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="install-handler" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  must be specified as &lt;b&gt;org.eclipse.update.core.installHandlers&lt;/b&gt;

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  must be specified. Identifies the new install handler

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  optional displayable label for the new install handler

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="install-handler">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  fully qualified name of the handler implementation class for the identified
-install handler

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of new global install handler registration:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension
-        id=&quot;custom&quot;
-        point=&quot;org.eclipse.update.core.installHandlers&quot;
-        name=&quot;Custom install handler&quot;&gt;
-     &lt;install-handler
-        class=&quot;com.xyz.update.CustomInstallHandler&quot;&gt;
-     &lt;/install-handler&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         Registered install handler classes must implement 
-&lt;code&gt;org.eclipse.update.core.IInstallHandler&lt;/code&gt; interface.
-Implementers should extend base class &lt;code&gt;org.eclipse.update.core.BaseInstallHandler&lt;/code&gt;.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         The platform supplies a simple install handler that is registered as &lt;code&gt;org.eclipse.update.core.DefaultInstallHandler&lt;/code&gt;. If used, it will copy any non-plug-in data entries provided with the feature into the feature installation directory.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2002, 2003 IBM Corporation and others.
-All rights reserved.   This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;.

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/update/org.eclipse.update.core/schema/siteTypes.exsd b/update/org.eclipse.update.core/schema/siteTypes.exsd
deleted file mode 100644
index 5748954..0000000
--- a/update/org.eclipse.update.core/schema/siteTypes.exsd
+++ /dev/null

@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.update.core">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.update.core" id="siteTypes" name="Site Type Factory"/>

-      </appInfo>

-      <documentation>

-         The platform update mechanism supports pluggable site type
-implementations. A new site type can be registered in order
-to support alternate site layout schemes.
-&lt;p&gt;
-The &lt;code&gt;siteTypes&lt;/code&gt;
-extension point allows alternate site implementations to be
-registered using a symbolic type identifier. Whenever the 
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete site implementation.
-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="site-factory" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  must be specified as &lt;b&gt;org.eclipse.update.core.siteTypes&lt;/b&gt;

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  must be specified. Identifies the new site type

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  optional displayable label for the new site type

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="site-factory">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  fully qualified name of the factory class for the identified
-site type

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of new site type registration.
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension
-        id=&quot;custom&quot;
-        point=&quot;org.eclipse.update.core.siteTypes&quot;
-        name=&quot;Custom site&quot;&gt;
-      &lt;site-factory
-          class=&quot;com.xyz.update.CustomSiteFactory&quot;&gt;
-      &lt;/site-factory&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         Registered factory classes must implement 
-&lt;code&gt;&lt;b&gt;org.eclipse.update.core.ISiteFactory&lt;/b&gt;&lt;/code&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         The platform supplies two standard implementations of site
-types. One representing the default update server type, and
-the other representing the local file system site.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2002, 2003 IBM Corporation and others.
-All rights reserved.   This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;.

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
deleted file mode 100644
index 103152f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.configuration;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Install activity.
- * Represents a record of an installation action performed
- * on a particular installation configuration.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.configuration.IInstallConfiguration
- * @since 2.0
- */
-public interface IActivity extends IAdaptable {
-
-	/**
-	 * Indicates feature installation action
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_FEATURE_INSTALL = 1;
-
-	/**
-	 * Indicates feature removal (uninstallation) action
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_FEATURE_REMOVE = 2;
-
-	/**
-	 * Indicates an addition of a site to a configuration
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_SITE_INSTALL = 3;
-
-	/**
-	 * Indicates removal of a site from a configuration
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_SITE_REMOVE = 4;
-
-	/**
-	 * Indicates feature unconfiguration action
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_UNCONFIGURE = 5;
-
-	/**
-	 * Indicates feature configuration action
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_CONFIGURE = 6;
-
-	/**
-	 * Indicates reverting to a prior configuration state
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_REVERT = 7;
-
-	/**
-	 * Indicates reconcilliation with changes made directly to the site
-	 * installation directory
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_RECONCILIATION = 8;
-
-	/**
-	 * Indicates adding the configuration to a preserved state
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int ACTION_ADD_PRESERVED = 9;
-	
-	/**
-	 * Indicates the action completed cussessfully
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int STATUS_OK = 0;
-
-	/**
-	 * Indicates the action did not complete successfully
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public static final int STATUS_NOK = 1;
-
-	/**
-	 * Returns the action code for this activity
-	 * 
-	 * @see #ACTION_FEATURE_INSTALL
-	 * @see #ACTION_FEATURE_REMOVE
-	 * @see #ACTION_SITE_INSTALL
-	 * @see #ACTION_SITE_REMOVE
-	 * @see #ACTION_UNCONFIGURE
-	 * @see #ACTION_CONFIGURE
-	 * @see #ACTION_REVERT
-	 * @see #ACTION_RECONCILIATION
-	 * @return action code, as defined in this interface
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public int getAction();
-
-	/**
-	 * Returns the displayable label for this action
-	 * 
-	 * @return diplayable label for action
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public String getLabel();
-
-	/**
-	 * Returns the creation date of this activity
-	 * 
-	 * @return activity date
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public Date getDate();
-
-	/** 
-	 * Returns the activity completion status
-	 * 
-	 * @see #STATUS_OK
-	 * @see #STATUS_NOK
-	 * @return completion status, as defined in this interface
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public int getStatus();
-
-	/**
-	 * Returns the installation configuration that was the result of 
-	 * this action
-	 * 
-	 * @return installation configuration
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IInstallConfiguration getInstallConfiguration();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
deleted file mode 100644
index d8d004e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
+++ /dev/null

@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.configuration;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Configured Site.
- * Represents an installation site "filtered" by configuration information.
- * Configured site is the target of the feature update operations (install
- * feature, remove feature, configure feature, unconfigure feature).
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IConfiguredSite extends IAdaptable {
-
-	/**
-	 * Returns the underlying "unfiltered" site.
-	 * 
-	 * @return the underlying site 
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public ISite getSite();
-
-	/**
-	 * Indicates whether updates can be applied to the site.
-	 * 
-	 * <code>IStatus.isOk()</code> return <code>true</code> if
-	 * the site can be updated, <code>false</code> otherwise.
-	 * 
-	 * If updates cannot be aplied, the status contains the error message, and
-	 * the possible exception. 
-	 * 
-	 * @see IStatus
-	 * @return an IStatus
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IStatus verifyUpdatableStatus();
-
-	/**
-	 * Indicates whether updates can be applied to the site.
-	 * 
-	 * A configuration site is tagged a non-updatable by reading
-	 * the platform configuration for this site.
-	 * 
-	 * @return <code>true</code> if the site can be updated, 
-	 * <code>false</code> otherwise
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isUpdatable();
-
-	/**
-	 * Install the specified feature on this site.
-	 * 
-	 * @param feature feature to install
-	 * @param verificationListener verification listener, or <code>null</code>
-	 * @param monitor progress monitor, or <code>null</code>
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IFeatureReference install(IFeature feature, IVerificationListener verificationListener, IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Install the specified feature on this site.
-	 * Only the specified optional features will be installed
-	 * 
-	 * @param feature feature to install
-	 * @param optionalFeatures optional features to install
-	 * @param verificationListener verification listener, or <code>null</code>
-	 * @param monitor progress monitor, or <code>null</code>
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IFeatureReference install(IFeature feature, IFeatureReference[] optionalFeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws CoreException;
-
-
-	/**
-	 * Remove (uninstall) the specified feature from this site
-	 * 
-	 * @param feature feature to remove
-	 * @param monitor progress monitor, or <code>null</code>
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Indicates if the specified feature is "broken". A feature is considered
-	 * to be broken in the context of this site, if some of the plug-ins
-	 * referenced by the feature are not installed on this site.
-	 * 
-	 * The status code is <code>IStatus.ERROR</code> if the feature is considered
-	 * broken. The Status may contain the reason why the feature is broken.
-	 * The status code is <code>IStatus.OK</code> if the feature is not considered
-	 * broken.
-	 * 
-	 * @param feature the feature
-	 * @return the status for this feature on this configured site
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IStatus getBrokenStatus(IFeature feature);
-
-	/**
-	 * Indicates if the specified feature is configured on this site.
-	 * 
-	 * @param feature the feature
-	 * @return <code>true</code> if the feature is configured,
-	 * <code>false</code> otherwise
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isConfigured(IFeature feature);
-
-	/**
-	 * Configure the specified feature on this site. The configured
-	 * feature will be included on next startup.
-	 * 
-	 * @param feature the feature
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void configure(IFeature feature) throws CoreException;
-
-	/**
-	 * Unconfigure the specified feature from this site. The unconfigured
-	 * feature will be omitted on the next startup.
-	 * 
-	 * @param feature the feature
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean unconfigure(IFeature feature) throws CoreException;
-
-	/**
-	 * Return references to features configured on this site.
-	 * 
-	 * @return an array of feature references, or an empty array.
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IFeatureReference[] getConfiguredFeatures();
-
-	/**
-	 * Return all features installed on this site (configured as well
-	 * as unconfigured). Note, that if the site requires reconciliation,
-	 * the result may not match the result of the corresponding method
-	 * on the underlying site.
-	 * 
-	 * @see ISite#getFeatureReferences()
-	 * @return an array of site feature references, or an empty array.
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IFeatureReference[] getFeatureReferences();
-
-	/**
-	 * Returns the install configuration object this site is part of.
-	 * 
-	 * @return install configuration object
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IInstallConfiguration getInstallConfiguration();
-
-	/**
-	 * Adds a change listener to the configured site.
-	 * 
-	 * @param listener the listener to add
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void addConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener);
-
-	/**
-	 * Removes a change listener from the configured site.
-	 * 
-	 * @param listener the listener to remove
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void removeConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener);
-
-	/**
-	 * Indicates if the site is an extension site.
-	 * 
-	 * @return <code>true</code> if the site is an extension site,
-	 * <code>false</code> otherwise
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isExtensionSite();
-
-	/**
-	 * Indicates if the site is a product site.
-	 * 
-	 * @return <code>true</code> if the site is a product site,
-	 * <code>false</code> otherwise
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isProductSite();
-
-	/**
-	 * Indicates if the site is a private site.
-	 * This does not check if this private site belongs to the
-	 * product that is running.
-	 * 
-	 * @return <code>true</code> if the site is a private site,
-	 * <code>false</code> otherwise
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 * @deprecated private site are considered the same as extension site (3.0)
-	 */
-	public boolean isPrivateSite();
-
-	/**
-	 * Indicates if the site has been linked by a native
-	 * installer.
-	 * 
-	 * @return <code>true</code> if the site is a natively linked site,
-	 * <code>false</code> otherwise
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isNativelyLinked() throws CoreException;
-
-	/**
-	 * Sets if the site is enabled
-	 * 
-	 * @parem <code>true</code> if the site is enable, <code>false</code>
-	 * otherwise
-	 * @since 2.1
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void setEnabled(boolean value);
-
-	/**
-	 * Indicates if the site is enabled. 
-	 * If a site is not enable, all teh features are considered disabled.
-	 * 
-	 * @return <code>true</code> if the site is enable, <code>false</code>
-	 * otherwise
-	 * @since 2.1
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isEnabled();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
deleted file mode 100644
index 13634c1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.configuration;
-
-import org.eclipse.update.core.*;
-
-/**
- * Configuration change listener. * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IConfiguredSiteChangedListener {
-	
-	/**
-	 * Indicates the specified feature was installed.
-	 * 
-	 * @param feature the feature
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void featureInstalled(IFeature feature);
-	
-	/**
-	 * Indicates the specified feature was removed (uninstalled)
-	 * 
-	 * @param feature the feature
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void featureRemoved(IFeature feature);
-	
-	/**
-	 * Indicates the specified feature was configured.
-	 * 
-	 * @param feature the feature
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void featureConfigured(IFeature feature);
-	
-	/**
-	 * Indicates the specified feature was unconfigured.
-	 * 
-	 * @param feature the feature
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void featureUnconfigured(IFeature feature);
-}
-

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
deleted file mode 100644
index 5d0a37d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.configuration;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Installation configuration.
- * Represents a specific configuration of a number of sites as a point
- * in time. Maintains a record of the specific activities that resulted
- * in this configuration. Current installation configuration is
- * the configuration the platform was started with.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IInstallConfiguration extends IAdaptable {
-
-	/**
-	 * Indicates if this is the current configuration
-	 * 
-	 * @return <code>true</code> if this is the current configuration,
-	 * <code>false</code> otherwise
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public boolean isCurrent();
-
-	/**
-	 * Return the sites that are part of this configuration.
-	 * 
-	 * @return an array of configured sites, or an empty array.
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IConfiguredSite[] getConfiguredSites();
-
-	/**
-	 * Create a new installation site, based on a local file 
-	 * system directory. Note, the site is not added to the
-	 * configuration as a result of this call.
-	 * 
-	 * @param directory file directory
-	 * @return new site
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IConfiguredSite createConfiguredSite(File directory) throws CoreException;
-
-	/**
-	 * Create a new linked site, based on a local file 
-	 * system directory. Note, the site is not added to the
-	 * configuration as a result of this call.
-	 * The linked site is only created if the directory is an
-	 * already existing extension site and if it is not already
-	 * natively linked to the local site.
-	 * 
-	 * @param directory file directory
-	 * @return new linked site
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IConfiguredSite createLinkedConfiguredSite(File directory) throws CoreException;
-
-	/**
-	 * Adds the specified site to this configuration.
-	 * 
-	 * @param site new site
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void addConfiguredSite(IConfiguredSite site);
-
-	/**
-	 * Removes the specified site from this configuration.
-	 * 
-	 * @param site site to remove
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void removeConfiguredSite(IConfiguredSite site);
-
-	/**
-	 * Adds a configuration change listener.
-	 * 
-	 * @param listener the listener
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void addInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener);
-
-	/**
-	 * Removes a configuration change listener.
-	 * 
-	 * @param listener the listener
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void removeInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener);
-
-	/**
-	 * Return the list of activities that resulted in this configuration.
-	 * There is always at least one activity
-	 * 
-	 * @return an array of activities
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IActivity[] getActivities();
-
-	/**
-	 * Retrun the date the configuration was created.
-	 * 
-	 * @return create date
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public Date getCreationDate();
-
-	/**
-	 * Return the configuration label.
-	 * 
-	 * @return the configuration label. If the configuration label was not
-	 * explicitly set, a default label is generated based on the creation
-	 * date
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public String getLabel();
-
-	/**
-	 * Sets the configuration label.
-	 * 
-	 * @param label the label
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void setLabel(String label);
-
-	/**
-	 * Returns an integer that represents a time stamp created at the beginning of a new configuration time line.
-	 * Time line is started when configuration state is created by a full file system reconciliation. All configurations
-	 * subsequently created will have the same time line until the next full reconciliation. Certain operations
- 	 * (e.g. revert) make sense only between objects that belong to the same time line.
- 	 * 
-	 * @since 2.0.2
-	 * @return the time stamp of the full system reconciliation
-	 * 
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public long getTimeline();
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
deleted file mode 100644
index 070a874..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.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.update.configuration;
-
-/**
- * Configuration change listener.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IInstallConfigurationChangedListener {
-	
-	/**
-	 * Indicates the specified site was added to the configuration
-	 * 
-	 * @param site the site
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	void installSiteAdded(IConfiguredSite site);
-	
-	/**
-	 * Indicates the specified site was removed from the configuration
-	 * 
-	 * @param site the site
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	void installSiteRemoved(IConfiguredSite site);
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
deleted file mode 100644
index c5cb179..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.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.update.configuration;
-
-/**
- * Install Delta Handler.
- * Presents the changes the reconciler found to the user
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- * @deprecated Do not use this interface. The extension point deltaHandler has been deprecated.
- */
-public interface IInstallDeltaHandler{
-
-	/**
-	 * Sets the list of session delta to present to the user
-	 * 
-	 * @param deltas an Array of <code>ISessionDelta</code>
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void init(ISessionDelta[] deltas);
-
-	/**
-	 * Prompt the user to configure or unconfigure
-	 * new features found during reconciliation
-	 * 
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void open();
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
deleted file mode 100644
index 07cac15..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.configuration;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Local Site.
- * Represents the local installation. It consists of the current
- * configuration and the configuration history. A local site
- * manages the number of configuration histories kept. It also allows
- * specific configuration histories to be saved.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p> 
- * @since 2.0
- */
-public interface ILocalSite extends IAdaptable {
-
-	/**
-	 * Return the current configuration.
-	 * 
-	 * @return current configuration
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	IInstallConfiguration getCurrentConfiguration();
-
-	/**
-	 * Return configuration history.
-	 * 
-	 * @return an array of configurations, or an empty array.
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IInstallConfiguration[] getConfigurationHistory();
-
-	/**
-	 * Reverts the local site to use the specified configuration.
-	 * The result of this operation is a new configuration that
-	 * contains the same configured features as the specified configuration.
-	 * The new configuration becomes the current configuration.
-	 * 
-	 * @param configuration configuration state to revert to
-	 * @param monitor progress monitor
-	 * @param handler problem handler
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void revertTo(
-		IInstallConfiguration configuration,
-		IProgressMonitor monitor,
-		IProblemHandler handler)
-		throws CoreException;
-
-	/**
-	 * Creates a new configuration containing the same state as the 
-	 * specified configuration. The new configuration is not added to
-	 * this lical site.
-	 * 
-	 * @return cloned configuration
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IInstallConfiguration cloneCurrentConfiguration() throws CoreException;
-
-	/**
-	 * Adds the specified configuration to this local site.
-	 * The new configuration becomes the current one.
-	 * 
-	 * @param config the configuration
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void addConfiguration(IInstallConfiguration config);
-
-	/**
-	 * Saves the local site state
-	 * 
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 * @return true if a restart is needed. This return code was added in 3.0.
-	 */
-	public boolean save() throws CoreException;
-
-	/**
-	 * Indicates how many configuration histories should be maintained.
-	 * Histories beyond the specified count are automatically deleted.
-	 * 
-	 * @return number of past configurations to keep as history
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public int getMaximumHistoryCount();
-
-	/**
-	 * Sets the number of past configurations to keep in history
-	 * 
-	 * @param history number of configuration to keep
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void setMaximumHistoryCount(int history);
-
-	/**
-	 * Adds a site change listener
-	 * 
-	 * @param listener the listener
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void addLocalSiteChangedListener(ILocalSiteChangedListener listener);
-
-	/**
-	 * Removes a site listener
-	 * 
-	 * @param listener the listener
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void removeLocalSiteChangedListener(ILocalSiteChangedListener listener);
-
-	/**
-	 * Save the specified configuration. Saved configurations are 
-	 * not deleted based on the history count. They must be explicitly
-	 * removed.
-	 * 
-	 * @param configuration the configuration to save
-	 * @return the preserved configuration or <code>null</code> if the configuration to save is <code>null</code>
-	 * @exception CoreException
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IInstallConfiguration addToPreservedConfigurations(IInstallConfiguration configuration)
-		throws CoreException;
-
-	/**
-	 * Removes the specified configuration from the list of previously
-	 * saved configurations.
-	 * 
-	 * @param configuration the configuration to remove
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void removeFromPreservedConfigurations(IInstallConfiguration configuration);
-
-	/**
-	 * Return the list of saved configurations
-	 * 
-	 * @return an array of configurations, or an empty array.
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IInstallConfiguration[] getPreservedConfigurations();
-	
-	/**
-	 * Indicates if the 'state' of the specified feature and its children features.
-	 * 
-	 * A feature is considered to be 'unhappy' in the context of this site,
-	 * if some of the plug-ins referenced by the feature, or any of its children,
-	 *  are not installed on this site.
-	 * 
-	 * A feature is considered to be 'happy' in the context of a local site
-	 * if all the plug-ins referenced by the feature, or any of its children,
-	 * are installed on the site and no other version of any of the plug-ins
-	 * are installed on any other site of the local site.
-	 * 
-	 * A feature is considered to be 'ambiguous' in the context of a local site
-	 * if all the plug-ins referenced by the feature, or any of its children,
-	 * are installed on the site and other version of any of the plug-ins
-	 * are installed on any other site of the local site.
-	 * 
-	 * @param feature the feature
-	 * @see IFeature#STATUS_HAPPY
-	 * @see IFeature#STATUS_UNHAPPY
-	 * @see IFeature#STATUS_AMBIGUOUS
-	 * @return the state of the feature
-	 * @exception CoreException
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IStatus getFeatureStatus(IFeature feature) throws CoreException ;	
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
deleted file mode 100644
index 9e1162a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.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.configuration;
-
-/**
- * Local site change listener. 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface ILocalSiteChangedListener {
-	
-	/**
-	 * Indicates the current configuration has changed.
-	 * 
-	 * @param configuration the current cunfiguration
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void currentInstallConfigurationChanged(IInstallConfiguration configuration);
-	
-	/**
-	 * Indicates the specified configuration was removed.
-	 * 
-	 * @param configuration the configuration
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void installConfigurationRemoved(IInstallConfiguration configuration);
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
deleted file mode 100644
index 25ab62c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.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.update.configuration;

- 

-

-

-/**

- * Local system change listener interface.

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see LocalSystemInfo#addInfoListener(ILocalSystemInfoListener)

- * @see LocalSystemInfo#removeInfoListener(ILocalSystemInfoListener)

- * @see LocalSystemInfo#fireSystemInfoChanged(IVolume,int)

- * @since 2.0

- */

-public interface ILocalSystemInfoListener {

-	

-	/**

-	 * Volume change notification.

-	 * Called each time there are relevant volume changes

-	 * detected. This specifically includes changes to the

-	 * file system structure as a result of removable drive/ media

-	 * operations (eg. CD insertion), and changes to volume 

-	 * mount structure.

-	 * @param volume volume of the changed file

-	 * system structure. Any current paths beyond

-	 * the specified 'root' file of the volume are assumed to be invalidated.

-	 * @param changeType type of the change that occured.

-	 * @see LocalSystemInfo#VOLUME_ADDED

-	 * @see LocalSystemInfo#VOLUME_REMOVED

-	 * @see LocalSystemInfo#VOLUME_CHANGED

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public void systemInfoChanged(IVolume volume, int changeType);

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
deleted file mode 100644
index 361e9e8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.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.configuration;
- 
-/**
- * Generic problem handler. Used to report status from specific
- * install operations. The methods implemented by this interface
- * are callbacks from the update support to the caller of the update
- * methods.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IProblemHandler {
-
-	/**
-	 * Report problem.
-	 * 
-	 * @param problemText problem text
-	 * @return <code>true</code> if the operation should continue,
-	 * <code>false</code> if the operation should be cancelled
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	boolean reportProblem(String problemText);
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
deleted file mode 100644
index 48f04d2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.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.configuration;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Installation Change.
- * Represents the changes the reconciler found.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- * @deprecated Do not use this interface
- */
-public interface ISessionDelta extends IAdaptable {
-
-	/**
-	 * Indicates a processing type to enable the features
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public int ENABLE = 1;
-
-	/**
-	 * Indicates a processing type to disable the features
-	 * 
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
- 	public int DISABLE = 2;
-
-	/**
-	 * Returns the list of Features found during reconciliation
-	 * 
-	 * @return an array of feature references, or an empty array
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public IFeatureReference[] getFeatureReferences();
-
-	/**
-	 * Returns the date the reconciliation occured
-	 * 
-	 * @return the date of the reconciliation
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public Date getDate();
-
-	/**
-	 * Returns the type of the processing type
-	 * that will affect all the associated features. 
-	 * 
-	 * @return the processing type
-	 * @see ISessionDelta#ENABLE
-	 * @see ISessionDelta#DISABLE
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public int getType();
-
-	/**
-	 * Process all the feature references of the 
-	 * Session Delta. 
-	 * Removes the Session Delta from the file system after processing it.
-	 * 
-	 * @param progressMonitor the progress monitor
-	 * @throws CoreException if an error occurs. 
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void process(IProgressMonitor progressMonitor) throws CoreException;
-
-	/**
-	 * Process the selected feature references of the Session Delta.
-	 * Removes the Session Delta from the file system after processing it.
-	 *
-	 * @param selected list of selected feature references to be processed
-	 * @param monitor the progress monitor
-	 * @throws CoreException if an error occurs.
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void process(IFeatureReference [] selected, IProgressMonitor monitor) throws CoreException;
-	
-	/**
-	 * Removes the Session Delta from the file system without processing it.
-	 * 
-	 * @since 2.0 
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public void delete();	
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
deleted file mode 100644
index defd2a3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.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.configuration;
-
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Local Volume Info.
- * Represents local file system information for a specific volume.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.configuration.LocalSystemInfo
- * @since 2.0
- */
-public interface IVolume extends IAdaptable {
-
-	/**
-	 * Returns the available free space on this volume.
-	 * Returns the amount of free space available to this
-	 * user on the volume. The
-	 * method takes into account any space quotas or other
-	 * native mechanisms that may restrict space usage
-	 * on a given volume.
-	 * @return the amount of free space available (in units
-	 * of Kbyte), or an indication the size is not known 
-	 * @see LocalSystemInfo#SIZE_UNKNOWN
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public long getFreeSpace();
-	
-	/**
-	 * returns volume label.
-	 * Returns the label of the volume.
-	 * @return volume label (as string), or <code>null</code> if
-	 * the label cannot be determined.
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public String getLabel();
-	
-	/**
-	 * Returns volume type.
-	 * Returns the type of the volume.
-	 * @return volume type
-	 * @see LocalSystemInfo#VOLUME_UNKNOWN
-	 * @see LocalSystemInfo#VOLUME_INVALID_PATH
-	 * @see LocalSystemInfo#VOLUME_REMOVABLE
-	 * @see LocalSystemInfo#VOLUME_FIXED
-	 * @see LocalSystemInfo#VOLUME_REMOTE
-	 * @see LocalSystemInfo#VOLUME_CDROM
-	 * @see LocalSystemInfo#VOLUME_FLOPPY_3
-	 * @see LocalSystemInfo#VOLUME_FLOPPY_5
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public int getType();
-	
-	/**
-	 * Returns the volume path.
-	 * Returns the path that represents the mount point of the volume.
-	 * @return mount point file
-	 * @since 2.0
-	 * <p>
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * </p>
-	 */
-	public File getFile();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
deleted file mode 100644
index f716d9b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
+++ /dev/null

@@ -1,432 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.configuration;

- 

-import java.io.*;

-import java.util.*;

-

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

- 

-/**

- * Utility class providing local file system information.

- * The class attempts to load a native library implementation

- * of its methods. If successful, the method calls are delegated

- * to the native implementation. Otherwise a default non-native

- * implementation is used.  * 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see ILocalSystemInfoListener

- * @since 2.0

- */

-public class LocalSystemInfo {

-	

-	/**

-	 * Indicates the amount of available free space is not known

-	 * 

-	 * @see LocalSystemInfo#getFreeSpace(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final long SIZE_UNKNOWN = -1;

-	

-	/**

-	 * Indicates the volume type is not known

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_UNKNOWN = -1;

-	

-	/**

-	 * Indicates the volume could not be determined from path

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_INVALID_PATH = -2;

-	

-	/**

-	 * Indicates the volume is removable (other than floppy disk)

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_REMOVABLE = 1;

-	

-	/**

-	 * Indicates the volume is fixed (hard drive)

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_FIXED = 2;

-	

-	/**

-	 * Indicates a remote (network) volume

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_REMOTE = 3;

-	

-	/**

-	 * Indicates a cdrom volume (compact disc)

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_CDROM = 4;	

-	

-	/**

-	 * Indicates a ramdisk volume (memory)

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_RAMDISK = 5;	

-

-	/**

-	 * Indicates the volume is removable (floppy disk 5 1/4)

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_FLOPPY_5 = 6;	

-	

-	/**

-	 * Indicates the volume is removable (floppy disk 3 1/2)

-	 * 

-	 * @see LocalSystemInfo#getType(File)

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_FLOPPY_3 = 7;

-	

-	/**

-	 * Indicates a new volume has been added

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_ADDED = 0;

-			

-	/**

-	 * Indicates a volume has been removed

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_REMOVED = 1;

-

-	/**

-	 * Indicates a volume has been changed

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This field is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static final int VOLUME_CHANGED = 2;

-

-	

-	private static ArrayList listeners = new ArrayList();	

-	private static boolean hasNatives = false;	

-	static {

-		try {

-			System.loadLibrary("update"); //$NON-NLS-1$

-			hasNatives = true;

-		} catch (UnsatisfiedLinkError e) {

-			UpdateCore.warn("Unable to load native library 'update'."); //$NON-NLS-1$

-			hasNatives = false;

-		}

-	}

-	

-	/**

-	 * Determines available free space on a volume.

-	 * Returns the amount of free space available to this

-	 * user on the volume containing the specified path. The

-	 * method takes into account any space quotas or other

-	 * native mechanisms that may restrict space usage

-	 * on a given volume.

-	 * @param path file path. May contain path elements beyond

-	 * the volume "root"

-	 * @return the amount of free space available (in units

-	 * of Kbyte), or an indication the size is not known 

-	 * @see LocalSystemInfo#SIZE_UNKNOWN

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static long getFreeSpace(File path) {

-		if (hasNatives) {

-			try {

-				long bytes = nativeGetFreeSpace(path);

-				return (bytes!=0)?bytes/1024:0;

-			} catch (UnsatisfiedLinkError e) {

-			}

-		}

-		return SIZE_UNKNOWN;

-	}

-

-

-	/**

-	 * Lists the file system volume.

-	 * @return array of volume representing mount

-	 * points, or <code>null</code> if none found

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static IVolume[] getVolumes() {

-		String[] mountPoints = listMountPoints();

-		Volume[] vol = new Volume[0];

-		if (mountPoints!=null){

-			vol = new Volume[mountPoints.length];

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

-				File root = new File(mountPoints[i]);

-				String label = getLabel(root);

-				int type = getType(root);

-				long size = getFreeSpace(root);

-				vol[i] = new Volume(root,label,type,size);

-				vol[i].markReadOnly();

-			}

-		} else {

-			UpdateCore.warn("Unable to find mount points"); //$NON-NLS-1$

-			// fallback

-			File [] roots = File.listRoots();

-			if (roots.length == 1) {

-				// just one root - skip it

-				File root = roots[0];

-				roots = root.listFiles();

-			}

-			vol = new Volume[roots.length];			

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

-				vol[i] = new Volume(roots[i],null,LocalSystemInfo.VOLUME_UNKNOWN,LocalSystemInfo.SIZE_UNKNOWN);

-				vol[i].markReadOnly();

-			}			

-		}

-		return vol;

-	}

-

-	

-	/**

-	 * Add local system change listener.

-	 * Allows a listener to be added for monitoring changes

-	 * in the local system information. The listener is notified

-	 * each time there are relevant volume changes

-	 * detected. This specifically includes changes to the

-	 * list of volumes as a result of removable drive/ media

-	 * operations (eg. CD insertion, removal), and changes to volume 

-	 * mount structure.

-	 * @param listener change listener

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static void addInfoListener(ILocalSystemInfoListener listener) {

-		if (!listeners.contains(listener))

-			listeners.add(listener);

-	}

-	

-	/**

-	 * Remove local system change listener

-	 * @param listener change listener

-	 * @since 2.0

-	 * <p>

-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static void removeInfoListener(ILocalSystemInfoListener listener) {

-		listeners.remove(listener);

-	}

-		

-	/**

-	 * Notify listeners of change.

-	 * 

-	 * @param volume the volume representing the

-	 * change file system structure. Any current paths beyond

-	 * the specified "root" file of the volume are assumed to be invalidated.

-	 * @param changeType type of the change that occured.

-	 * @see LocalSystemInfo#VOLUME_ADDED

-	 * @see LocalSystemInfo#VOLUME_REMOVED

-	 * @see LocalSystemInfo#VOLUME_CHANGED

-	 * <p>

-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to

-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-	 * (repeatedly) as the API evolves.

-	 * </p>

-	 */

-	public static void fireSystemInfoChanged(IVolume volume, int changeType) {

-		for (int i=0; i< listeners.size(); i++) {

-			((ILocalSystemInfoListener)listeners.get(i)).systemInfoChanged(volume,changeType);

-		}

-	}

-		

-	/*

-	 * Determines volume label.

-	 * Returns the label of the volume containing the specified

-	 * path.

-	 * @param path file path. May contain path elements beyond

-	 * the volume "root"

-	 * @return volume label (as string), or <code>null</code> if

-	 * the label cannot be determined.

-	 * @since 2.0

-	 */

-	private static String getLabel(File path) {

-		if (hasNatives) {

-			try {

-				return nativeGetLabel(path);

-			} catch (UnsatisfiedLinkError e) {

-			}

-		}

-		return null;

-	}

-	

-	/*

-	 * Determines volume type.

-	 * Returns the type of the volume containing the specified

-	 * path.

-	 * @param path file path. May contain path elements beyond

-	 * the volume "root"

-	 * @return volume type

-	 * @see LocalSystemInfo#VOLUME_UNKNOWN

-	 * @see LocalSystemInfo#VOLUME_INVALID_PATH

-	 * @see LocalSystemInfo#VOLUME_REMOVABLE

-	 * @see LocalSystemInfo#VOLUME_FIXED

-	 * @see LocalSystemInfo#VOLUME_REMOTE

-	 * @see LocalSystemInfo#VOLUME_CDROM

-	 * @see LocalSystemInfo#VOLUME_FLOPPY_3

-	 * @see LocalSystemInfo#VOLUME_FLOPPY_5

-	 * @since 2.0

-	 */

-	private static int getType(File path) {

-		if (hasNatives) {

-			try {

-				return nativeGetType(path);

-			} catch (UnsatisfiedLinkError e) {

-			}

-		}

-		return VOLUME_UNKNOWN;

-	}

-	

-	/*

-	 * Lists the file system mount points.

-	 * @return array of absolute file paths representing mount

-	 * points, or <code>null</code> if none found

-	 * @since 2.0

-	 */

-	private static String[] listMountPoints() {

-		if (hasNatives) {

-			try {

-				String[] mountPoints = nativeListMountPoints();

-				return mountPoints;

-			} catch (UnsatisfiedLinkError e) {

-			}

-		}

-		return null;

-	}

-		

-	/*

-	 * Native implementations.

-	 */

-	private static native long nativeGetFreeSpace(File path);

-	private static native String nativeGetLabel(File path);

-	private static native int nativeGetType(File path);

-	private static native String[] nativeListMountPoints();

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
deleted file mode 100644
index e76be03..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
+++ /dev/null

@@ -1,25 +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.72 [en] (Windows NT 5.0; U) [Netscape]">

-   <title>Package-level Javadoc</title>

-</head>

-<body>

-Provides support for accessing local installation

-information.

-<h2>

-Package Specification</h2>

-This package contains interfaces for accessing and manipulating the local

-system installation and configuration information. In general, users extending

-the update support&nbsp; by writing additional feature and site implementation

-do not need to make use of interfaces defined in this package.

-<p>

-<b>Note:</b> This package is part of an interim API that is still under development and expected to

-change significantly before reaching stability. It is being made available at this early stage to solicit feedback

-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

-(repeatedly) as the API evolves.

-</p>

-</body>

-</html>


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
deleted file mode 100644
index 2aea248..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.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.core;

-

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

-

-/**

- * Convenience implementation of a site archive.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * @see org.eclipse.update.core.IArchiveReference

- * @see org.eclipse.update.core.model.ArchiveReferenceModel

- * @since 2.0

- */

-public class ArchiveReference

-	extends ArchiveReferenceModel

-	implements IArchiveReference {

-

-	/**

-	 * Constructor for ArchiveReference

-	 * @since 2.0

-	 */

-	public ArchiveReference() {

-		super();

-	}

-

-	/**

-	 * @see Object#toString()

-	 * @since 2.0

-	 */

-	public String toString() {

-		String result = "IArchiveReference: "; //$NON-NLS-1$

-		result =

-			result

-				+ ((getPath() == null)

-					? getURL().toExternalForm()

-					: getPath() + " : " + getURL().toExternalForm()); //$NON-NLS-1$

-		return result;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
deleted file mode 100644
index 5db8b99..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.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.update.core;

-

-import java.net.*;

-

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

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

-

-/**

- * Base implementation of a feature factory.

- * The factory is responsible for constructing the correct

- * concrete implementation of the model objects for each particular

- * feature type. This class creates model objects that correspond

- * to the concrete implementation classes provided in this package.

- * The actual feature creation method is subclass responsibility.

- * <p>

- * This class must be subclassed by clients.

- * </p>

- * @see org.eclipse.update.core.IFeatureFactory

- * @see org.eclipse.update.core.model.FeatureModelFactory

- * @since 2.0

- */

-public abstract class BaseFeatureFactory extends FeatureModelFactory implements IFeatureFactory {

-

-	/**

-	 * 

-	 * @deprecated implement createFeature(URL, ISite, IProgressMonitor) instead

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

-	 * @since 2.0

-	 */

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

-		return createFeature(url, site, null);

-	}

-

-	/**

-	 * Create feature. Implementation of this method must be provided by 

-	 * subclass

-	 * 

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

-	 * @since 2.0

-	 */

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

-

-	/**

-	 * Create a concrete implementation of feature model.

-	 * 

-	 * @see Feature

-	 * @return feature model

-	 * @since 2.0

-	 */

-	public FeatureModel createFeatureModel() {

-		return new Feature();

-	}

-

-	/**

-	 * Create a concrete implementation of included feature reference model.

-	 * 

-	 * @see IncludedFeatureReference

-	 * @return feature model

-	 * @since 2.1

-	 */

-	public IncludedFeatureReferenceModel createIncludedFeatureReferenceModel() {

-		return new IncludedFeatureReference();

-	}

-

-	/**

-	 * Create a concrete implementation of install handler model.

-	 * 

-	 * @see InstallHandlerEntry

-	 * @return install handler entry model

-	 * @since 2.0

-	 */

-	public InstallHandlerEntryModel createInstallHandlerEntryModel() {

-		return new InstallHandlerEntry();

-	}

-

-	/**

-	 * Create a concrete implementation of import dependency model.

-	 * 

-	 * @see Import

-	 * @return import dependency model

-	 * @since 2.0

-	 */

-	public ImportModel createImportModel() {

-		return new Import();

-	}

-

-	/**

-	 * Create a concrete implementation of plug-in entry model.

-	 * 

-	 * @see PluginEntry

-	 * @return plug-in entry model

-	 * @since 2.0

-	 */

-	public PluginEntryModel createPluginEntryModel() {

-		return new PluginEntry();

-	}

-

-	/**

-	 * Create a concrete implementation of non-plug-in entry model.

-	 * 

-	 * @see NonPluginEntry

-	 * @return non-plug-in entry model

-	 * @since 2.0

-	 */

-	public NonPluginEntryModel createNonPluginEntryModel() {

-		return new NonPluginEntry();

-	}

-

-	/**

-	 * Create a concrete implementation of annotated URL model.

-	 * 

-	 * @see URLEntry

-	 * @return annotated URL model

-	 * @since 2.0

-	 */

-	public URLEntryModel createURLEntryModel() {

-		return new URLEntry();

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
deleted file mode 100644
index 54f9c30..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
+++ /dev/null

@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Base implementation of an install handler.
- * This is a convenience implementation of an install handler with
- * null implementation of its methods. It allows subclasses to selectively
- * implement only the methods required for their installation tasks.
- * <p>
- * This class should be subclassed by clients.
- * </p> 
- * @see org.eclipse.update.core.IInstallHandler
- * @since 2.0
- */
-
-public class BaseInstallHandler implements IInstallHandler {
-
-	/**
-	 * Update action type
-	 * 
-	 * @see IInstallHandler#HANDLER_ACTION_INSTALL
-	 * @see IInstallHandler#HANDLER_ACTION_CONFIGURE
-	 * @see IInstallHandler#HANDLER_ACTION_UNCONFIGURE
-	 * @see IInstallHandler#HANDLER_ACTION_UNINSTALL
-	 * @since 2.0
-	 */
-	protected int type;
-
-	/**
-	 * The target of the action
-	 * @since 2.0
-	 */
-	protected IFeature feature;
-
-	/**
-	 * Model entry that defines this handler
-	 * 
-	 * @since 2.0
-	 */
-	protected IInstallHandlerEntry entry;
-
-	/** 
-	 * Optional progress monitor, can be <code>null</code>
-	 * 
-	 * @since 2.0
-	 */
-	protected InstallMonitor monitor;
-
-	/**
-	 * Plug-in entries downloaded
-	 * 
-	 * @see IInstallHandler#HANDLER_ACTION_INSTALL
-	 * @since 2.0
-	 */
-	protected IPluginEntry[] pluginEntries;
-
-	/**
-	 * Non-plug-in entries downloaded
-	 * 
-	 * @see IInstallHandler#HANDLER_ACTION_INSTALL
-	 * @since 2.0
-	 */
-	protected INonPluginEntry[] nonPluginEntries;
-
-	/**
-	 * Indicates if handler has been initialized
-	 * 
-	 * @since 2.0
-	 */
-	protected boolean initialized = false;
-
-	/**
-	 * Initialize the install handler.
-	 * 
-	 * @see IInstallHandler#initialize(int, IFeature, IInstallHandlerEntry, InstallMonitor)
-	 * @since 2.0
-	 */
-	public void initialize(
-		int type,
-		IFeature feature,
-		IInstallHandlerEntry entry,
-		InstallMonitor monitor)
-		throws CoreException {
-
-		if (this.initialized)
-			return;
-		else {
-			if (feature == null)
-				throw new IllegalArgumentException();
-			this.type = type;
-			this.feature = feature;
-			this.entry = entry;
-			this.monitor = monitor;
-			this.initialized = true;
-		}
-	}
-
-	/**
-	 * Called at the start of the install action.
-	 * 
-	 * @see IInstallHandler#installInitiated
-	 * @since 2.0
-	 */
-	public void installInitiated() throws CoreException {
-	}
-
-	/**
-	 * Called after files corresponding to plug-in entries have been downloaded,
-	 * but before they are actully unpacked and installed.
-	 * 
-	 * @see IInstallHandler#pluginsDownloaded(IPluginEntry[])
-	 * @since 2.0
-	 */
-	public void pluginsDownloaded(IPluginEntry[] plugins) throws CoreException {
-
-		this.pluginEntries = plugins;
-	}
-
-	/**
-	 * Called after files corresponding to non-plug-in entries have been 
-	 * downloaded.
-	 * 
-	 * @see IInstallHandler#nonPluginDataDownloaded(INonPluginEntry[], IVerificationListener)
-	 * @since 2.0
-	 */
-	public void nonPluginDataDownloaded(
-		INonPluginEntry[] nonPluginData,
-		IVerificationListener listener)
-		throws CoreException {
-
-		this.nonPluginEntries = nonPluginData;
-	}
-
-	/**
-	 * Called after the feature files and any downloaded plug-ins have
-	 * been installed. 
-	 * 
-	 * @see IInstallHandler#completeInstall(IFeatureContentConsumer)
-	 * @since 2.0
-	 */
-	public void completeInstall(IFeatureContentConsumer consumer)
-		throws CoreException {
-	}
-
-	/**
-	 * Called at the end of the install action.
-	 * 
-	 * @see IInstallHandler#installCompleted(boolean)
-	 * @since 2.0
-	 */
-	public void installCompleted(boolean success) throws CoreException {
-	}
-
-	/**
-	 * Called at the start of the configure action.
-	 * 
-	 * @see IInstallHandler#configureInitiated()
-	 * @since 2.0
-	 */
-	public void configureInitiated() throws CoreException {
-	}
-
-	/**
-	 * Called after the feature has been configured.
-	 * 
-	 * @see IInstallHandler#completeConfigure()
-	 * @since 2.0
-	 */
-	public void completeConfigure() throws CoreException {
-	}
-
-	/**
-	 * Called at the end of the configure action.
-	 * 
-	 * @see IInstallHandler#configureCompleted(boolean)
-	 * @since 2.0
-	 */
-	public void configureCompleted(boolean success) throws CoreException {
-	}
-
-	/**
-	 * Called at the start of the unconfigure action.
-	 * 
-	 * @see IInstallHandler#unconfigureInitiated()
-	 * @since 2.0
-	 */
-	public void unconfigureInitiated() throws CoreException {
-	}
-
-	/**
-	 * Called after the feature has been unconfigured.
-	 * 
-	 * @see IInstallHandler#completeUnconfigure()
-	 * @since 2.0
-	 */
-	public void completeUnconfigure() throws CoreException {
-	}
-
-	/**
-	 * Called at the end of the unconfigure action.
-	 * 
-	 * @see IInstallHandler#unconfigureCompleted(boolean)
-	 * @since 2.0
-	 */
-	public void unconfigureCompleted(boolean success) throws CoreException {
-	}
-
-	/**
-	 * Called at the start of the uninstall action.
-	 * 
-	 * @see IInstallHandler#uninstallInitiated()
-	 * @since 2.0
-	 */
-	public void uninstallInitiated() throws CoreException {
-	}
-
-	/**
-	 * Called after the feature has been uninstalled.
-	 * 
-	 * @see IInstallHandler#completeUninstall()
-	 * @since 2.0
-	 */
-	public void completeUninstall() throws CoreException {
-	}
-
-	/**
-	 * Called at the end of the uninstall action.
-	 * 
-	 * @see IInstallHandler#uninstallCompleted(boolean)
-	 * @since 2.0
-	 */
-	public void uninstallCompleted(boolean success) throws CoreException {
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
deleted file mode 100644
index 7ad6ca7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

- 

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

-

-/**

- * Base implementation of a site factory.

- * The factory is responsible for constructing the correct

- * concrete implementation of the model objects for each particular

- * site type. This class creates model objects that correspond

- * to the concrete implementation classes provided in this package.

- * The actual site creation method is subclass responsibility.

- * <p>

- * This class must be subclassed by clients.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ISiteFactory

- * @see org.eclipse.update.core.model.SiteModelFactory

- * @since 2.0

- */

-public abstract class BaseSiteFactory extends SiteModelFactory implements ISiteFactory {

-

-

-	/**

-	 * Create site. Implementation of this method must be provided by 

-	 * subclass

-	 * 

-	 * @see ISiteFactory#createSite(URL)

-	 * @since 2.0

-	 */

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

-

-	/**

-	 * Helper method to access resouce bundle for site. The default 

-	 * implementation attempts to load the appropriately localized 

-	 * site.properties file.

-	 * 

-	 * @param url base URL used to load the resource bundle.

-	 * @return resource bundle, or <code>null</code>.

-	 * @since 2.0

-	 */

-	protected ResourceBundle getResourceBundle(URL url) {

-		ResourceBundle bundle = null;

-

-		try {

-			url = UpdateManagerUtils.asDirectoryURL(url);

-			ClassLoader l = new URLClassLoader(new URL[] { url }, null);

-			bundle = ResourceBundle.getBundle(Site.SITE_FILE, Locale.getDefault(), l);

-		} catch (MissingResourceException e) {

-			UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$

-		} catch (MalformedURLException e) {

-			UpdateCore.warn(Policy.bind("BaseSiteFactory.CannotRetriveParentDirectory", url.toExternalForm()));  //$NON-NLS-1$

-		}

-

-		return bundle;

-	}

-

-	/**

-	 * Create a concrete implementation of site model.

-	 * 

-	 * @see Site

-	 * @return site model

-	 * @since 2.0

-	 */

-	public SiteModel createSiteMapModel() {

-		return new Site();

-	}

-

-

-	/**

-	 * Create a concrete implementation of feature reference model.

-	 * 

-	 * @see FeatureReference

-	 * @return feature reference model

-	 * @since 2.0

-	 */

-	public SiteFeatureReferenceModel createFeatureReferenceModel() {

-		return new SiteFeatureReference();

-	}

-

-	/**

-	 * Create a concrete implementation of archive reference model.

-	 * 

-	 * @see ArchiveReference

-	 * @return archive reference model

-	 * @since 2.0

-	 */

-	public ArchiveReferenceModel createArchiveReferenceModel() {

-		return new ArchiveReference();

-	}

-

-

-	/**

-	 * Create a concrete implementation of annotated URL model.

-	 * 

-	 * @see URLEntry

-	 * @return annotated URL model

-	 * @since 2.0

-	 */

-	public URLEntryModel createURLEntryModel() {

-		return new URLEntry();

-	}

-

-

-	/**

-	 * Create a concrete implementation of category model.

-	 * 

-	 * @see Category

-	 * @return category model

-	 * @since 2.0

-	 */

-	public CategoryModel createSiteCategoryModel() {

-		return new Category();

-	}

-

-	/**

-	 * Open a stream on a URL.

-	 * manages a time out if the connection is locked or fails

-	 * 

-	 * @param resolvedURL

-	 * @return InputStream

-	 */

-	protected InputStream openStream(URL resolvedURL)  throws IOException {

-		Response response = UpdateCore.getPlugin().get(resolvedURL);

-		return response.getInputStream();

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
deleted file mode 100644
index 8fcc12f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.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.update.core;

-

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

-

-/**

- * Convenience implementation of feature category definition.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ICategory

- * @see org.eclipse.update.core.model.CategoryModel

- * @since 2.0

- */

-public class Category extends CategoryModel implements ICategory {

-

-	/**

-	 * Default Constructor

-	 */

-	public Category() {

-	}

-

-	/**

-	 * Constructor

-	 */

-	public Category(String name, String label) {

-		setName(name);

-		setLabel(label);

-	}

-

-	/**

-	 * Retrieve the detailed category description

-	 * @see ICategory#getDescription()

-	 */

-	public IURLEntry getDescription() {

-		return (IURLEntry) getDescriptionModel();

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
deleted file mode 100644
index 78a39fc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
+++ /dev/null

@@ -1,334 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.io.*;

-import java.net.*;

-

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

-import org.eclipse.update.internal.core.URLEncoder;

-

-/**

- * Content reference implements a general access wrapper 

- * to feature and site content. The reference specifies

- * a "symbolic" path identifier for the content, and the actual

- * reference as a file, or a URL.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.JarContentReference

- * @see org.eclipse.update.core.JarEntryContentReference

- * @since 2.0

- */

-public class ContentReference {

-

-	/**

-	 * Unknown size indication

-	 * @since 2.0

-	 */

-	public static final long UNKNOWN_SIZE = -1;

-

-	/**

-	 * Default executable permission when installing a content reference

-	 * Will add executable bit if necessary

-	 * 

-	 * @since 2.0.1

-	 */

-	public static final int DEFAULT_EXECUTABLE_PERMISSION = -1;

-

-	private static final String FILE_URL_PROTOCOL = "file"; //$NON-NLS-1$

-

-	private String id;

-	private URL url; // reference is either URL reference *OR*

-	private File file; //    local file reference

-	private Response response;

-	private int permission; 

-	private long length;

-	

-	// <true> if a copy of a Contentreferenec in a temp local directory

-	private boolean tempLocal = false;

-	

-	private long lastModified;

-

-	/*

-	 * do not allow default contruction

-	 */

-	private ContentReference() {

-	}

-

-	/**

-	 * Create content reference from URL.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param url actual referenced URL

-	 * @since 2.0

-	 */

-	public ContentReference(String id, URL url) {

-		this.id = (id == null ? "" : id); //$NON-NLS-1$

-		this.url = url; // can be null

-		this.file = null;

-	}

-

-	/**

-	 * Create content reference from file.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param file actual referenced file

-	 * @since 2.0

-	 */

-	public ContentReference(String id, File file) {

-		this.id = (id == null ? "" : id); //$NON-NLS-1$

-		this.file = file; // can be null

-		this.url = null;

-	}

-

-	/**

-	 * A factory method to create a content reference of

-	 * the same type.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param file actual referenced file

-	 * @return content reference of the same type

-	 * @since 2.0

-	 */

-	public ContentReference createContentReference(String id, File file) {

-		return new ContentReference(id, file,true);

-	}

-	/**

-	 * 

-	 */

-	private ContentReference(String id, File file, boolean b) {

-		this(id,file);

-		setTempLocal(b);

-	}

-

-	/**

-	 * Retrieves the "symbolic" path identifier for the reference.

-	 * 

-	 * @return "symbolic" path identifier

-	 * @since 2.0

-	 */

-	public String getIdentifier() {

-		return id;

-	}

-

-	/**

-	 * Creates an input stream for the reference.

-	 * 

-	 * @return input stream

-	 * @exception IOException unable to create stream

-	 * @since 2.0

-	 */

-	public InputStream getInputStream() throws IOException {

-		if (file != null)

-			return new FileInputStream(file);

-		else if (url != null) {

-			if (response == null) {

-				URL resolvedURL = URLEncoder.encode(url);

-				response = UpdateCore.getPlugin().get(resolvedURL);

-				UpdateManagerUtils.checkConnectionResult(response,resolvedURL);

-			}

-			InputStream is=response.getInputStream();

-			length=response.getContentLength();

-			return is;

-		} else

-			throw new IOException(Policy.bind("ContentReference.UnableToCreateInputStream", this.toString())); //$NON-NLS-1$

-	}

-	/**

-	 * Creates an input stream for the reference.

-	 * 

-	 * @return input stream

-	 * @exception IOException unable to create stream

-	 * @since 2.0

-	 */

-	InputStream getPartialInputStream(long offset) throws IOException {

-		if (url != null && "http".equals(url.getProtocol())) { //$NON-NLS-1$

-			URL resolvedURL = URLEncoder.encode(url);

-			response = UpdateCore.getPlugin().get(resolvedURL);

-			if(response instanceof HttpResponse)

-				((HttpResponse)response).setOffset(offset);

-			UpdateManagerUtils.checkConnectionResult(response,resolvedURL);

-			InputStream is = response.getInputStream();

-			length=offset + response.getContentLength();

-			return is;

-		} else

-			throw new IOException(Policy.bind("ContentReference.UnableToCreateInputStream", this.toString())); //$NON-NLS-1$

-	}

-	

-	/**

-	 * Returns the size of the referenced input, if it can be determined.

-	 * 

-	 * @return input size, or @see #UNKNOWN_SIZE if size cannot be determined.

-	 * @since 2.0

-	 */

-	public long getInputSize() throws IOException {

-		if (length>0)

-			return length;

-		if (file != null)

-			return file.length();

-		else if (url != null) {

-			if (response == null) {

-				URL resolvedURL = null;

-				try {

-					resolvedURL = URLEncoder.encode(url);

-					response = UpdateCore.getPlugin().get(resolvedURL);

-				} catch (IOException e) {

-					return ContentReference.UNKNOWN_SIZE;

-				}

-				UpdateManagerUtils.checkConnectionResult(response,resolvedURL);			

-			}

-			long size = response.getContentLength();

-			return size == -1 ? ContentReference.UNKNOWN_SIZE : size;

-		} else

-			return ContentReference.UNKNOWN_SIZE;

-	}

-

-	/**

-	 * Indicates whether the reference is a local file reference.

-	 * 

-	 * @return <code>true</code> if the reference is local, 

-	 * otherwise <code>false</code>

-	 * @since 2.0

-	 */

-	public boolean isLocalReference() {

-		/*if (file != null)

-			return true;

-		else if (url != null)

-			return FILE_URL_PROTOCOL.equals(url.getProtocol());

-		else

-			return false;*/

-		// only temp files are considered local

-		return tempLocal;

-	}

-

-	/**

-	 * Returns the content reference as a file. Note, that this method

-	 * <b>does not</b> cause the file to be downloaded if it

-	 * is not already local.

-	 * 

-	 * @return reference as file

-	 * @exception IOException reference cannot be returned as file

-	 * @since 2.0

-	 */

-	public File asFile() throws IOException {

-		if (file != null)

-			return file;

-

-		if (url != null && FILE_URL_PROTOCOL.equals(url.getProtocol())) {

-			File result = new File(url.getFile());

-			if (result.exists())

-				return result;

-			else 

-				throw new IOException(Policy.bind("ContentReference.FileDoesNotExist", this.toString())); //$NON-NLS-1$ 			

-		}

-

-		throw new IOException(Policy.bind("ContentReference.UnableToReturnReferenceAsFile", this.toString())); //$NON-NLS-1$ 

-	}

-

-	/**

-	 * Returns the content reference as a URL.

-	 * 

-	 * @return reference as URL

-	 * @exception IOException reference cannot be returned as URL

-	 * @since 2.0

-	 */

-	public URL asURL() throws IOException {

-		if (url != null)

-			return url;

-

-		if (file != null)

-			return file.toURL();

-

-		throw new IOException(Policy.bind("ContentReference.UnableToReturnReferenceAsURL", this.toString())); //$NON-NLS-1$

-	}

-

-	/**

-	 * Return string representation of this reference.

-	 * 

-	 * @return string representation

-	 * @since 2.0

-	 */

-	public String toString() {

-		if (file != null)

-			return file.getAbsolutePath();

-		else

-			return url.toExternalForm();

-	}

-	/**

-	 * Returns the permission for this file.

-	 * 

-	 * @return the content reference permission

-	 * @see #DEFAULT_EXECUTABLE_PERMISSION

-	 * @since 2.0.1

-	 */

-	public int getPermission() {

-		return permission;

-	}

-

-	/**

-	 * Sets the permission of this content reference.

-	 * 

-	 * @param permission The permission to set

-	 */

-	public void setPermission(int permission) {

-		this.permission = permission;

-	}

-

-	/**

-	 * Sets if a content reference is considered local 

-	 * 

-	 * @param tempLocal <code>true</code> if the file is considered local

-	 */

-	protected void setTempLocal(boolean tempLocal) {

-		this.tempLocal = tempLocal;

-	}

-	

-	/**

-	 * Sets the timestamp the content was last modified.

-	 * @param timestamp

-	 * @since 3.0

-	 */

-	public void setLastModified(long timestamp) {

-		this.lastModified = timestamp;

-	}

-	

-	/**

-	 * Returns the timestamp when the content was last modified

-	 * @return

-	 * @since 3.0

-	 */

-	public long getLastModified() {

-		if (lastModified == 0) {

-			if (file != null) 

-				lastModified = file.lastModified();

-			else if (url != null) {

-				if (response == null) {

-					try {

-						URL resolvedURL = URLEncoder.encode(url);

-						response = UpdateCore.getPlugin().get(resolvedURL);

-					} catch (MalformedURLException e) {

-						// return 0

-					} catch (IOException e) {

-						// return 0

-					}

-				}

-				lastModified = response.getLastModified();

-			} 

-		}

-		return lastModified;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
deleted file mode 100644
index c4114a3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
+++ /dev/null

@@ -1,1128 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.net.*;

-import java.util.*;

-

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

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

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

-

-/**

- * Convenience implementation of a feature.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p> 

- * @see org.eclipse.update.core.IFeature

- * @see org.eclipse.update.core.model.FeatureModel

- * @since 2.0

- */

-public class Feature extends FeatureModel implements IFeature {

-

-	/**

-	 * Simple file name of the default feature manifest file

-	 * @since 2.0

-	 */

-	public static final String FEATURE_FILE = "feature"; //$NON-NLS-1$

-

-	/**

-	 * File extension of the default feature manifest file

-	 * @since 2.0

-	 */

-	public static final String FEATURE_XML = FEATURE_FILE + ".xml"; //$NON-NLS-1$

-

-	private ISite site; // feature site

-	private IFeatureContentProvider featureContentProvider; // content provider

-	private List /*of IFeatureReference*/

-	includedFeatureReferences;

-

-	//PERF: new instance variable

-	private VersionedIdentifier versionId;

-

-	private InstallAbortedException abortedException = null;

-

-	/**

-	 * Feature default constructor

-	 * 

-	 * @since 2.0

-	 */

-	public Feature() {

-	}

-

-	/**

-	 * Compares two features for equality

-	 * 

-	 * @param object feature object to compare with

-	 * @return <code>true</code> if the two features are equal, 

-	 * <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public boolean equals(Object object) {

-		if (!(object instanceof IFeature))

-			return false;

-		IFeature f = (IFeature) object;

-		return getVersionedIdentifier().equals(f.getVersionedIdentifier());

-	}

-

-	/**

-	 * Returns the feature identifier.

-	 * 

-	 * @see IFeature#getVersionedIdentifier()

-	 * @since 2.0

-	 */

-	public VersionedIdentifier getVersionedIdentifier() {

-		if (versionId != null)

-			return versionId;

-

-		String id = getFeatureIdentifier();

-		String ver = getFeatureVersion();

-		if (id != null && ver != null) {

-			try {

-				versionId = new VersionedIdentifier(id, ver);

-				return versionId;

-			} catch (Exception e) {

-				UpdateCore.warn(

-					"Unable to create versioned identifier:" + id + ":" + ver); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-

-		versionId = new VersionedIdentifier(getURL().toExternalForm(), null);

-		return versionId;

-	}

-

-	/**

-	 * Returns the site this feature is associated with.

-	 * 

-	 * @see IFeature#getSite()

-	 * @since 2.0

-	 */

-	public ISite getSite() {

-		return site;

-	}

-

-	/**

-	 * Returns the feature URL.

-	 * 

-	 * @see IFeature#getURL()

-	 * @since 2.0

-	 */

-	public URL getURL() {

-		IFeatureContentProvider contentProvider = null;

-		try {

-			contentProvider = getFeatureContentProvider();

-		} catch (CoreException e) {

-			UpdateCore.warn("No content Provider", e); //$NON-NLS-1$

-		}

-		return (contentProvider != null) ? contentProvider.getURL() : null;

-	}

-

-	/**

-	 * Returns an information entry referencing the location of the

-	 * feature update site. 

-	 * 

-	 * @see IFeature#getUpdateSiteEntry()

-	 * @since 2.0

-	 */

-	public IURLEntry getUpdateSiteEntry() {

-		return (IURLEntry) getUpdateSiteEntryModel();

-	}

-

-	/**

-	 * Return an array of information entries referencing locations of other

-	 * update sites.

-	 * 

-	 * @see IFeature#getDiscoverySiteEntries()

-	 * @since 2.0

-	 */

-	public IURLEntry[] getDiscoverySiteEntries() {

-		URLEntryModel[] result = getDiscoverySiteEntryModels();

-		if (result.length == 0)

-			return new IURLEntry[0];

-		else

-			return (IURLEntry[]) result;

-	}

-

-	/**

-	 * Returns and optional custom install handler entry.

-	 * 

-	 * @see IFeature#getInstallHandlerEntry()

-	 * @since 2.0

-	 */

-	public IInstallHandlerEntry getInstallHandlerEntry() {

-		return (IInstallHandlerEntry) getInstallHandlerModel();

-	}

-

-	/**

-	 * Returns the feature description.

-	 * 

-	 * @see IFeature#getDescription()

-	 * @since 2.0

-	 */

-	public IURLEntry getDescription() {

-		return (IURLEntry) getDescriptionModel();

-	}

-

-	/**

-	 * Returns the copyright information for the feature.

-	 * 

-	 * @see IFeature#getCopyright()

-	 * @since 2.0

-	 */

-	public IURLEntry getCopyright() {

-		return (IURLEntry) getCopyrightModel();

-	}

-

-	/**

-	 * Returns the license information for the feature.

-	 * 

-	 * @see IFeature#getLicense()

-	 * @since 2.0

-	 */

-	public IURLEntry getLicense() {

-		return (IURLEntry) getLicenseModel();

-	}

-

-	/**

-	 * Return optional image for the feature.

-	 * 

-	 * @see IFeature#getImage()

-	 * @since 2.0

-	 */

-	public URL getImage() {

-		return getImageURL();

-	}

-

-	/**

-	 * Return a list of plug-in dependencies for this feature.

-	 * 

-	 * @see IFeature#getRawImports()

-	 * @since 2.0

-	 */

-	public IImport[] getRawImports() {

-		ImportModel[] result = getImportModels();

-		if (result.length == 0)

-			return new IImport[0];

-		else

-			return (IImport[]) result;

-	}

-

-	/**

-	 * Install the contents of this feature into the specified target feature.

-	 * This method is a reference implementation of the feature installation

-	 * protocol. Other concrete feature implementation that override this

-	 * method need to implement this protocol.

-	 * 

-	 * @see IFeature#install(IFeature, IVerificationListener, IProgressMonitor)

-	 * @since 2.0

-	 */

-	public IFeatureReference install(

-		IFeature targetFeature,

-		IVerificationListener verificationListener,

-		IProgressMonitor progress)

-		throws InstallAbortedException, CoreException {

-		// call other API with all optional features, or setup variable meaning install all

-		return install(targetFeature, null, verificationListener, progress);

-	}

-

-	/**

-	 * Install the contents of this feature into the specified target feature.

-	 * This method is a reference implementation of the feature installation

-	 * protocol. Other concrete feature implementation that override this

-	 * method need to implement this protocol.

-	 * 

-	 * @see IFeature#install(IFeature, IVerificationListener, IProgressMonitor)

-	 * @since 2.0

-	 */

-	public IFeatureReference install(

-		IFeature targetFeature,

-		IFeatureReference[] optionalfeatures,

-		IVerificationListener verificationListener,

-		IProgressMonitor progress)

-		throws InstallAbortedException, CoreException {

-

-		//DEBUG

-		debug("Installing...:" + getURL().toExternalForm()); //$NON-NLS-1$

-		ErrorRecoveryLog recoveryLog = ErrorRecoveryLog.getLog();

-

-		// make sure we have an InstallMonitor		

-		InstallMonitor monitor;

-		if (progress == null)

-			monitor = new InstallMonitor(new NullProgressMonitor());

-		else if (progress instanceof InstallMonitor)

-			monitor = (InstallMonitor) progress;

-		else

-			monitor = new InstallMonitor(progress);

-

-		// Setup optional install handler

-		InstallHandlerProxy handler =

-			new InstallHandlerProxy(

-				IInstallHandler.HANDLER_ACTION_INSTALL,

-				this,

-				this.getInstallHandlerEntry(),

-				monitor);

-		boolean success = false;

-		Throwable originalException = null;

-		abortedException = null;

-

-		// Get source feature provider and verifier.

-		// Initialize target variables.

-		IFeatureContentProvider provider = getFeatureContentProvider();

-		IVerifier verifier = provider.getVerifier();

-		IFeatureReference result = null;

-		IFeatureReference alreadyInstalledFeature = null;

-		IFeatureContentConsumer consumer = null;

-		IPluginEntry[] targetSitePluginEntries = null;

-

-		try {

-			// determine list of plugins to install

-			// find the intersection between the plugin entries already contained

-			// on the target site, and plugin entries packaged in source feature

-			IPluginEntry[] sourceFeaturePluginEntries = getPluginEntries();

-			ISite targetSite = targetFeature.getSite();

-			if (targetSite == null) {

-				debug("The site to install in is null"); //$NON-NLS-1$

-				targetSitePluginEntries = new IPluginEntry[0];

-			} else {

-				targetSitePluginEntries = targetSite.getPluginEntries();

-			}

-			IPluginEntry[] pluginsToInstall =

-				UpdateManagerUtils.diff(

-					sourceFeaturePluginEntries,

-					targetSitePluginEntries);

-			INonPluginEntry[] nonPluginsToInstall = getNonPluginEntries();

-

-			IFeatureReference[] children = getIncludedFeatureReferences();

-			if (optionalfeatures != null) {

-				children =

-					UpdateManagerUtils.optionalChildrenToInstall(

-						children,

-						optionalfeatures);

-			}

-

-			// determine number of monitor tasks

-			//   2 tasks for the feature jar (download/verify + install)

-			// + 2*n tasks for plugin entries (download/verify + install for each)

-			// + 1*m tasks per non-plugin data entry (download for each)

-			// + 1 task for custom non-plugin entry handling (1 for all combined)

-			// + 5*x tasks for children features (5 subtasks per install)

-			int taskCount =

-				2

-					+ 2 * pluginsToInstall.length

-					+ nonPluginsToInstall.length

-					+ 1

-					+ 5 * children.length;

-			monitor.beginTask("", taskCount); //$NON-NLS-1$

-			SubProgressMonitor subMonitor = null;

-

-			// start log

-			recoveryLog.open(ErrorRecoveryLog.START_INSTALL_LOG);

-

-			// Start the installation tasks			

-			handler.installInitiated();

-

-			// Download and verify feature archive(s)

-			ContentReference[] references =

-				provider.getFeatureEntryArchiveReferences(monitor);

-			verifyReferences(

-				verifier,

-				references,

-				monitor,

-				verificationListener,

-				true);

-			monitorWork(monitor, 1);

-			

-			// Download and verify plugin archives

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

-				references = provider.getPluginEntryArchiveReferences(

-						pluginsToInstall[i], monitor);

-				verifyReferences(verifier, references, monitor,

-								verificationListener, false);

-				monitorWork(monitor, 1);

-			}

-			

-			handler.pluginsDownloaded(pluginsToInstall);

-

-			// Download non-plugin archives. Verification handled by optional install handler

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

-				references =

-					provider.getNonPluginEntryArchiveReferences(

-						nonPluginsToInstall[i],

-						monitor);

-				monitorWork(monitor, 1);

-			}

-			handler.nonPluginDataDownloaded(

-				nonPluginsToInstall,

-				verificationListener);

-

-			// All archives are downloaded and verified. Get ready to install

-			consumer = targetFeature.getFeatureContentConsumer();

-

-			// install the children feature

-			// check if they are optional, and if they should be installed [2.0.1]

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

-				IFeature childFeature = null;

-				try {

-					childFeature = children[i].getFeature(null);

-				} catch (CoreException e) {

-					UpdateCore.warn(null, e);

-				}

-				if (childFeature != null) {

-					subMonitor = new SubProgressMonitor(monitor, 5);

-					((Site) targetSite).install(// need to cast

-					childFeature,

-						optionalfeatures,

-						consumer,

-						verifier,

-						verificationListener,

-						subMonitor);

-				}

-			}

-

-			// Install plugin files

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

-				// if another feature has already installed this plugin, skip it

-				if (InstallRegistry.getInstance().isPluginJustInstalled(pluginsToInstall[i])) {

-					monitor.worked(1);

-					continue;

-				}

-				IContentConsumer pluginConsumer =

-					consumer.open(pluginsToInstall[i]);

-				// TODO consumer.open returns either

-				// SiteFilePackedPluginContentConsumer or SiteFilePluginContentConsumer

-				// and they are fed either

-				// PluginEntryArchiveReference or PluginEntryContentReferences

-				// it would be better to have one that is given PluginEntryArchiveReference

-				// but it would break external IContentConsumers

-

-				if(pluginsToInstall[i] instanceof PluginEntryModel && !((PluginEntryModel)pluginsToInstall[i]).isUnpack()){

-					// plugin can run from a jar

-					references = provider.getPluginEntryArchiveReferences(

-							pluginsToInstall[i], monitor);

-				} else{

-					// plugin must be unpacked

-					references =

-						provider.getPluginEntryContentReferences(

-							pluginsToInstall[i],

-							monitor);

-				}

-

-				String msg = ""; //$NON-NLS-1$

-				subMonitor = new SubProgressMonitor(monitor, 1);

-				VersionedIdentifier pluginVerId =

-					pluginsToInstall[i].getVersionedIdentifier();

-				String pluginID =

-					(pluginVerId == null) ? "" : pluginVerId.getIdentifier(); //$NON-NLS-1$

-				msg = Policy.bind("Feature.TaskInstallPluginFiles", pluginID); //$NON-NLS-1$

-

-				for (int j = 0; j < references.length; j++) {

-					setMonitorTaskName(

-						subMonitor,

-						msg + references[j].getIdentifier());

-					pluginConsumer.store(references[j], subMonitor);

-				}

-

-				InstallRegistry.registerPlugin(pluginsToInstall[i]);

-				if (monitor.isCanceled())

-					abort();

-			}

-

-			// check if we need to install feature files [16718]	

-			// store will throw CoreException if another feature is already

-			// installed in the same place

-			alreadyInstalledFeature = featureAlreadyInstalled(targetSite);

-			// 18867

-			if (alreadyInstalledFeature == null) {

-				//Install feature files

-				references = provider.getFeatureEntryContentReferences(monitor);

-

-				String msg = ""; //$NON-NLS-1$

-				subMonitor = new SubProgressMonitor(monitor, 1);

-				msg = Policy.bind("Feature.TaskInstallFeatureFiles"); //$NON-NLS-1$

-

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

-					setMonitorTaskName(

-						subMonitor,

-						msg + " " + references[i].getIdentifier()); //$NON-NLS-1$

-					consumer.store(references[i], subMonitor);

-				}

-				InstallRegistry.registerFeature(this);

-			} else {

-				monitor.worked(1);

-			}

-

-			if (monitor.isCanceled())

-				abort();

-

-			// call handler to complete installation (eg. handle non-plugin entries)

-			handler.completeInstall(consumer);

-			monitorWork(monitor, 1);

-

-			// indicate install success

-			success = true;

-

-		} catch (InstallAbortedException e) {

-			abortedException = e;

-		} catch (CoreException e) {

-			originalException = e;

-		} finally {

-			Exception newException = null;

-			try {

-				if (consumer != null) {

-					if (success) {

-						result = consumer.close();

-						if (result == null) {

-							result = alreadyInstalledFeature; // 18867

-							if (result != null

-								&& optionalfeatures != null

-								&& optionalfeatures.length > 0) {

-								// reinitialize as new optional children may have been installed

-								reinitializeFeature(result);

-							}

-						}

-						// close the log

-						recoveryLog.close(ErrorRecoveryLog.END_INSTALL_LOG);

-					} else {

-						consumer.abort();

-					}

-				}

-				handler.installCompleted(success);

-				// if abort is done, no need for the log to stay

-				recoveryLog.delete();

-			} catch (CoreException e) {

-				newException = e;

-			}

-

-			// original exception wins unless it is InstallAbortedException

-			// and an error occured during abort

-			if (originalException != null) {

-				throw Utilities.newCoreException(

-					Policy.bind("InstallHandler.error", this.getLabel()), //$NON-NLS-1$

-					originalException);

-			}

-

-			if (newException != null)

-				throw Utilities.newCoreException(

-					Policy.bind("InstallHandler.error", this.getLabel()), //$NON-NLS-1$

-					newException);

-

-			if (abortedException != null) {

-				throw abortedException;

-			}

-

-		}

-		return result;

-	}

-

-	/**

-	 * Returns an array of plug-in entries referenced by this feature

-	 * 

-	 * @see IFeature#getPluginEntries()

-	 * @since 2.0

-	 */

-	public IPluginEntry[] getRawPluginEntries() {

-		PluginEntryModel[] result = getPluginEntryModels();

-		if (result.length == 0)

-			return new IPluginEntry[0];

-		else

-			return (IPluginEntry[]) result;

-	}

-

-	/*

-	 * Method filter.

-	 * @param result

-	 * @return IPluginEntry[]

-	 */

-	private IPluginEntry[] filterPluginEntry(IPluginEntry[] all) {

-		List list = new ArrayList();

-		if (all != null) {

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

-				if (UpdateManagerUtils.isValidEnvironment(all[i]))

-					list.add(all[i]);

-			}

-		}

-

-		IPluginEntry[] result = new IPluginEntry[list.size()];

-		if (!list.isEmpty()) {

-			list.toArray(result);

-		}

-

-		return result;

-	}

-

-	/**

-	 * Returns the count of referenced plug-in entries.

-	 * 

-	 * @see IFeature#getPluginEntryCount()

-	 * @since 2.0

-	 */

-	public int getPluginEntryCount() {

-		return getPluginEntries().length;

-	}

-

-	/**

-	 * Returns an array of non-plug-in entries referenced by this feature

-	 * 

-	 * @see IFeature#getNonPluginEntries()

-	 * @since 2.0

-	 */

-	public INonPluginEntry[] getRawNonPluginEntries() {

-		NonPluginEntryModel[] result = getNonPluginEntryModels();

-		if (result.length == 0)

-			return new INonPluginEntry[0];

-		else

-			return (INonPluginEntry[]) result;

-	}

-

-	/**

-	 * Returns the count of referenced non-plug-in entries.

-	 * 

-	 * @see IFeature#getNonPluginEntryCount()

-	 * @since 2.0

-	 */

-	public int getNonPluginEntryCount() {

-		return getNonPluginEntryModels().length;

-	}

-

-	/**

-	 * Returns an array of feature references included by this feature

-	 * 

-	 * @return an erray of feature references, or an empty array.

-	 * @since 2.0

-	 */

-	public IIncludedFeatureReference[] getRawIncludedFeatureReferences()

-		throws CoreException {

-		if (includedFeatureReferences == null)

-			initializeIncludedReferences();

-

-		if (includedFeatureReferences.size() == 0)

-			return new IncludedFeatureReference[0];

-

-		return (IIncludedFeatureReference[]) includedFeatureReferences.toArray(

-			arrayTypeFor(includedFeatureReferences));

-	}

-	/**

-	 * Returns the download size of the feature, if it can be determined.

-	 * 

-	 * @see IFeature#getDownloadSize()

-	 * @since 2.0

-	 */

-	public long getDownloadSize() {

-		try {

-			Set allPluginEntries = new HashSet();

-			Set allNonPluginEntries = new HashSet();

-

-			IPluginEntry[] plugins = getPluginEntries();

-			allPluginEntries.addAll(Arrays.asList(plugins));

-			INonPluginEntry[] nonPlugins = getNonPluginEntries();

-			allNonPluginEntries.addAll(Arrays.asList(nonPlugins));

-

-			IFeatureReference[] children = getIncludedFeatureReferences();

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

-				plugins = children[i].getFeature(null).getPluginEntries();

-				allPluginEntries.addAll(Arrays.asList(plugins));

-				nonPlugins = children[i].getFeature(null).getNonPluginEntries();

-				allNonPluginEntries.addAll(Arrays.asList(nonPlugins));

-			}

-

-			IPluginEntry[] totalPlugins =

-				new IPluginEntry[allPluginEntries.size()];

-			INonPluginEntry[] totalNonPlugins =

-				new INonPluginEntry[allNonPluginEntries.size()];

-			if (allPluginEntries.size() != 0) {

-				allPluginEntries.toArray(totalPlugins);

-			}

-			if (allNonPluginEntries.size() != 0) {

-				allNonPluginEntries.toArray(totalNonPlugins);

-			}

-

-			return getFeatureContentProvider().getDownloadSizeFor(

-				totalPlugins,

-				totalNonPlugins);

-

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-			return ContentEntryModel.UNKNOWN_SIZE;

-		}

-	}

-

-	/**

-	 * Returns the install size of the feature, if it can be determined.

-	 * 

-	 * @see IFeature#getInstallSize()

-	 * @since 2.0

-	 */

-	public long getInstallSize() {

-		try {

-			Set allPluginEntries = new HashSet();

-			Set allNonPluginEntries = new HashSet();

-

-			IPluginEntry[] plugins = getPluginEntries();

-			allPluginEntries.addAll(Arrays.asList(plugins));

-			INonPluginEntry[] nonPlugins = getNonPluginEntries();

-			allNonPluginEntries.addAll(Arrays.asList(nonPlugins));

-

-			IFeatureReference[] children = getIncludedFeatureReferences();

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

-				plugins = children[i].getFeature(null).getPluginEntries();

-				allPluginEntries.addAll(Arrays.asList(plugins));

-				nonPlugins = children[i].getFeature(null).getNonPluginEntries();

-				allNonPluginEntries.addAll(Arrays.asList(nonPlugins));

-			}

-

-			IPluginEntry[] totalPlugins =

-				new IPluginEntry[allPluginEntries.size()];

-			INonPluginEntry[] totalNonPlugins =

-				new INonPluginEntry[allNonPluginEntries.size()];

-			if (allPluginEntries.size() != 0) {

-				allPluginEntries.toArray(totalPlugins);

-			}

-			if (allNonPluginEntries.size() != 0) {

-				allNonPluginEntries.toArray(totalNonPlugins);

-			}

-

-			return getFeatureContentProvider().getInstallSizeFor(

-				totalPlugins,

-				totalNonPlugins);

-

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-			return ContentEntryModel.UNKNOWN_SIZE;

-		}

-	}

-

-	/**

-	 * Returns the content provider for this feature.

-	 * 

-	 * @see IFeature#getFeatureContentProvider()

-	 * @since 2.0

-	 */

-	public IFeatureContentProvider getFeatureContentProvider()

-		throws CoreException {

-		if (featureContentProvider == null) {

-			throw Utilities.newCoreException(

-				Policy.bind(

-					"Feature.NoContentProvider", //$NON-NLS-1$

-					getVersionedIdentifier().toString()),

-				null);	

-		}

-		return this.featureContentProvider;

-	}

-

-	/**

-	 * Returns the content consumer for this feature.

-	 * 

-	 * @see IFeature#getFeatureContentConsumer()

-	 * @since 2.0

-	 */

-	public IFeatureContentConsumer getFeatureContentConsumer()

-		throws CoreException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Sets the site for this feature.

-	 * 

-	 * @see IFeature#setSite(ISite)

-	 * @since 2.0

-	 */

-	public void setSite(ISite site) throws CoreException {

-		if (this.site != null) {

-			String featureURLString =

-				(getURL() != null) ? getURL().toExternalForm() : ""; //$NON-NLS-1$

-			throw Utilities.newCoreException(

-				Policy.bind("Feature.SiteAlreadySet", featureURLString), //$NON-NLS-1$

-				null);

-		}

-		this.site = site;

-	}

-

-	/**

-	 * Sets the content provider for this feature.

-	 * 

-	 * @see IFeature#setFeatureContentProvider(IFeatureContentProvider)

-	 * @since 2.0

-	 */

-	public void setFeatureContentProvider(IFeatureContentProvider featureContentProvider) {

-		this.featureContentProvider = featureContentProvider;

-		featureContentProvider.setFeature(this);

-	}

-

-	/**

-	 * Return the string representation of this fetaure

-	 * 

-	 * @return feature as string

-	 * @since 2.0

-	 */

-	public String toString() {

-		String URLString =

-			(getURL() == null)

-				? Policy.bind("Feature.NoURL") //$NON-NLS-1$

-				: getURL().toExternalForm();

-

-		String verString =

-			Policy.bind(

-				"Feature.FeatureVersionToString", //$NON-NLS-1$

-				URLString,

-				getVersionedIdentifier().toString());

-		String label = getLabel() == null ? "" : getLabel(); //$NON-NLS-1$

-		return verString + " [" + label + "]"; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/*

-	 * Installation has been cancelled, abort and revert

-	 */

-	private void abort() throws CoreException {

-		String msg = Policy.bind("Feature.InstallationCancelled"); //$NON-NLS-1$

-		throw new InstallAbortedException(msg, null);

-	}

-

-	/*

-	 * Initializes includes feature references

-	 * If the included feature reference is found on the site, add it to the List

-	 * Otherwise attempt to instanciate it using the same type as this feature and

-	 * using the default location on the site.

-	 */

-	private void initializeIncludedReferences() throws CoreException {

-		includedFeatureReferences = new ArrayList();

-

-		IIncludedFeatureReference[] nestedFeatures = getFeatureIncluded();

-		if (nestedFeatures.length == 0)

-			return;

-

-		ISite site = getSite();

-		if (site == null)

-			return;

-

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

-			IIncludedFeatureReference include = nestedFeatures[i];

-			IIncludedFeatureReference newRef =

-				getPerfectIncludeFeature(site, include);

-			includedFeatureReferences.add(newRef);

-		}

-	}

-

-	/*

-	 * 

-	 */

-	private IIncludedFeatureReference getPerfectIncludeFeature(

-		ISite site,

-		IIncludedFeatureReference include)

-		throws CoreException {

-

-		// [20367] no site, cannot initialize nested references

-		ISiteFeatureReference[] refs = site.getFeatureReferences();

-		VersionedIdentifier identifier = include.getVersionedIdentifier();

-

-		// too long to compute if not a file system

-		// other solution would be to parse feature.xml

-		// when parsing file system to create archive features/FeatureId_Ver.jar

-		if ("file".equals(site.getURL().getProtocol())) { //$NON-NLS-1$

-			// check if declared on the Site

-			if (refs != null) {

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

-					if (refs[ref] != null) {

-						VersionedIdentifier id =

-							refs[ref].getVersionedIdentifier();

-						if (identifier.equals(id)) {

-							// found a ISiteFeatureReference that matches our IIncludedFeatureReference

-							IncludedFeatureReference newRef =

-								new IncludedFeatureReference(refs[ref]);

-							newRef.isOptional(include.isOptional());

-							if (include instanceof FeatureReferenceModel)

-								newRef.setLabel(

-									((FeatureReferenceModel) include)

-										.getLabel());

-							newRef.setSearchLocation(

-								include.getSearchLocation());

-							return newRef;

-						}

-					}

-				}

-			}

-		}

-

-		// instanciate by mapping it based on the site.xml

-		// in future we may ask for a factory to create the feature ref

-		IncludedFeatureReference newRef = new IncludedFeatureReference(include);

-		newRef.setSite(getSite());

-		IFeatureReference parentRef = getSite().getFeatureReference(this);

-		if (parentRef instanceof FeatureReference) {

-			newRef.setType(((FeatureReference) parentRef).getType());

-		}

-		String featureID =

-			Site.DEFAULT_FEATURE_PATH + identifier.toString() + ".jar"; //$NON-NLS-1$

-		URL featureURL =

-			getSite().getSiteContentProvider().getArchiveReference(featureID);

-		newRef.setURL(featureURL);

-		newRef.setFeatureIdentifier(identifier.getIdentifier());

-		newRef.setFeatureVersion(identifier.getVersion().toString());

-		try {

-			newRef.resolve(getSite().getURL(), null);

-			// no need to get the bundle

-			return newRef;

-		} catch (Exception e) {

-			throw Utilities.newCoreException(

-				Policy.bind(

-					"Feature.UnableToInitializeFeatureReference", //$NON-NLS-1$

-					identifier.toString()),

-				e);

-		}

-	}

-

-	/*

-	 * 

-	 */

-	private void debug(String trace) {

-		//DEBUG

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL) {

-			UpdateCore.debug(trace);

-		}

-	}

-

-	/*

-	 * 

-	 */

-	private void setMonitorTaskName(

-		IProgressMonitor monitor,

-		String taskName) {

-		if (monitor != null)

-			monitor.setTaskName(taskName);

-	}

-

-	/*

-	 *

-	 */

-	private void monitorWork(IProgressMonitor monitor, int tick)

-		throws CoreException {

-		if (monitor != null) {

-			monitor.worked(tick);

-			if (monitor.isCanceled()) {

-				abort();

-			}

-		}

-	}

-

-	/*

-	 * 

-	 */

-	private void verifyReferences(

-		IVerifier verifier,

-		ContentReference[] references,

-		InstallMonitor monitor,

-		IVerificationListener verificationListener,

-		boolean isFeature)

-		throws CoreException {

-		IVerificationResult vr = null;

-		if (verifier != null) {

-			for (int j = 0; j < references.length; j++) {

-				vr = verifier.verify(this, references[j], isFeature, monitor);

-				if (vr != null) {

-					if (verificationListener == null)

-						return;

-

-					int result = verificationListener.prompt(vr);

-

-					if (result == IVerificationListener.CHOICE_ABORT) {

-						String msg = Policy.bind("JarVerificationService.CancelInstall"); //$NON-NLS-1$

-						Exception e = vr.getVerificationException();

-						throw new InstallAbortedException(msg, e);

-					}

-					if (result == IVerificationListener.CHOICE_ERROR) {

-						throw Utilities

-							.newCoreException(

-								Policy.bind(

-									"JarVerificationService.UnsucessfulVerification"),	//$NON-NLS-1$

-						vr.getVerificationException());

-					}

-				}

-			}

-		}

-	}

-

-	/*

-	 * returns reference if the same feature is installed on the site

-	 * [18867]

-	 */

-	private IFeatureReference featureAlreadyInstalled(ISite targetSite) {

-

-		ISiteFeatureReference[] references = targetSite.getFeatureReferences();

-		IFeatureReference currentReference = null;

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

-			currentReference = references[i];

-			// do not compare URL

-			try {

-				if (this.equals(currentReference.getFeature(null)))

-					return currentReference; // 18867

-			} catch (CoreException e) {

-				UpdateCore.warn(null, e);

-			}

-		}

-

-		UpdateCore.warn(

-			"ValidateAlreadyInstalled:Feature " //$NON-NLS-1$

-				+ this

-				+ " not found on site:" //$NON-NLS-1$

-				+ this.getURL());

-		return null;

-	}

-

-	/*

-	 * re initialize children of the feature, invalidate the cache

-	 * @param result FeatureReference to reinitialize.

-	 */

-	private void reinitializeFeature(IFeatureReference referenceToReinitialize) {

-

-		if (referenceToReinitialize == null)

-			return;

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)

-			UpdateCore.debug(

-				"Re initialize feature reference:" + referenceToReinitialize); //$NON-NLS-1$

-

-		IFeature feature = null;

-		try {

-			feature = referenceToReinitialize.getFeature(null);

-			if (feature != null && feature instanceof Feature) {

-				((Feature) feature).initializeIncludedReferences();

-			}

-			// bug 24981 - recursively go into hierarchy

-			// only if site if file 

-			ISite site = referenceToReinitialize.getSite();

-			if (site == null)

-				return;

-			URL url = site.getURL();

-			if (url == null)

-				return;

-			if ("file".equals(url.getProtocol())) { //$NON-NLS-1$

-				IFeatureReference[] included =

-					feature.getIncludedFeatureReferences();

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

-					reinitializeFeature(included[i]);

-				}

-			}

-		} catch (CoreException e) {

-			UpdateCore.warn("", e); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawIncludedFeatureReferences()

-	 */

-	public IIncludedFeatureReference[] getIncludedFeatureReferences()

-		throws CoreException {

-		return filterFeatures(getRawIncludedFeatureReferences());

-	}

-

-	/*

-	 * Method filterFeatures.

-	 * Also implemented in Site

-	 * 

-	 * @param list

-	 * @return List

-	 */

-	private IIncludedFeatureReference[] filterFeatures(IIncludedFeatureReference[] allIncluded) {

-		List list = new ArrayList();

-		if (allIncluded != null) {

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

-				IIncludedFeatureReference included = allIncluded[i];

-				if (UpdateManagerUtils.isValidEnvironment(included))

-					list.add(included);

-				else {

-					if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS) {

-						UpdateCore.warn(

-							"Filtered out feature reference:" + included); //$NON-NLS-1$

-					}

-				}

-			}

-		}

-

-		IIncludedFeatureReference[] result =

-			new IIncludedFeatureReference[list.size()];

-		if (!list.isEmpty()) {

-			list.toArray(result);

-		}

-

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawNonPluginEntries()

-	 */

-	public INonPluginEntry[] getNonPluginEntries() {

-		return filterNonPluginEntry(getRawNonPluginEntries());

-	}

-

-	/**

-	 * Method filterPluginEntry.

-	 * @param all

-	 * @return INonPluginEntry[]

-	 */

-	private INonPluginEntry[] filterNonPluginEntry(INonPluginEntry[] all) {

-		List list = new ArrayList();

-		if (all != null) {

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

-				if (UpdateManagerUtils.isValidEnvironment(all[i]))

-					list.add(all[i]);

-			}

-		}

-

-		INonPluginEntry[] result = new INonPluginEntry[list.size()];

-		if (!list.isEmpty()) {

-			list.toArray(result);

-		}

-

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawPluginEntries()

-	 */

-	public IPluginEntry[] getPluginEntries() {

-		return filterPluginEntry(getRawPluginEntries());

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getImports()

-	 */

-	public IImport[] getImports() {

-		return filterImports(getRawImports());

-	}

-

-	/**

-	 * Method filterImports.

-	 * @param all

-	 * @return IImport[]

-	 */

-	private IImport[] filterImports(IImport[] all) {

-		List list = new ArrayList();

-		if (all != null) {

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

-				if (UpdateManagerUtils.isValidEnvironment(all[i]))

-					list.add(all[i]);

-			}

-		}

-

-		IImport[] result = new IImport[list.size()];

-		if (!list.isEmpty()) {

-			list.toArray(result);

-		}

-

-		return result;

-	}

-

-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
deleted file mode 100644
index 4b186a4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.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.update.core;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * Base implementation of a feature content provider. This class provides a set
- * of helper methods useful for implementing feature content providers. In
- * particular, methods dealing with downloading and caching of feature files.
- * <p>
- * This class must be subclassed by clients.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IFeatureContentProvider
- * @since 2.0
- */
-public abstract class FeatureContentProvider
-	implements IFeatureContentProvider {
-
-	private static final boolean SWITCH_COPY_LOCAL = true;
-
-	/**
-	 *  
-	 */
-	public class FileFilter {
-
-		private IPath filterPath = null;
-
-		/**
-		 * Constructor for FileFilter.
-		 */
-		public FileFilter(String filter) {
-			super();
-			this.filterPath = new Path(filter);
-		}
-
-		/**
-		 * returns true if the name matches the rule
-		 */
-		public boolean accept(String name) {
-
-			if (name == null)
-				return false;
-
-			// no '*' pattern matching
-			// must be equals
-			IPath namePath = new Path(name);
-			if (filterPath.lastSegment().indexOf('*') == -1) {
-				return filterPath.equals(namePath);
-			}
-
-			// check same file extension if extension exists (a.txt/*.txt)
-			// or same file name (a.txt,a.*)
-			String extension = filterPath.getFileExtension();
-			if (!extension.equals("*")) { //$NON-NLS-1$
-				if (!extension.equalsIgnoreCase(namePath.getFileExtension()))
-					return false;
-			} else {
-				IPath noExtension = filterPath.removeFileExtension();
-				String fileName = noExtension.lastSegment();
-				if (!fileName.equals("*")) { //$NON-NLS-1$
-					if (!namePath.lastSegment().startsWith(fileName))
-						return false;
-				}
-			}
-
-			// check same path
-			IPath p1 = namePath.removeLastSegments(1);
-			IPath p2 = filterPath.removeLastSegments(1);
-			return p1.equals(p2);
-		}
-
-	}
-
-	private URL base;
-	private IFeature feature;
-	private File tmpDir; // local work area for each provider
-	public static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$	
-
-	private static final String DOT_PERMISSIONS = "permissions.properties"; //$NON-NLS-1$
-	private static final String EXECUTABLES = "permissions.executable"; //$NON-NLS-1$
-
-	// lock
-	private final static Object lock = new Object();
-
-	// hashtable of locks
-	private static Hashtable locks = new Hashtable();
-
-	/**
-	 * Feature content provider constructor
-	 * 
-	 * @param base
-	 *            feature URL. The interpretation of this URL is specific to
-	 *            each content provider.
-	 * @since 2.0
-	 */
-	public FeatureContentProvider(URL base) {
-		this.base = base;
-		this.feature = null;
-	}
-
-	/**
-	 * Returns the feature url.
-	 * 
-	 * @see IFeatureContentProvider#getURL()
-	 */
-	public URL getURL() {
-		return base;
-	}
-
-	/**
-	 * Returns the feature associated with this content provider.
-	 * 
-	 * @see IFeatureContentProvider#getFeature()
-	 */
-	public IFeature getFeature() {
-		return feature;
-	}
-
-	/**
-	 * Sets the feature associated with this content provider.
-	 * 
-	 * @see IFeatureContentProvider#setFeature(IFeature)
-	 */
-	public void setFeature(IFeature feature) {
-		this.feature = feature;
-	}
-
-	/**
-	 * Returns the specified reference as a local file system reference. If
-	 * required, the file represented by the specified content reference is
-	 * first downloaded to the local system
-	 * 
-	 * @param ref
-	 *            content reference
-	 * @param monitor
-	 *            progress monitor, can be <code>null</code>
-	 * @exception IOException
-	 * @exception CoreException
-	 * @since 2.0
-	 */
-	public ContentReference asLocalReference(
-		ContentReference ref,
-		InstallMonitor monitor)
-		throws IOException, CoreException {
-
-		// check to see if this is already a local reference
-		if (ref.isLocalReference())
-			return ref;
-
-		// check to see if we already have a local file for this reference
-		String key = ref.toString();
-
-		// need to synch as another thread my have created the file but
-		// is still copying into it
-		File localFile = null;
-		FileFragment localFileFragment = null;
-		Object keyLock = null;
-		synchronized (lock) {
-			if (locks.get(key) == null)
-				locks.put(key, key);
-			keyLock = locks.get(key);
-		}
-
-		synchronized (keyLock) {
-			localFile = Utilities.lookupLocalFile(key);
-			if (localFile != null) {
-				// check if the cached file is still valid (no newer version on
-				// server)
-				if (UpdateManagerUtils
-					.isSameTimestamp(ref.asURL(), localFile.lastModified()))
-					return ref.createContentReference(
-						ref.getIdentifier(),
-						localFile);
-			}
-
-			if (localFile == null) {
-				localFileFragment =
-					UpdateManagerUtils.lookupLocalFileFragment(key);
-			}
-			// 
-			// download the referenced file into local temporary area
-			InputStream is = null;
-			OutputStream os = null;
-			long bytesCopied = 0;
-			long inputLength = 0;
-			boolean success = false;
-			if (monitor != null) {
-				monitor.saveState();
-				monitor.setTaskName(
-					Policy.bind("FeatureContentProvider.Downloading")); //$NON-NLS-1$
-				monitor.subTask(ref.getIdentifier() + " "); //$NON-NLS-1$
-				monitor.setTotalCount(ref.getInputSize());
-				monitor.showCopyDetails(true);
-			}
-
-			try {
-				if (localFileFragment != null
-					&& "http".equals(ref.asURL().getProtocol())) { //$NON-NLS-1$
-					localFile = localFileFragment.getFile();
-					try {
-						// get partial input stream
-						is =
-							ref.getPartialInputStream(
-								localFileFragment.getSize());
-						inputLength = ref.getInputSize()-localFileFragment.getSize(); 
-						// get output stream to append to file fragment
-						os =
-							new BufferedOutputStream(
-								new FileOutputStream(localFile, true));
-					} catch (IOException e) {
-						try {
-							if (is != null)
-								is.close();
-						} catch (IOException ioe) {
-						}
-						is = null;
-						os = null;
-						localFileFragment = null;
-					}
-				}
-				if (is == null) {
-					// must download from scratch
-					localFile =
-						Utilities.createLocalFile(getWorkingDirectory(), null);
-					try {
-						is = ref.getInputStream();
-						inputLength = ref.getInputSize(); 
-					} catch (IOException e) {
-						throw Utilities.newCoreException(
-							Policy.bind(
-								"FeatureContentProvider.UnableToRetrieve", //$NON-NLS-1$
-								new Object[] { ref }),
-							e);
-					}
-
-					try {
-						os =
-							new BufferedOutputStream(
-								new FileOutputStream(localFile));
-					} catch (FileNotFoundException e) {
-						throw Utilities.newCoreException(
-							Policy.bind(
-								"FeatureContentProvider.UnableToCreate", //$NON-NLS-1$
-								new Object[] { localFile }),
-							e);
-					}
-				}
-
-				Date start = new Date();
-				if (localFileFragment != null) {
-					bytesCopied = localFileFragment.getSize();
-					if (monitor != null) {
-						monitor.incrementCount(bytesCopied);
-					}
-				}
-
-				// Transfer as many bytes as possible from input to output stream
-				long offset = UpdateManagerUtils.copy(is, os, monitor, inputLength);
-				if (offset != -1) {
-					bytesCopied += offset;
-					if (bytesCopied > 0) {
-						// preserve partially downloaded file
-						UpdateManagerUtils.mapLocalFileFragment(
-								key,
-								new FileFragment(localFile, bytesCopied));
-					}
-					if (monitor.isCanceled()) {
-						String msg = Policy.bind("Feature.InstallationCancelled"); //$NON-NLS-1$
-						throw new InstallAbortedException(msg, null);
-					} else {
-						throw new FeatureDownloadException(
-							Policy.bind(
-								"FeatureContentProvider.ExceptionDownloading", //$NON-NLS-1$
-								new Object[] { getURL().toExternalForm()}),
-							new IOException());
-					}
-				} else {
-					UpdateManagerUtils.unMapLocalFileFragment(key);
-				}
-
-				Date stop = new Date();
-				long timeInseconds = (stop.getTime() - start.getTime()) / 1000;
-				// time in milliseconds /1000 = time in seconds
-				InternalSiteManager.downloaded(
-					ref.getInputSize(),
-					(timeInseconds),
-					ref.asURL());
-
-				success = true;
-
-				// file is downloaded succesfully, map it
-				Utilities.mapLocalFile(key, localFile);
-			} catch (ClassCastException e) {
-				throw Utilities.newCoreException(
-					Policy.bind(
-						"FeatureContentProvider.UnableToCreate", //$NON-NLS-1$
-						new Object[] { localFile }),
-					e);
-			} finally {
-				//Do not close IS if user cancel,
-				//closing IS will read the entire Stream until the end
-				if (success && is != null)
-					try {
-						is.close();
-					} catch (IOException e) {
-					}
-				if (os != null)
-					try {
-						os.close(); // should flush buffer stream
-					} catch (IOException e) {
-					}
-
-				if (success || bytesCopied > 0) {
-					// set the timestamp on the temp file to match the remote
-					// timestamp
-					localFile.setLastModified(ref.getLastModified());
-				}
-				if (monitor != null)
-					monitor.restoreState();
-			}
-			locks.remove(key);
-		} // end lock
-		ContentReference reference =
-			ref.createContentReference(ref.getIdentifier(), localFile);
-		return reference;
-	}
-
-	/**
-	 * Returns the specified reference as a local file. If required, the file
-	 * represented by the specified content reference is first downloaded to
-	 * the local system
-	 * 
-	 * @param ref
-	 *            content reference
-	 * @param monitor
-	 *            progress monitor, can be <code>null</code>
-	 * @exception IOException
-	 * @exception CoreException
-	 * @since 2.0
-	 */
-	public File asLocalFile(ContentReference ref, InstallMonitor monitor)
-		throws IOException, CoreException {
-		File file = ref.asFile();
-		if (file != null && !SWITCH_COPY_LOCAL)
-			return file;
-		ContentReference localRef = asLocalReference(ref, monitor);
-		file = localRef.asFile();
-		return file;
-	}
-
-	/**
-	 * Returns working directory for this content provider
-	 * 
-	 * @return working directory
-	 * @exception IOException
-	 * @since 2.0
-	 */
-	protected File getWorkingDirectory() throws IOException {
-		if (tmpDir == null)
-			tmpDir = Utilities.createWorkingDirectory();
-		return tmpDir;
-	}
-
-	/**
-	 * Returns the total size of all archives required for the specified
-	 * plug-in and non-plug-in entries (the "packaging" view).
-	 * 
-	 * @see IFeatureContentProvider#getDownloadSizeFor(IPluginEntry[],
-	 *      INonPluginEntry[])
-	 */
-	public long getDownloadSizeFor(
-		IPluginEntry[] pluginEntries,
-		INonPluginEntry[] nonPluginEntries) {
-		long result = 0;
-
-		// if both are null or empty, return UNKNOWN size
-		if ((pluginEntries == null || pluginEntries.length == 0)
-			&& (nonPluginEntries == null || nonPluginEntries.length == 0)) {
-			return ContentEntryModel.UNKNOWN_SIZE;
-		}
-
-		// loop on plugin entries
-		long size = 0;
-		if (pluginEntries != null)
-			for (int i = 0; i < pluginEntries.length; i++) {
-				size = ((PluginEntryModel) pluginEntries[i]).getDownloadSize();
-				if (size == ContentEntryModel.UNKNOWN_SIZE) {
-					return ContentEntryModel.UNKNOWN_SIZE;
-				}
-				result += size;
-			}
-
-		// loop on non plugin entries
-		if (nonPluginEntries != null)
-			for (int i = 0; i < nonPluginEntries.length; i++) {
-				size =
-					((NonPluginEntryModel) nonPluginEntries[i])
-						.getDownloadSize();
-				if (size == ContentEntryModel.UNKNOWN_SIZE) {
-					return ContentEntryModel.UNKNOWN_SIZE;
-				}
-				result += size;
-			}
-
-		return result;
-	}
-
-	/**
-	 * Returns the total size of all files required for the specified plug-in
-	 * and non-plug-in entries (the "logical" view).
-	 * 
-	 * @see IFeatureContentProvider#getInstallSizeFor(IPluginEntry[],
-	 *      INonPluginEntry[])
-	 */
-	public long getInstallSizeFor(
-		IPluginEntry[] pluginEntries,
-		INonPluginEntry[] nonPluginEntries) {
-		long result = 0;
-
-		// if both are null or empty, return UNKNOWN size
-		if ((pluginEntries == null || pluginEntries.length == 0)
-			&& (nonPluginEntries == null || nonPluginEntries.length == 0)) {
-			return ContentEntryModel.UNKNOWN_SIZE;
-		}
-
-		// loop on plugin entries
-		long size = 0;
-		if (pluginEntries != null)
-			for (int i = 0; i < pluginEntries.length; i++) {
-				size = ((PluginEntryModel) pluginEntries[i]).getInstallSize();
-				if (size == ContentEntryModel.UNKNOWN_SIZE) {
-					return ContentEntryModel.UNKNOWN_SIZE;
-				}
-				result += size;
-			}
-
-		// loop on non plugin entries
-		if (nonPluginEntries != null)
-			for (int i = 0; i < nonPluginEntries.length; i++) {
-				size =
-					((NonPluginEntryModel) nonPluginEntries[i])
-						.getInstallSize();
-				if (size == ContentEntryModel.UNKNOWN_SIZE) {
-					return ContentEntryModel.UNKNOWN_SIZE;
-				}
-				result += size;
-			}
-
-		return result;
-	}
-
-	/**
-	 * Returns the path identifier for a plugin entry. <code>plugins/&lt;pluginId>_&lt;pluginVersion>.jar</code>
-	 * 
-	 * @return the path identifier
-	 */
-	protected String getPathID(IPluginEntry entry) {
-		return Site.DEFAULT_PLUGIN_PATH
-			+ entry.getVersionedIdentifier().toString()
-			+ JAR_EXTENSION;
-	}
-
-	/**
-	 * Returns the path identifer for a non plugin entry. <code>features/&lt;featureId>_&lt;featureVersion>/&lt;dataId></code>
-	 * 
-	 * @return the path identifier
-	 */
-	protected String getPathID(INonPluginEntry entry) {
-		String nonPluginBaseID =
-			Site.DEFAULT_FEATURE_PATH
-				+ feature.getVersionedIdentifier().toString()
-				+ "/"; //$NON-NLS-1$
-		return nonPluginBaseID + entry.getIdentifier();
-	}
-
-	/**
-	 * Sets the permission of all the ContentReferences Check for the
-	 * .permissions contentReference and use it to set the permissions of other
-	 * ContentReference
-	 */
-	protected void validatePermissions(ContentReference[] references) {
-
-		if (references == null || references.length == 0)
-			return;
-
-		Map permissions = getPermissions(references);
-		if (permissions.isEmpty())
-			return;
-
-		for (int i = 0; i < references.length; i++) {
-			ContentReference contentReference = references[i];
-			String id = contentReference.getIdentifier();
-			Object value = null;
-			if ((value = matchesOneRule(id, permissions)) != null) {
-				Integer permission = (Integer) value;
-				contentReference.setPermission(permission.intValue());
-			}
-		}
-	}
-
-	/**
-	 * Returns the value of the matching rule or <code>null</code> if none
-	 * found. A rule is matched if the id is equals to a key, or if the id is
-	 * resolved by a key. if the id is <code>/path/file.txt</code> it is
-	 * resolved by <code>/path/*</code> or <code>/path/*.txt</code>
-	 * 
-	 * @param id
-	 *            the identifier
-	 * @param permissions
-	 *            list of rules
-	 * @return Object the value of the matcing rule or <code>null</code>
-	 */
-	private Object matchesOneRule(String id, Map permissions) {
-
-		Set keySet = permissions.keySet();
-		Iterator iter = keySet.iterator();
-		while (iter.hasNext()) {
-			FileFilter rule = (FileFilter) iter.next();
-			if (rule.accept(id)) {
-				return permissions.get(rule);
-			}
-		}
-
-		return null;
-	}
-
-	/*
-	 * returns the permission MAP
-	 */
-	private Map getPermissions(ContentReference[] references) {
-
-		Map result = new HashMap();
-		// search for .permissions
-		boolean notfound = true;
-		ContentReference permissionReference = null;
-		for (int i = 0; i < references.length && notfound; i++) {
-			ContentReference contentReference = references[i];
-			if (DOT_PERMISSIONS.equals(contentReference.getIdentifier())) {
-				notfound = false;
-				permissionReference = contentReference;
-			}
-		}
-		if (notfound)
-			return result;
-
-		Properties prop = new Properties();
-		try {
-			prop.load(permissionReference.getInputStream());
-		} catch (IOException e) {
-			UpdateCore.warn("", e); //$NON-NLS-1$
-		}
-
-		String executables = prop.getProperty(EXECUTABLES);
-		if (executables == null)
-			return result;
-
-		StringTokenizer tokenizer = new StringTokenizer(executables, ","); //$NON-NLS-1$
-		Integer defaultExecutablePermission =
-			new Integer(ContentReference.DEFAULT_EXECUTABLE_PERMISSION);
-		while (tokenizer.hasMoreTokens()) {
-			FileFilter filter = new FileFilter(tokenizer.nextToken());
-			result.put(filter, defaultExecutablePermission);
-		}
-
-		return result;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
deleted file mode 100644
index dba2ac8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.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.core;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * Convenience implementation of a feature reference.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p> 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IFeatureReference
- * @see org.eclipse.update.core.model.FeatureReferenceModel
- * @since 2.0
- */
-public class FeatureReference extends FeatureReferenceModel implements IFeatureReference, IPlatformEnvironment {
-
-	private VersionedIdentifier versionId;
-
-	//PERF: new instance variable
-	private IFeature exactFeature;
-
-	/**
-	 * Feature reference default constructor
-	 */
-	public FeatureReference() {
-		super();
-	}
-
-	/**
-	 * Constructor FeatureReference.
-	 * @param ref the reference to copy
-	 */
-	public FeatureReference(IFeatureReference ref) {
-		super((FeatureReferenceModel) ref);
-		try {
-			setURL(ref.getURL());
-		} catch (CoreException e) {
-			UpdateCore.warn("", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Constructor FeatureReference.
-	 * @param ref the reference to copy
-	 */
-	public FeatureReference(FeatureReferenceModel ref) {
-		super(ref);
-		try {
-			setURL(ref.getURL());
-		} catch (CoreException e) {
-			UpdateCore.warn("", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Returns the feature this reference points to 
-	 * @return the feature on the Site
-	 * @deprecated use getFeaure(IProgressMonitor)
-	 */
-	public IFeature getFeature() throws CoreException {
-		return getFeature(null);
-	}
-
-	/**
-	 * Returns the feature this reference points to 
-	 *  @return the feature on the Site
-	 */
-	public IFeature getFeature(IProgressMonitor monitor) throws CoreException {
-
-		if (exactFeature != null)
-			return exactFeature;
-		exactFeature = getFeature(this,monitor);
-		return exactFeature;
-	}
-
-	/**
-	 * Returns the feature the reference points to 
-	 * @param ref the feature reference
-	 * @return the feature on the Site
-	 */
-	protected IFeature getFeature(IFeatureReference ref,IProgressMonitor monitor) throws CoreException {
-
-		IFeature feature = null;
-		URL refURL = ref.getURL();
-		feature = createFeature(refURL,monitor);
-		return feature;
-	}
-
-	/*
-	 * create an instance of a concrete feature corresponding to this reference
-	 */
-	private IFeature createFeature(URL url,IProgressMonitor monitor) throws CoreException {
-		String type = getType();
-		ISite site = getSite();
-		// if the site exists, use the site factory
-		if (site != null) {
-			return site.createFeature(type, url, monitor);
-		}
-		
-		IFeatureFactory factory = FeatureTypeFactory.getInstance().getFactory(type);
-		return factory.createFeature(url, site, monitor);
-	}
-
-	/**
-	 * Returns the update site for the referenced feature
-	 * 
-	 * @see IFeatureReference#getSite()
-	 * @since 2.0 
-	 */
-	public ISite getSite() {
-		return (ISite) getSiteModel();
-	}
-
-	/** 
-	 * Sets the feature reference URL.
-	 * This is typically performed as part of the feature reference creation
-	 * operation. Once set, the url should not be reset.
-	 * 
-	 * @see IFeatureReference#setURL(URL)
-	 * @since 2.0 
-	 */
-	public void setURL(URL url) throws CoreException {
-		if (url != null) {
-			setURLString(url.toExternalForm());
-			try {
-				resolve(url, null);
-			} catch (MalformedURLException e) {
-				throw Utilities.newCoreException(Policy.bind("FeatureReference.UnableToResolveURL", url.toExternalForm()), e);	//$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * Associates a site with the feature reference.
-	 * This is typically performed as part of the feature reference creation
-	 * operation. Once set, the site should not be reset.
-	 * 
-	 * @see IFeatureReference#setSite(ISite)
-	 * @since 2.0 
-	 */
-	public void setSite(ISite site) {
-		setSiteModel((SiteModel) site);
-	}
-
-	/**
-	* Returns the feature identifier.
-	* 
-	* @see IFeatureReference#getVersionedIdentifier()
-	* @since 2.0
-	*/
-	public VersionedIdentifier getVersionedIdentifier() {
-
-		if (versionId != null)
-			return versionId;
-
-		String id = getFeatureIdentifier();
-		String ver = getFeatureVersion();
-		if (id != null && ver != null) {
-			try {
-				versionId = new VersionedIdentifier(id, ver);
-				return versionId;
-			} catch (Exception e) {
-				UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-
-		// we need the exact match or we may have an infinite loop
-		versionId = new VersionedIdentifier(getURL().toExternalForm(), null);
-		try {
-			versionId = getFeature(null).getVersionedIdentifier();
-		} catch (CoreException e) {
-			UpdateCore.warn("", e); //$NON-NLS-1$
-		}
-		return versionId;
-	}
-
-	/**
-	 * @see org.eclipse.update.core.IFeatureReference#getName()
-	 */
-	public String getName() {
-		if (super.getLabel() != null)
-			return super.getLabel();
-		try {
-			return getFeature(null).getLabel();
-		} catch (CoreException e) {
-			return getVersionedIdentifier().toString();
-		}
-	}
-
-	/**
-	 * Get optional operating system specification as a comma-separated string.
-	 *
-	 * @return the operating system specification string, or <code>null</code>.
-	 * @since 2.1
-	 */
-	public String getOS() {
-		if (super.getOS() == null && getURL()!=null)
-			try {
-				return getFeature(null).getOS();
-			} catch (CoreException e) {
-				return null;
-			}
-		return super.getOS();
-	}
-
-	/**
-	 * Get optional windowing system specification as a comma-separated string.
-	 *
-	 * @return the windowing system specification string, or <code>null</code>.
-	 * @since 2.1
-	 */
-	public String getWS() {
-		if (super.getWS() == null && getURL()!=null)
-			try {
-				return getFeature(null).getWS();
-			} catch (CoreException e) {
-				return null;
-			}
-		return super.getWS();
-	}
-
-	/**
-	 * Get optional system architecture specification as a comma-separated string.
-	 *
-	 * @return the system architecture specification string, or <code>null</code>.
-	 * @since 2.1
-	 */
-	public String getOSArch() {
-		if (super.getOSArch() == null && getURL()!=null)
-			try {
-				return getFeature(null).getOSArch();
-			} catch (CoreException e) {
-				return null;
-			}
-		return super.getOSArch();
-	}
-
-	/**
-	 * Get optional locale specification as a comma-separated string.
-	 *
-	 * @return the locale specification string, or <code>null</code>.
-	 * @since 2.1
-	 */
-	public String getNL() {
-		if (super.getNL() == null && getURL()!=null)
-			try {
-				return getFeature(null).getNL();
-			} catch (CoreException e) {
-				return null;
-			}
-		return super.getNL();
-	}
-
-	/**
-	 * Returns <code>true</code> if this feature is patching another feature,
-	 * <code>false</code> otherwise
-	 * @return boolean
-	 */
-	public boolean isPatch() {
-		if (super.getPatch() == null)
-			try {
-				return getFeature(null).isPatch();
-			} catch (CoreException e) {
-				return false;
-			}
-		return "true".equalsIgnoreCase(super.getPatch()); //$NON-NLS-1$
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
deleted file mode 100644
index ba777c7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.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.update.core;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Site archive interface.
- * Site archive is a representation of a packaged archive (file) located
- * on an update site. It allows a "symbolic" path used to identify
- * a plug-in or non-plug-in feature entry to be explicitly mapped
- * to a specific URL. 
- * <p>
- * Clients may implement this interface. However, in most cases clients should 
- * directly instantiate or subclass the provided implementation of this 
- * interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.ArchiveReference
- * @since 2.0
- */
-public interface IArchiveReference extends IAdaptable {
-
-	/** 
-	 * 
-	 * @return the archive "symbolic" path, or <code>null</code>
-	 * @since 2.0 
-	 */
-	public String getPath();
-
-	/**
-	 * Retrieve the site archive URL 
-	 * 
-	 * @return the archive URL, or <code>null</code>
-	 * @since 2.0 
-	 */
-	public URL getURL();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
deleted file mode 100644
index 21f4645..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.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.update.core;

-

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

-

-/**

- * Feature category definition.

- * A site can organize its features into categories. Categories

- * can be further organized into hierarchies. Each category name

- * is a composed of the name of its parent and a simple identifier

- * separated by a slash ("/"). For example <code>tools/utilities/print</code>

- * defines a category that is a child of <code>tools/utilities</code> and

- * grandchild of <code>tools</code>.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.Category

- * @since 2.0

- */

-public interface ICategory  extends IAdaptable{

-

-	/** 

-	 * Retrieve the name of the category. The name can be a simple

-	 * token (root category) or a number of slash-separated ("/") 

-	 * tokens.

-	 * 

-	 * @return the category name

-	 * @since 2.0 

-	 */

-	public String getName();

-

-	/**

-	 * Retrieve the displayable label for the category

-	 * 

-	 * @return displayable category label, or <code>null</code>

-	 * @since 2.0 

-	 */

-	public String getLabel();

-

-	/** 

-	 * Retrieve the detailed category description

-	 * 

-	 * @return category description, or <code>null</code>

-	 * @since 2.0 

-	 */

-	public IURLEntry getDescription();

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
deleted file mode 100644
index 2c5bf4e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.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.update.core;

-

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

-

-/**

- * Generic content consumer.

- * A generic content consumer is used to store plug-in and non-plug-in files

- * for a feature.

- * <p>

- * Clients may implement this interface. However, in most cases clients 

- * will only use the content consumer provided by the feature type(s)

- * implemented by the platform.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.IFeatureContentConsumer

- * @since 2.0

- */

-public interface IContentConsumer {

-

-	/**

-	 * Stores a file.

-	 * 

-	 * @see IFeatureContentConsumer#open(IPluginEntry)

-	 * @see IFeatureContentConsumer#open(INonPluginEntry)

-	 * @param contentReference reference to the file to store

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Indicates successful completion of the store operations for this

-	 * consumer

-	 * 

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public void close() throws CoreException;

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
deleted file mode 100644
index 2dd17cb..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.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.update.core;

-

-import java.net.*;

-

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

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

-

-/**

- * Feature defines the packaging "container" for a group of related plug-ins,

- * plug-in fragments, and optionally non-plug-in files. 

- * <p>

- * Features are treated purely as an installation and packaging construct. 

- * They do not play a role during Eclipse plug-in execution.

- * They are simply an inclusive "manifest" of the plug-ins, fragments 

- * and other files that make up that feature. If features are logically made 

- * up of plug-ins from "sub-features", the top-level feature "manifest"

- * must be fully resolved at packaging time.

- * </p>

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.Feature

- * @since 2.0

- */

-public interface IFeature extends IAdaptable, IPlatformEnvironment {

-

-	/**

-	 * Indicates a 'happy' feature

-	 * A feature is considered to be 'happy' in the context of a local site

-	 * if all the plug-ins referenced by the feature are installed on the site and no other

-	 * version of any of the plug-ins are installed on any other site of the local site.

-	 * 

-	 * @see org.eclipse.update.configuration.IConfiguredSite#getBrokenStatus(IFeature)

-	 * @since 2.0

-	 */

-	public static final int STATUS_HAPPY = 0;

-

-	/**

-	 * Indicates a 'happy' feature

-	 * A feature is considered to be 'ambiguous' in the context of a local site

-	 * if all the plug-ins referenced by the feature are installed on the site and other

-	 * version of any of the plug-ins are installed on any other site of the local site.

-	 * 

-	 * @see org.eclipse.update.configuration.IConfiguredSite#getBrokenStatus(IFeature)

-	 */	

-	public static final int STATUS_AMBIGUOUS = 1;

-	

-	/**

-	 * Indicates an 'unhappy' feature

-	 * A feature is considered to be 'unhappy' in the context of this site,

-	 * if some of the plug-ins referenced by the feature are not installed on this site.

-	 * 

-	 * @see org.eclipse.update.configuration.IConfiguredSite#getBrokenStatus(IFeature)

-	 * @since 2.0

-	 */	

-	public static final int STATUS_UNHAPPY = 2;

-	

-	

-	/**

-	 * Indicates a disable feature

-	 * 

-	 * @see org.eclipse.update.configuration.IConfiguredSite#getBrokenStatus(IFeature)

-	 * @since 2.0.2

-	 */	

-	public static final int STATUS_DISABLED = -1;

-		

-	/**

-	 * Indicates the one-click update will search the 

-	 * location of the nesting root feature.

-	 * 

-	 * @since 2.0.1

-	 */	

-	public static final int SEARCH_LOCATION_DEFAULT = 0;	

-

-	/**

-	 * Indicates the one-click update will search the 

-	 * location defined by the feature.

-	 * 

-	 * @since 2.0.1

-	 */	

-	public static final int SEARCH_LOCATION_FEATURE = 1;	

-

-	/**

-	 * Indicates the one-click update will search both the 

-	 * location of the nesting root feature and the 

-	 * location defined by the feature.

-	 * 

-	 * @since 2.0.1

-	 */	

-	public static final int SEARCH_LOCATION_BOTH = 2;	

-

-	

-	/**

-	 * Returns the feature identifier.

-	 * 

-	 * @return the feature identifier.

-	 * @since 2.0 

-	 */

-	public VersionedIdentifier getVersionedIdentifier();

-

-	/**

-	 * Returns the site this feature is associated with.

-	 * 

-	 * @return the site for this feature

-	 * @since 2.0 

-	 */

-	public ISite getSite();

-

-	/**

-	 * Returns the displayable label of the feature.

-	 * 

-	 * @return feature label, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public String getLabel();

-

-	/**

-	 * Returns the feature URL.

-	 * This is the URL that was used to create the feature. The interpretation

-	 * of the URL is dependent on the concrete feature implementation.  * 

-	 * @return feature URL

-	 * @since 2.0 

-	 */

-	public URL getURL();

-

-	/**

-	 * Returns an information entry referencing the location of the

-	 * feature update site. The update site can be accessed to obtain

-	 * feature updates for this feature.

-	 * 

-	 * @return update site entry, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public IURLEntry getUpdateSiteEntry();

-

-	/**

-	 * Return an array of information entries referencing locations of other

-	 * update sites. This mechanism can be used by features to distribute

-	 * location information about general update sites to clients.

-	 * 

-	 * @return an array of site entries, or an empty array.

-	 * @since 2.0 

-	 */

-	public IURLEntry[] getDiscoverySiteEntries();

-

-	/**

-	 * Returns a displayable label identifying the provider of this feature

-	 * 

-	 * @return provider label, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public String getProvider();

-

-	/**

-	 * Returns and optional custom install handler entry.

-	 * 

-	 * @return install handler entry, or <code>null</code> if

-	 * none was specified

-	 * @since 2.0

-	 */

-	public IInstallHandlerEntry getInstallHandlerEntry();

-

-	/**

-	 * Returns the feature description.

-	 * 

-	 * @return feature rescription, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public IURLEntry getDescription();

-

-	/**

-	 * Returns the copyright information for the feature.

-	 * 

-	 * @return copyright information, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public IURLEntry getCopyright();

-

-	/**

-	 * Returns the license information for the feature.

-	 * 

-	 * @return feature license, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public IURLEntry getLicense();

-

-	/**

-	 * Return optional image for the feature.

-	 * 

-	 * @return the URL pointing to the image, , or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public URL getImage();

-

-	/**

-	 * Return a list of plug-in dependencies for this feature. A plug-in

-	 * dependency is a reference to a plug-in required for feature execution

-	 * that is not packaged as part of the feature.

-	 * filtered by the operating system, windowing system and architecture system

-	 * set in <code>Sitemanager</code>

-	 * 

-	 * @return the list of required plug-in dependencies, or an empty array.

-	 * @since 2.0 

-	 */

-	public IImport[] getImports();

-

-	/**

-	 * Return a list of plug-in dependencies for this feature. A plug-in

-	 * dependency is a reference to a plug-in required for feature execution

-	 * that is not packaged as part of the feature.

- 	 * No filtering occurs

-	 * 

-	 * @return the list of required plug-in dependencies, or an empty array.

-	 * @since 2.1

-	 */

-	public IImport[] getRawImports();

-	

-	/**

-	 * Return the identifier of the primary plugin associated to this feature

-	 * or <code>null</code> if the feature is not a primary feature.

-	 * If the primary plugin id is not specified and the feature is a primary

-	 * feature, returns the feature identifier.

-	 * 

-	 * @return the identifier of the associated primary plugin or <code>null</code>

-	 * @since 2.1 

-	 */

-	public String getPrimaryPluginID();

-

-

-	/**

-	 * Install the contents of this feature into the specified target feature.

-	 * All optional features will be installed

-	 * 

-	 * @param targetFeature

-	 * @param verificationListener

-	 * @param monitor

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @since 2.0

-	 */

-	public IFeatureReference install(

-		IFeature targetFeature,

-		IVerificationListener verificationListener,

-		IProgressMonitor monitor)

-		throws InstallAbortedException,CoreException;

-

-	/**

-	 * Install the contents of this feature into the specified target feature.

-	 * Only the listed optional features will be installed.

-	 * 

-	 * @param targetFeature

-	 * @param optionalFeatures the optional features to be installed

-	 * @param verificationListener

-	 * @param monitor

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @since 2.0.1

-	 */

-	public IFeatureReference install(

-		IFeature targetFeature,

-		IFeatureReference[] optionalFeatures,

-		IVerificationListener verificationListener,

-		IProgressMonitor monitor)

-		throws InstallAbortedException,CoreException;

-

-	/**

-	 * Returns an array of feature references included by this feature

-	 * filtered by the operating system, windowing system and architecture system

-	 * set in <code>Sitemanager</code>

-	 * 

-	 * @return an erray of feature references, or an empty array.

-	 * @since 2.0

-	 */

-	public IIncludedFeatureReference[] getIncludedFeatureReferences() throws CoreException;

-

-	/**

-	 * Returns an array of feature references included by this feature

-	 * No filtering occurs

-	 * 

-	 * @return an erray of feature references, or an empty array.

-	 * @since 2.0

-	 */

-	public IIncludedFeatureReference[] getRawIncludedFeatureReferences() throws CoreException;

-

-	/**

-	 * Returns an array of plug-in entries referenced by this feature

-	 * filtered by the operating system, windowing system and architecture system

-	 * set in <code>Sitemanager</code>

-	 * 

-	 * @return an erray of plug-in entries, or an empty array.

-	 * @since 2.0

-	 */

-	public IPluginEntry[] getPluginEntries();

-

-	/**

-	 * Returns an array of plug-in entries referenced by this feature

-	 * No filtering occurs

-	 * 

-	 * @return an erray of plug-in entries, or an empty array.

-	 * @since 2.1

-	 */

-	public IPluginEntry[] getRawPluginEntries();

-

-	/**

-	 * Returns the count of referenced plug-in entries.

-	 * 

-	 * @return plug-in entry count

-	 * @since 2.0

-	 */

-	public int getPluginEntryCount();

-

-	/**

-	 * Returns an array of non-plug-in entries referenced by this feature

-	 * filtered by the operating system, windowing system and architecture system

-	 * set in <code>Sitemanager</code>

-	 * 

-	 * @return an erray of non-plug-in entries, or an empty array.

-	 * @since 2.0

-	 */

-	public INonPluginEntry[] getNonPluginEntries();

-

-	/**

-	 * Returns an array of non-plug-in entries referenced by this feature

-	 * No filtering occurs

-	 * 

-	 * @return an erray of non-plug-in entries, or an empty array.

-	 * @since 2.1

-	 */

-	public INonPluginEntry[] getRawNonPluginEntries();

-

-	/**

-	 * Returns the count of referenced non-plug-in entries.

-	 * 

-	 * @return non-plug-in entry count

-	 * @since 2.0

-	 */

-	public int getNonPluginEntryCount();

-

-	/**

-	 * Returns the download size of the feature, if it can be determined.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @return download size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getDownloadSize();

-

-	/**

-	 * Returns the install size of the feature, if it can be determined.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @return install size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getInstallSize();

-

-	/**

-	 * Indicates whether the feature can be used as a primary feature.

-	 * 

-	 * @return <code>true</code> if this is a primary feature, 

-	 * otherwise <code>false</code>

-	 * @since 2.0 

-	 */

-	public boolean isPrimary();

-	

-	/**

-	 * Indicates whether the feature must be processed alone during installation

-	 * and configuration. Features that are not exclusive can be installed in a

-	 * batch.

-	 * 

-	 * @return <code>true</code> if feature requires exclusive processing,

-	 * <code>false</code> otherwise.

-	 * @since 2.1

-	 */

-	public boolean isExclusive();

-

-	/**

-	 * Returns an optional identifier of an application to be used when

-	 * starting up the platform with this feature as the primary feature.

-	 * The application identifier must represent a valid application registered

-	 * in the <code>org.eclipse.core.runtime.applications</code> extension point.

-	 * 

-	 * @return application identifier, or <code>null</code>

-	 * @since 2.0 

-	 */

-	public String getApplication();

-	

-	/**

-	 * Returns an optional identifier of a colocation affinity feature.

-	 * 

-	 * @return feature identifier, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getAffinityFeature();

-

-	/**

-	 * Returns the content provider for this feature. A content provider

-	 * is an abstraction of each feature internal packaging structure.

-	 * It allows the feature content to be accessed in a standard way

-	 * regardless of the internal packaging. All concrete features

-	 * need to be able to return a content provider.

-	 * 

-	 * @return feature content provider

-	 * @exception CoreException

-	 * @since 2.0

-	 */

-	public IFeatureContentProvider getFeatureContentProvider()

-		throws CoreException;

-

-	/**

-	 * Returns the content consumer for this feature. A content consumer

-	 * is an abstraction of each feature internal packaging mechanism.

-	 * It allows content to be stored into a feature in a standard way

-	 * regardless of the packaging mechanism used. Only concrete features

-	 * that support storing need to implement a content consumer. The platform

-	 * implements at least one feature type supporting content consumer.

-	 * This is the feature type representing a locally-installed

-	 * feature.

-	 * 

-	 * @return feature content consumer

-	 * @exception CoreException

-	 * @exception UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public IFeatureContentConsumer getFeatureContentConsumer()

-		throws CoreException;

-

-	/**

-	 * Sets the site for this feature. This is typically performed as part

-	 * of the feature creation operation. Once set, the site

-	 * should not be reset.

-	 * 

-	 * @param site the site

-	 * @throws CoreException site for this feature is already set

-	 * @since 2.0 

-	 */

-	public void setSite(ISite site) throws CoreException;

-

-	/**

-	 * Sets the content provider for this feature. This is typically

-	 * performed as part of the feature creation operation. Once set, the 

-	 * provider should not be reset.

-	 * 

-	 * @param featureContentProvider content provider

-	 * @since 2.0

-	 */

-	public void setFeatureContentProvider(IFeatureContentProvider featureContentProvider);

-

-	/**

-	 * Returns <code>true</code> if this feature is patching another feature,

-	 * <code>false</code> otherwise

-	 * @return boolean

-	 * @since 2.1

-	 */

-	public boolean isPatch();

-

-

-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
deleted file mode 100644
index 7ae37f7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.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.update.core;

-

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

-

-/**

- * Feature content consumer.

- * A feature content consumer is an abstraction of each feature internal

- * packaging mechanism. It allows content to be stored into a feature in

- * a standard way regardless of the packaging mechanism used. Only concrete

- * features that support storing need to implement a content consumer. 

- * The platform implements at least one feature type supporting content

- * consumer. This is the feature type representing a locally-installed

- * feature.

- * <p>

- * A feature content consumer delegates the storage of plug-in and 

- * non-plug-in files to a generic content consumer.

- * </p>

- * <p>

- * Clients may implement this interface. However, in most cases clients 

- * will only use the feature content consumer provided by the feature type(s)

- * implemented by the platform.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.IContentConsumer

- * @since 2.0

- */

-public interface IFeatureContentConsumer {

-

-	

-	/**

-	 * Store a feature file.

-	 * Note that only the feature definition files should be stored using

-	 * this method. Plug-in files and non-plug-in data files should be

-	 * stored using the content consumers corresponding to their respective

-	 * entries.

-	 * 

-	 * @see #open(IPluginEntry)

-	 * @see #open(INonPluginEntry)	 

-	 * @param contentReference content reference to feature file

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Opens a generic content consumer for the specified plug-in entry.

-	 * Plug-in files corresponding to this entry should be stored

-	 * using this content consumer.

-	 * 

-	 * @param pluginEntry plug-in entry

-	 * @return generic content consumer for the entry

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException;

-

-	/**

-	 * Opens a generic content consumer for the specified non-plug-in entry.

-	 * Non-plug-in files corresponding to this entry should be stored

-	 * using this content consumer.

-	 * 

-	 * @param nonPluginEntry non-plug-in entry

-	 * @return generic content consumer for the entry

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public IContentConsumer open(INonPluginEntry nonPluginEntry)

-		throws CoreException;

-

-	/**

-	 * Closes this content consumer. This indicates a successful completion

-	 * of the store operations. The content consumer commits any changes

-	 * made by this consumer.

-	 * 

-	 * @return reference to the newly populated feature

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public IFeatureReference close() throws CoreException;

-

-	/**

-	 * Closes this content consumer, indicating the store operations should

-	 * be aborted. The content consumer attempts to back out any changes

-	 * made by this content consumer.

-	 * 

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public void abort() throws CoreException;

-

-	/**

-	 * Sets the feature for this content consumer.

-	 * In general, this method should only be called as part of

-	 * feature creation. Once set, the feature should not be reset.

-	 * 

-	 * @param feature feature for this content consumer

-	 * @since 2.0

-	 */

-	public void setFeature(IFeature feature);

-

-	/**

-	 * Returns the feature for this content consumer.

-	 *

-	 * @return the feature for this content consumer

-	 * @since 2.0

-	 */

-	public IFeature getFeature();

-

-	/**

-	 * Sets the parent for this content consumer.

-	 * In general, this method should only be called as part of

-	 * feature creation. Once set, the feature should not be reset.

-	 * 

-	 * @param parent parent feature content consumer.

-	 * @since 2.0 

-	 */

-	public void setParent(IFeatureContentConsumer parent);

-

-	/**

-	 * Returns the feature content consumer that opened

-	 * this feature content consumer, or <code>null</code>

-	 * if this feature content consumer is a root feature

-	 * content consumer.

-	 *

-	 * @return the parent feature content consumer, or null.

-	 * @since 2.0

-	 */

-	public IFeatureContentConsumer getParent();

-

-	/**

-	 * Link the content consumer of the feature as a child

-	 * content consumer

-	 * 

-	 * @param feature the child feature.

-	 * @throws CoreException 

-	 * @since 2.0 

-	 */

-	public void addChild(IFeature feature) throws CoreException;

-

-	/**

-	 * Returns the feature content consumers that

-	 * this feature content consumer opened

-	 *

-	 * @return an array of feature content consumer, or en empty array.

-	 * @since 2.0

-	 */

-	public IFeatureContentConsumer[] getChildren();

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
deleted file mode 100644
index 0580b0d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
+++ /dev/null

@@ -1,268 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.net.*;

-

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

-

-/**

- * Feature content provider.

- * A feature content provider is an abstraction of each feature internal 

- * packaging structure. It allows the feature content to be accessed in

- * a standard way regardless of the internal packaging. All concrete feature

- * implementations need to implement a feature content provider.

- * <p>

- * There are two ways of looking at a feature content:

- * <ol>

- * <li>the "logical" view, which is a representation of the actual files that

- * make up the feature. These include any files that describe the feature

- * itself, files that are the actual implementation of referenced plug-ins,

- * and files that are the non-plug-in data files associated with the feature

- * <li>the "packaged" view, which is a set of related archive files that

- * contain the "logical" files.

- * </ol>

- * It is the responsibility of a feature content provider to manage the

- * mapping between the "packaged" and "logical" views.

- * </p>

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.FeatureContentProvider

- * @since 2.0

- */

-public interface IFeatureContentProvider {

-

-	/**

-	 * Returns the feature url. 

-	 * The exact interpretation of this URL is specific to each content

-	 * provider. Typically, the URL is a reference to a file that can be 

-	 * used directly, or indirectly, to determine the content of the feature.

-	 * 

-	 * @return feature url

-	 * @since 2.0

-	 */

-	public URL getURL();

-

-	/**

-	 * Returns a content reference to the feature manifest. The feature manifest

-	 * is an xml file, whose format is specified by the platform. Typically

-	 * a feature will contain the manifest as one of the packaged files.

-	 * For features that do not contain the manifest, or contain a manifest

-	 * that does not follow the specified format, this method returns

-	 * a reference to a computed manifest in the appropriate platform

-	 * format.

-	 * 

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return feature manifest reference, or <code>null</code> if the manifest cannot be found.

-	 * @since 2.0

-	 */

-	public ContentReference getFeatureManifestReference(InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns an array of content references of all the "packaged"

-	 * archives that make up this feature. 

-	 * <p>

-	 * The number of returned references is dependent on each feature 

-	 * content provider (i.e is dependent on the packaging mechanism used

-	 * by the particular feature type).

-	 * </p>

-	 * 

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return an array of references, or an empty array if no references

-	 * are found

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public ContentReference[] getArchiveReferences(InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns an array of content references of the "packaged"

-	 * archives that contain the feature descriptive information.

-	 * <p>

-	 * In general, the feature descriptive information should be packaged

-	 * separately from the "bulk" of the actual feature content.

-	 * The feature entry archive(s) must be downloaded from an update

-	 * site in order to present information about the feature to the

-	 * client. Consequently, keeping the number and size of the feature

-	 * entry archive(s) to a minimum will speed up the responsiveness of the

-	 * user interface.

-	 * </p>

-	 * <p>

-	 * The number of returned references is dependent on each feature

-	 * content provider (i.e is dependent on the packaging mechanism used

-	 * by the particular feature type).

-	 * </p>

-	 * 

-	 * @see IFeatureContentProvider#getFeatureEntryContentReferences(InstallMonitor)

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return an array of references, or an empty array if no references

-	 * are found

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns an array of content references of the "packaged"

-	 * archives that contain the files for the specified plug-in entry.

-	 * <p>

-	 * The number of returned references is dependent on each feature

-	 * content provider (i.e is dependent on the packaging mechanism used

-	 * by the particular feature type).

-	 * </p>

-	 * 

-	 * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry, InstallMonitor)

-	 * @param pluginEntry plug-in entry

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return an array of references, or an empty array if no references

-	 * are found

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public ContentReference[] getPluginEntryArchiveReferences(

-		IPluginEntry pluginEntry,

-		InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns an array of content references of the "packaged"

-	 * archives that contain the files for the specified non-plug-in entry.

-	 * <p>

-	 * The number of returned references is dependent on each feature

-	 * content provider (i.e is dependent on the packaging mechanism used

-	 * by the particular feature type).

-	 * </p>

-	 * <p>

-	 * Note, that the platform does not interpret non-plug-in entries in any 

-	 * way, other that performing any required downloads. Non-plug-in entries

-	 * are handled by custom install handlers that must be specified for

-	 * the feature. Consequently, this interface does not make a distinction

-	 * between the "logical" and "packaged" views for non-plug-in entries.

-	 * The "packaged" view (returning references to the non-plug-in archives)

-	 * is the only one supported. It is the responsibility of the custom install

-	 * handler to understand the "logical" view of non-plug-in archives.

-	 * </p>

-	 * 

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return an array of references, or an empty array if no references

-	 * are found

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public ContentReference[] getNonPluginEntryArchiveReferences(

-		INonPluginEntry nonPluginEntry,

-		InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns an array of content references to the feature definition files

-	 * (i.e the "logical" view of the files defining the feature). These

-	 * are the files required to present information about the feature to the

-	 * client, and in general, should not contain references to plug-in and 

-	 * non-plug-in files.

-	 * 

-	 * @see IFeatureContentProvider#getFeatureEntryArchiveReferences(InstallMonitor)

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return an array of ContentReference or an empty array if no references are found

-	 * @exception CoreException when an error occurs

-	 * @since 2.0 

-	 */

-	public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns an array of content references to the files implementing

-	 * the specified plug-in. (i.e the "logical" view of the plug-in).

-	 * 

-	 * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry, InstallMonitor)

-	 * @param monitor progress monitor, can be <code>null</code>

-	 * @return an array of ContentReference or an empty array if no references are found

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public ContentReference[] getPluginEntryContentReferences(

-		IPluginEntry pluginEntry,

-		InstallMonitor monitor)

-		throws CoreException;

-

-	/**

-	 * Returns the total size of all archives required for the

-	 * specified plug-in and non-plug-in entries (the "packaging" view).

-	 * 

-	 * @param pluginEntries an array of plug-in entries

-	 * @param nonPluginEntries an array of non-plug-in entries

-	 * @return total download size, or an indication that size could not be

-	 * determined

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @since 2.0

-	 */

-	public long getDownloadSizeFor(

-		IPluginEntry[] pluginEntries,

-		INonPluginEntry[] nonPluginEntries);

-

-	/**

-	 * Returns the total size of all files required for the

-	 * specified plug-in and non-plug-in entries (the "logical" view).

-	 * 

-	 * @param pluginEntries an array of plug-in entries

-	 * @param nonPluginEntries an array of non-plug-in entries

-	 * @return total download size, or an indication that size could not be

-	 * determined

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @since 2.0

-	 */

-	public long getInstallSizeFor(

-		IPluginEntry[] pluginEntries,

-		INonPluginEntry[] nonPluginEntries);

-

-	/**

-	 * Returns the verifier for this feature.

-	 * If provided, the verifier is called at various point during

-	 * installation processing to verify downloaded archives. The

-	 * type of verification provided is dependent on the content

-	 * provider implementation.

-	 * 

-	 * @return verifier

-	 * @exception CoreException

-	 * @since 2.0

-	 */

-	public IVerifier getVerifier() throws CoreException;

-

-	/**

-	 * Returns the feature associated with this content provider.

-	 * 

-	 * @return feature for this content provider

-	 * @since 2.0

-	 */

-	public IFeature getFeature();

-

-	/**

-	 * Sets the feature associated with this content provider.

-	 * In general, this method should only be called as part of

-	 * feature creation. Once set, the feature should not be reset.

-	 * 

-	 * @param feature feature for this content provider

-	 * @since 2.0

-	 */

-	public void setFeature(IFeature feature);

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
deleted file mode 100644
index a402ecf..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.net.*;

-

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

-

-/**

- * Feature factory interface.

- * A feature factory is used to construct new instances of concrete

- * features. 

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.BaseFeatureFactory

- * @since 2.0

- */

-public interface IFeatureFactory {

-

-	/**

-	 * Returns a feature defined by the supplied URL. The feature

-	 * is associated with the specified site.

-	 * <p>

-	 * The actual interpretation of the URL is feature-type specific.

-	 * In most cases the URL will point to some feature-specific

-	 * file that can be used (directly or indirectly) to construct

-	 * the feature object.

-	 * </p>

-	 * @param url URL interpreted by the feature

-	 * @param site site to be associated with the feature

-	 * @return concrete feature object

-	 * @exception CoreException

-	 * @deprecated use createFeature(URL, ISite, IProgressMonitor) instead

-	 * @since 2.0 

-	 */

-	public IFeature createFeature(URL url, ISite site) throws CoreException;

-	

-	/**

-	 * Returns a feature defined by the supplied URL. The feature

-	 * is associated with the specified site.

-	 * <p>

-	 * The actual interpretation of the URL is feature-type specific.

-	 * In most cases the URL will point to some feature-specific

-	 * file that can be used (directly or indirectly) to construct

-	 * the feature object.

-	 * </p>

-	 * @param url URL interpreted by the feature

-	 * @param site site to be associated with the feature

-	 * @return concrete feature object

-	 * @exception CoreException

-	 * @since 2.1 

-	 */

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

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
deleted file mode 100644
index 8b7e18b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.net.*;

-

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

-

-/**

- * Feature reference.

- * A reference to a feature.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.FeatureReference

- * @since 2.0

- */

-public interface IFeatureReference extends IAdaptable,IPlatformEnvironment {

-

-	/**

-	 * Returns the referenced feature URL.

-	 * 

-	 * @return feature URL 

-	 * @since 2.0 

-	 */

-	public URL getURL();

-

-	/**

-	 * Returns the update site for the referenced feature

-	 * 

-	 * @return feature site

-	 * @since 2.0 

-	 */

-	public ISite getSite();

-

-	/**

-	 * Returns the label for the referenced feature

-	 *

-	 * @return the label

-	 * @since 2.1

-	 */

-	public String getName();

-

-

-	/**

-	 * Returns the referenced feature.

-	 * This is a factory method that creates the full feature object.

-	 * 

-	 * @return the referenced feature

-	 * @deprecated use getFeature(IProgressMonitor) instead

-	 * @since 2.0 

-	 */

-	public IFeature getFeature() throws CoreException;

-

-	/**

-	 * Returns the referenced feature.

-	 * This is a factory method that creates the full feature object.

-	 * 

-	 * @param monitor the progress monitor

-	 * @return the referenced feature

-	 * @since 2.1 

-	 */

-	public IFeature getFeature(IProgressMonitor monitor) throws CoreException;

-

-

-	/**

-	 * Returns the feature identifier.

-	 * 

-	 * @return the feature identifier.

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public VersionedIdentifier getVersionedIdentifier() throws CoreException;

-

-	/**

-	 * Sets the feature reference URL.

-	 * This is typically performed as part of the feature reference creation

-	 * operation. Once set, the url should not be reset.

-	 * 

-	 * @param url reference URL

-	 * @since 2.0 

-	 */

-	public void setURL(URL url) throws CoreException;

-

-	/**

-	 * Associates a site with the feature reference.

-	 * This is typically performed as part of the feature reference creation

-	 * operation. Once set, the site should not be reset.

-	 * 

-	 * @param site site for the feature reference

-	 * @since 2.0 

-	 */

-	public void setSite(ISite site);

-	

-	/**

-	 * Returns <code>true</code> if this feature is patching another feature,

-	 * <code>false</code> otherwise

-	 * @return boolean

-	 * @since 2.1

-	 */

-	public boolean isPatch();

-	

-	

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
deleted file mode 100644
index 638f642..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-

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

-

-/**

- * Plug-in dependency entry.

- * Describes a feture dependency on a particular plug-in. The dependency 

- * can specify a specific plug-in version and a matching rule for 

- * satisfying the dependency.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.Import

- * @since 2.0

- */

-public interface IImport extends IAdaptable, IUpdateConstants, IPlatformEnvironment {

-

-	/**

-	 * The import relates to a plugin

-	 * @since 2.0.2

-	 */

-	public static final int KIND_PLUGIN = 0;

-	

-	/**

-	 * The import relates to a feature

-	 * @since 2.0.2

-	 */

-	public static final int KIND_FEATURE = 1;

-

-	/** 

-	 * Returns an identifier of the dependent plug-in.

-	 * 

-	 * @return plug-in identifier

-	 * @since 2.0 

-	 */

-	public VersionedIdentifier getVersionedIdentifier();

-

-	/**

-	 * Returns the matching rule for the dependency.

-	 * 

-	 * @return matching rule

-	 * @since 2.0 

-	 */

-	public int getRule();

-	

-	/**

-	 * Returns the matching rule for the dependency identifier.

-	 * 

-	 * @return matching id rule

-	 * @since 2.1 

-	 */

-	public int getIdRule();

-	

-	/**

-	 * Returns the dependency kind

-	 * 

-	 * @see #KIND_PLUGIN

-	 * @see #KIND_FEATURE

-	 * @return KIND_PLUGIN if the dependency relates to a plugin, 

-	 * KIND_FEATURE if the dependency relates to a feature.

-	 */

-	public int getKind();

-	

-	/**

-	 * Returns the patch mode. If the import is in patch mode,

-	 * the referenced feature is considered a patch target,

-	 * and the feature that owns the import is patch carrier.

-	 * Patch carrier and patched feature are linked in a

-	 * distinct way: if a patched feature is disabled,

-	 * all the patches are disabled with it.

-	 * @return true if the element represents a patch

-	 * reference, false otherwise.

-	 */

-	public boolean isPatch();

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
deleted file mode 100644
index 7f02be8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.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.core;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-
-
-
-/**
- * Included Feature reference.
- * A reference to a included feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should 
- * directly instantiate or subclass the provided implementation of this 
- * interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.FeatureReference
- * @since 2.0.1
- */
-public interface IIncludedFeatureReference extends IFeatureReference, IAdaptable {
-
-	/**
-	 * Returns the referenced feature.
-	 * This is a factory method that creates the full feature object.
-	 * equivalent to getFeature(false,null);
-	 * 
-	 * @return the referenced feature
-	 * @deprecated use getFeature(IProgressMonitor)
-	 * @since 2.0 
-	 */
-	public IFeature getFeature() throws CoreException;
-
-	/**
-	 * Returns the referenced feature.
-	 * This is a factory method that creates the full feature object.
-	 * 
-	 * @param perfectMatch <code>true</code> if the perfect match feature feature should be returned
-	 * <code>false</code> if the best match feature should be returned.
-	 * @param configuredSite the configured site to search for the Feature. If 
-	 * the configured site is <code>null</code> the search will be done in the current configured site.
-	 * @return the referenced feature
-	 * instead
-	 * @since 2.0.2
-	 * <b>Note:</b> This method is part of an interim API that is still under development and expected to
-	 * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-	 * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-	 * (repeatedly) as the API evolves.
-	 * @deprecated use getFeature(IProgressMonitor)
-	 */
-	public IFeature getFeature(boolean perfectMatch,IConfiguredSite configuredSite) throws CoreException;
-
-	/**
-	 * Returns the referenced feature.
-	 * This is a factory method that creates the full feature object.
-	 * 
-	 * @param perfectMatch <code>true</code> if the perfect match feature feature should be returned
-	 * <code>false</code> if the best match feature should be returned.
-	 * @param configuredSite the configured site to search for the Feature. If 
-	 * the configured site is <code>null</code> the search will be done in the current configured site.
-	 * @param monitor the progress monitor
-	 * @return the referenced feature
-	 * @since 2.1
-	 * <b>Note:</b> This method is part of an interim API that is still under
-	 * development and expected to change significantly before reaching
-	 * stability. It is being made available at this early stage to solicit
-	 * feedback from pioneering adopters on the understanding that any code that
-	 * uses this API will almost certainly be broken (repeatedly) as the API
-	 * evolves.
-	 * @deprecated use getFeature(IProgressMonitor)
-	 */
-	public IFeature getFeature(boolean perfectMatch,IConfiguredSite configuredSite, IProgressMonitor monitor) throws CoreException;
-
-
-	/**
-	 * Returns <code>true</code> if the feature is optional, <code>false</code> otherwise.
-	 * 
-	 * @return boolean
-	 * @since 2.0.1
-	 */
-	public boolean isOptional();
-
-	/**
-	 * Returns the matching rule for this included feature.
-	 * The rule will determine the ability of the included feature to move version 
-	 * without causing the overall feature to appear broken.
-	 * 
-	 * The default is <code>RULE_PERFECT</code>
-	 * 
-	 * @see IUpdateConstants#RULE_PERFECT
-	 * @see IUpdateConstants#RULE_EQUIVALENT
-	 * @see IUpdateConstants#RULE_COMPATIBLE
-	 * @see IUpdateConstants#RULE_GREATER_OR_EQUAL
-	 * @return int representation of feature matching rule.
-	 * @since 2.0.2
-	 * @deprecated since 3.0 included feature version is exactly specified
-	 */
-	public int getMatch();
-	
-	/**
-	 * Returns the search location for this included feature.
-	 * The location will be used to search updates for this feature.
-	 * 
-	 * The default is <code>SEARCH_ROOT</code>
-	 * 
-	 * @see IUpdateConstants#SEARCH_ROOT
-	 * @see IUpdateConstants#SEARCH_SELF
-	 * @return int representation of feature searching rule.
-	 * @since 2.0.2
-	 */
-
-	public int getSearchLocation();
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
deleted file mode 100644
index b7bc777..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
+++ /dev/null

@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Custom install handler.
- * Custom install handlers can optionally be associated with a feature.
- * The actual install handler implementation can be physically delivered
- * as part of the feature package, or can already be installed on the client
- * machine and registered via the <code>org.eclipse.update.core.installHandlers</code>
- * extension point. The install handler methods are called at predetermined
- * point during update actions.
- * <p>
- * Clients may implement this interface. However, in most cases clients should 
- * directly subclass the provided implementation of this interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.BaseInstallHandler
- * @since 2.0
- */
-public interface IInstallHandler {
-
-	/**
-	 * Indicates the handler is being initialized for feature install.
-	 * @since 2.0
-	 */
-	public static final int HANDLER_ACTION_INSTALL = 1;
-
-	/**
-	 * Indicates the handler is being initialized for feature configure.
-	 * @since 2.0
-	 */
-	public static final int HANDLER_ACTION_CONFIGURE = 2;
-
-	/**
-	 * Indicates the handler is being initialized for feature unconfigure.
-	 * @since 2.0
-	 */
-	public static final int HANDLER_ACTION_UNCONFIGURE = 3;
-
-	/**
-	 * Indicates the handler is being initialized for feature uninstall.
-	 * @since 2.0
-	 */
-	public static final int HANDLER_ACTION_UNINSTALL = 4;
-
-	/**
-	 * Initialize the install handler.
-	 * Install handlers are always constructed using the default constructor.
-	 * The are initialized immediately following construction.
-	 * 
-	 * @param type update action type
-	 * @param feature the target of the action
-	 * @param entry model entry that defines this handler
-	 * @param monitor optional progress monitor, can be <code>null</code>
-	 * @exception CoreException
-	 * @since 2.0
-	 */
-	public void initialize(
-		int type,
-		IFeature feature,
-		IInstallHandlerEntry entry,
-		InstallMonitor monitor)
-		throws CoreException;
-
-	/**
-	 * Called at the start of the install action. At this point, no install
-	 * processing has taken place.
-	 * 
-	 * @see #HANDLER_ACTION_INSTALL
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void installInitiated() throws CoreException;
-
-	/**
-	 * Called after files corresponding to plug-in entries have been downloaded,
-	 * but before they are actully unpacked and installed.
-	 * 
-	 * @see #HANDLER_ACTION_INSTALL
-	 * @param plugins downloaded plug-in entries. Note this may be a subset
-	 * of the plug-ins actually references by the feature.
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void pluginsDownloaded(IPluginEntry[] plugins) throws CoreException;
-
-	/**
-	 * Called after files corresponding to non-plug-in entries have been 
-	 * downloaded. The custom install handler can perform any custom
-	 * verification of the non-plug-in entries (these are not interpreted
-	 * in any way by the platform (beyond downloading)).
-	 * 
-	 * @see #HANDLER_ACTION_INSTALL
-	 * @param nonPluginData downloaded non-plug-in entries.
-	 * @param listener verification listener, may be <code>null</code>.
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void nonPluginDataDownloaded(
-		INonPluginEntry[] nonPluginData,
-		IVerificationListener listener)
-		throws CoreException;
-
-	/**
-	 * Called after the feature files and any downloaded plug-ins have
-	 * been installed. Typically this is the point where the custom
-	 * install handler can install any non-plug-in entries (these are not 
-	 * interpreted in any way by the platform (beyond downloading)).
-	 * 
-	 * @see #HANDLER_ACTION_INSTALL
-	 * @param consumer content consumer for the feature. The install handler
-	 * can choose to use this consumer to install the non-plug-in data,
-	 * or can handle the data in any other way. If using the consumer,
-	 * the install handler should only call 
-	 * @see IFeatureContentConsumer#store(ContentReference, IProgressMonitor)
-	 * and @see IFeatureContentConsumer#open(INonPluginEntry)
-	 * methods of the consumer. 
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void completeInstall(IFeatureContentConsumer consumer)
-		throws CoreException;
-
-	/**
-	 * Called at the end of the install action.
-	 * 
-	 * @see #HANDLER_ACTION_INSTALL
-	 * @param success indicates action success. 
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void installCompleted(boolean success) throws CoreException;
-
-	/**
-	 * Called at the start of the configure action
-	 * 
-	 * @see #HANDLER_ACTION_CONFIGURE
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void configureInitiated() throws CoreException;
-
-	/**
-	 * Called after the feature has been configured. The install handler
-	 * should perform any completion tasks. No arguments are passed
-	 * to the method. If needed, the install handler can use arguments
-	 * passed on the initialization call.
-	 * 
-	 * @see #HANDLER_ACTION_CONFIGURE
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void completeConfigure() throws CoreException;
-
-	/**
-	 * Called at the end of the configure action.
-	 * 
-	 * @see #HANDLER_ACTION_CONFIGURE
-	 * @param success indicates action success. 
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void configureCompleted(boolean success) throws CoreException;
-
-	/**
-	 * Called at the start of the unconfigure action
-	 * 
-	 * @see #HANDLER_ACTION_UNCONFIGURE
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void unconfigureInitiated() throws CoreException;
-
-	/**
-	 * Called after the feature has been unconfigured. The install handler
-	 * should perform any completion tasks. No arguments are passed
-	 * to the method. If needed, the install handler can use arguments
-	 * passed on the initialization call.
-	 * 
-	 * @see #HANDLER_ACTION_UNCONFIGURE
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void completeUnconfigure() throws CoreException;
-
-	/**
-	 * Called at the end of the unconfigure action.
-	 * 
-	 * @see #HANDLER_ACTION_UNCONFIGURE
-	 * @param success indicates action success. 
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void unconfigureCompleted(boolean success) throws CoreException;
-
-	/**
-	 * Called at the start of the uninstall action
-	 * 
-	 * @see #HANDLER_ACTION_UNINSTALL
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void uninstallInitiated() throws CoreException;
-
-	/**
-	 * Called after the feature has been uninstalled. The install handler
-	 * should perform any completion tasks. No arguments are passed
-	 * to the method. If needed, the install handler can use arguments
-	 * passed on the initialization call. Note, that at this point
-	 * the feature files and any unreferenced plug-ins have been
-	 * removed.
-	 * 
-	 * @see #HANDLER_ACTION_UNINSTALL
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void completeUninstall() throws CoreException;
-
-	/**
-	 * Called at the end of the uninstall action.
-	 * 
-	 * @see #HANDLER_ACTION_UNINSTALL
-	 * @param success indicates action success. 
-	 * @exception CoreException terminates the action
-	 * @since 2.0
-	 */
-	public void uninstallCompleted(boolean success) throws CoreException;
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
deleted file mode 100644
index b39231c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.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.update.core;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Install handler entry.
- * Associates an optional custom install handler with the feature.
- * Install handlers must implement the IInstallHandler interface.
- * <p>
- * Clients may implement this interface. However, in most cases clients should 
- * directly instantiate or subclass the provided implementation of this 
- * interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.InstallHandlerEntry
- * @see org.eclipse.update.core.IInstallHandler
- * @since 2.0
- */
-public interface IInstallHandlerEntry extends IAdaptable {
-
-	/**
-	 * Returns optional URL used for browser-triggered installation handling.
-	 * 
-	 * @return url
-	 * @since 2.0 
-	 */
-	public URL getURL();
-
-	/**
-	 * Returns optional name of a library containing the install
-	 * handler classes. If specified, the referenced library
-	 * must be contained in the feature archive.
-	 * 
-	 * @return install handler library name
-	 * @since 2.0 
-	 */
-	public String getLibrary();
-
-	/**
-	 * Returns install handler name.
-	 * It is interpreted depending on the value of the library
-	 * specification. If library is not specified, the name
-	 * is intepreted as an identifier of a "global" install
-	 * handler registered in the <code>org.eclipse.update.core.installHandlers</code> 
-	 * extension point. If library is specified, the name is interpreted
-	 * as a fully qualified name of a class contained in the
-	 * library. In both cases, the resulting class must
-	 * implement IInstallHandler. The class is dynamically loaded and
-	 * called at specific points during feature processing.
-	 * The handler has visibility to the API classes from the update plug-in,
-	 * and plug-ins required by the update plugin. 
-	 * 
-	 * @see IInstallHandler
-	 * @return handler name
-	 * @since 2.0 
-	 */
-	public String getHandlerName();
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
deleted file mode 100644
index 1ff05f6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.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.core;

-

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

-

-/**

- * Non-plug-in entry defines an arbitrary non-plug-in data file packaged

- * as part of a feature. Non-plug-in entries are not interpreted by the

- * platform (other than being downloaded as part of an install action).

- * They require a custom install handler to be specified as part of the

- * feature. Note, that defining a non-plug-in entry does not necessarily

- * indicate the non-plug-in file is packaged together with any other

- * feature files. The actual packaging details are determined by the

- * feature content provider for the feature.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.NonPluginEntry

- * @see org.eclipse.update.core.FeatureContentProvider

- * @since 2.0

- */

-public interface INonPluginEntry extends IPlatformEnvironment, IAdaptable {

-

-	/** 

-	 * Returns the identifier of this data entry. 

-	 * 

-	 * @return data entry identifier

-	 * @since 2.0 

-	 */

-	public String getIdentifier();

-

-	/**

-	 * Returns the download size of the entry, if it can be determined.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @return download size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getDownloadSize();

-

-	/**

-	 * Returns the install size of the feature, if it can be determined.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @return install size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getInstallSize();

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
deleted file mode 100644
index 2b17aba..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Plug-in entry defines a packaging reference from a feature to a plug-in.
- * It indicates that the referenced plug-in is to be considered as
- * part of the feature. Note, that this does not necessarily indicate
- * that the plug-in files are packaged together with any other
- * feature files. The actual packaging details are determined by the
- * feature content provider for the feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should 
- * directly instantiate or subclass the provided implementation of this 
- * interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.PluginEntry
- * @see org.eclipse.update.core.FeatureContentProvider
- * @since 2.0
- */
-public interface IPlatformEnvironment extends IAdaptable {
-
-
-	/**
-	 * Returns optional operating system specification.
-	 * A comma-separated list of os designators defined by the platform.
-	 * Indicates this entry should only be installed on one of the specified
-	 * os systems. If this attribute is not specified, or is <code>*</code>, the
-	 * entry can be installed on all systems (portable implementation). If the
-
-	 * This information is used as a hint by the installation and update
-	 * support.
-	 *
-	 * @return the operating system specification, or <code>null</code>.
-	 * @since 2.0 
-	 */
-	public String getOS();
-
-	/**
-	 * Returns optional system architecture specification. 
-	 * A comma-separated list of arch designators defined by the platform.
-	 * Indicates this entry should only be installed on one of the specified
-	 * systems. If this attribute is not specified, or is <code>*</code>, the
-	 * entry can be installed on all systems (portable implementation).
-	 * 
-	 * This information is used as a hint by the installation and update
-	 * support.
-	 * 
-	 * @return system architecture specification, or <code>null</code>.
-	 * @since 2.0 
-	 */
-	public String getWS();
-
-	/**
-	 * Returns optional system architecture specification. 
-	 * A comma-separated list of arch designators defined by the platform.
-	 * Indicates this entry should only be installed on one of the specified
-	 * systems. If this attribute is not specified, or is <code>*</code>, the
-	 * entry can be installed on all systems (portable implementation).
-	 * 
-	 * This information is used as a hint by the installation and update
-	 * support.
-	 * 
-	 * @return system architecture specification, or <code>null</code>.
-	 * @since 2.0 
-	 */
-	public String getOSArch();
-
-	/**
-	 * Returns optional locale specification. 
-	 * A comma-separated list of locale designators defined by Java.
-	 * Indicates this entry should only be installed on a system running
-	 * with a compatible locale (using Java locale-matching rules).
-	 * If this attribute is not specified, or is <code>*</code>, the entry can
-	 * be installed on all systems (language-neutral implementation).
-	 * 
-	 * This information is used as a hint by the installation and update
-	 *  support.
-	 * 
-	 * @return the locale specification, or <code>null</code>.
-	 * @since 2.0 
-	 */
-	public String getNL();
-
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
deleted file mode 100644
index d695a9d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.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.core;

-

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

-

-/**

- * Plug-in entry defines a packaging reference from a feature to a plug-in.

- * It indicates that the referenced plug-in is to be considered as

- * part of the feature. Note, that this does not necessarily indicate

- * that the plug-in files are packaged together with any other

- * feature files. The actual packaging details are determined by the

- * feature content provider for the feature.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.PluginEntry

- * @see org.eclipse.update.core.FeatureContentProvider

- * @since 2.0

- */

-public interface IPluginEntry extends IPlatformEnvironment,IAdaptable {

-

-	/** 

-	 * Returns the identifier of this plugin entry

-	 * 

-	 * @return plugin entry identifier

-	 * @since 2.0 

-	 */

-	public VersionedIdentifier getVersionedIdentifier();

-

-	/**

-	 * Returns an indication whethyer this entry represents a fragment.

-	 * 

-	 * @return <code>true</code> if the entry represents a plug-in fragment, 

-	 * <code>false</code> if the entry represents a plug-in

-	 * @since 2.0 

-	 */

-	public boolean isFragment();

-

-	/**

-	 * Returns the download size of the entry, if it can be determined.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @return download size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getDownloadSize();

-

-	/**

-	 * Returns the install size of the feature, if it can be determined.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @return install size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getInstallSize();

-

-	/** 

-	 * Sets the identifier of this plugin entry. 

-	 * This is typically performed as part of the plug-in entry creation

-	 * operation. Once set, the identifier should not be reset.

-	 * 

-	 * @param identifier plugin entry identifier

-	 * @since 2.0 

-	 */

-	public void setVersionedIdentifier(VersionedIdentifier identifier);

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
deleted file mode 100644
index 78c7db1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.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.update.core;

-import java.net.*;

-

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

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

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

-

-/**

- * Site represents a location containing some number of features (packaged

- * or installed). Sites are treated purely as an installation and packaging

- * construct. They do not play a role during Eclipse plug-in execution. 

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.Site

- * @since 2.0

- */

-public interface ISite extends IAdaptable {

-

-	/**

-	 * Default type for an installed feature. Different concrete feature

-	 * implementations can be registered together with their corresponding type

-	 * using the <code>org.eclipse.update.core.featureTypes</code> 

-	 * extension point.

-	 * 

-	 * @since 2.0

-	 */

-	public static final String DEFAULT_INSTALLED_FEATURE_TYPE = "org.eclipse.update.core.installed"; //$NON-NLS-1$		

-

-	/**

-	 * Default type for a packaged feature. Different concrete feature

-	 * implementations can be registered together with their corresponding type

-	 * using the <code>org.eclipse.update.core.featureTypes</code> 

-	 * extension point.

-	 * 

-	 * @since 2.0

-	 */

-	public static final String DEFAULT_PACKAGED_FEATURE_TYPE = "org.eclipse.update.core.packaged"; //$NON-NLS-1$		

-

-	/**

-	 * If we are unable to access a site, the returned CoreException will contain

-	 * this return code.

-	 * 

-	 * @since 2.0.1

-	 */

-	public static final int SITE_ACCESS_EXCEPTION = 42;

-

-	/**

-	 * Returns the site URL

-	 * 

-	 * @return site URL

-	 * @since 2.0 

-	 */

-	public URL getURL();

-

-	/**

-	 * Return the site type. Different concrete site implementations can be

-	 * registered together with their corresponding type using the

-	 * <code>org.eclipse.update.core.siteTypes</code> extension point.

-	 * 

-	 * @return site type, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public String getType();

-

-	/**

-	 * Returns the site description.

-	 * 

-	 * @return site description, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public IURLEntry getDescription();

-

-	/**

-	 * Returns an array of categories defined by the site.

-	 * 

-	 * @return array of site categories, or an empty array.

-	 * @since 2.0 

-	 */

-	public ICategory[] getCategories();

-

-	/**

-	 * Returns the named site category.

-	 * 

-	 * @param name category name

-	 * @return named category, or <code>null</code> ifit does not exist

-	 * @since 2.0

-	 */

-	public ICategory getCategory(String name);

-

-	/**

-	 * Returns an array of references to features on this site.

-	 * 

-	 * @return an array of feature references, or an empty array.

-	 * @since 2.0 

-	 */

-	public ISiteFeatureReference[] getFeatureReferences();

-

-	/**

-	 * Returns an array of references to features on this site.

-	 * No filtering occurs.

-	 * 

-	 * @return an array of feature references, or an empty array..

-	 * @since 2.1

-	 */

-	public ISiteFeatureReference[] getRawFeatureReferences();

-	

-	/**

-	 * Returns a reference to the specified feature if 

-	 * it is installed on this site.

-	 * filtered by the operating system, windowing system and architecture

-	 * system set in <code>Sitemanager</code>

-	 * 

-	 * @param feature feature

-	 * @return feature reference, or <code>null</code> if this feature

-	 * cannot be located on this site.

-	 * @since 2.0

-	 */

-	public ISiteFeatureReference getFeatureReference(IFeature feature);

-

-	/**

-	 * Returns an array of plug-in and non-plug-in archives located

-	 * on this site

-	 * 

-	 * @return an array of archive references, or an empty array if there are

-	 * no archives known to this site. Note, that an empty array does not

-	 * necessarily indicate there are no archives accessible on this site.

-	 * It simply indicates the site has no prior knowledge of such archives.

-	 * @since 2.0 

-	 */

-	public IArchiveReference[] getArchives();

-

-	/**

-	 * Returns the content provider for this site. A content provider

-	 * is an abstraction of each site organization. It allows the 

-	 * content of the site to be accessed in a standard way

-	 * regardless of the organization. All concrete sites

-	 * need to be able to return a content provider.

-	 * 

-	 * @return site content provider

-	 * @exception CoreException

-	 * @since 2.0

-	 */

-	public ISiteContentProvider getSiteContentProvider() throws CoreException;

-

-	/**

-	 * Returns the default type for a packaged feature supported by this site

-	 * 

-	 * @return feature type, as registered in the

-	 * <code>org.eclipse.update.core.featureTypes</code> extension point.

-	 * @since 2.0

-	 */

-	public String getDefaultPackagedFeatureType();

-

-	/**

-	 * Returns an array of entries corresponding to plug-ins installed

-	 * on this site.

-	 * 

-	 * @return array of plug-in entries,or an empty array.

-	 * @since 2.0

-	 */

-	public IPluginEntry[] getPluginEntries();

-

-	/**

-	 * Returns the number of plug-ins installed on this site

-	 * 

-	 * @return number of installed plug-ins

-	 * @since 2.0

-	 */

-	public int getPluginEntryCount();

-

-	/**

-	 * Adds a new plug-in entry to this site.

-	 * 

-	 * @param pluginEntry plug-in entry

-	 * @since 2.0

-	 */

-	public void addPluginEntry(IPluginEntry pluginEntry);

-

-	/**

-	 * Returns an array of entries corresponding to plug-ins that are

-	 * installed on this site and are referenced only by the specified

-	 * feature. These are plug-ins that are not shared with any other

-	 * feature.

-	 * 

-	 * @param feature feature

-	 * @return an array of plug-in entries, or an empty array.

-	 * @exception CoreException

-	 * @since 2.0

-	 */

-	public IPluginEntry[] getPluginEntriesOnlyReferencedBy(IFeature feature) throws CoreException;

-

-	/**

-	 * Returns the size of the files that need to be downloaded in order

-	 * to install the specified feature on this site, if it can be determined.

-	 * This method takes into account any plug-ins that are already

-	 * available on this site.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @param feature candidate feature

-	 * @return download size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getDownloadSizeFor(IFeature feature);

-

-	/**

-	 * Returns the size of the files that need to be installed

-	 * for the specified feature on this site, if it can be determined.

-	 * This method takes into account any plug-ins that are already

-	 * installed on this site.

-	 * 

-	 * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE

-	 * @param feature candidate feature

-	 * @return install size of the feature in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-	public long getInstallSizeFor(IFeature feature);

-

-	/**

-	 * Installs the specified feature on this site.

-	 * 

-	 * @param feature feature to install

-	 * @param verificationListener install verification listener

-	 * @param monitor install monitor, can be <code>null</code>

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public IFeatureReference install(IFeature feature, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException;

-

-	/**

-	 * Installs the specified feature on this site.

-	 * Only optional features passed as parameter will be installed.

-	 * 

-	 * @param feature feature to install

-	 * @param optionalfeatures list of optional features to be installed

-	 * @param verificationListener install verification listener

-	 * @param monitor install monitor, can be <code>null</code>

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public IFeatureReference install(IFeature feature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException;

-

-	/**

-	 * Removes (uninstalls) the specified feature from this site. This method

-	 * takes into account plug-in entries referenced by the specified fetaure

-	 * that continue to be required by other features installed on this site.

-	 * 

-	 * @param feature feature to remove

-	 * @param monitor progress monitor

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException;

-

-	/**

-	 * Sets the site content provider. This is typically performed

-	 * as part of the site creation operation. Once set, the 

-	 * provider should not be reset.

-	 * 

-	 * @param siteContentProvider site content provider

-	 * @since 2.0

-	 */

-	public void setSiteContentProvider(ISiteContentProvider siteContentProvider);

-

-	/** 

-	 * Returns the <code>IConfiguredSite</code> for this site in the current 

-	 * configuration or <code>null</code> if none found.

-	 * 

-	 * @since 2.0.2

-	 */

-	public IConfiguredSite getCurrentConfiguredSite();

-

-	/**

-	* Creates a new feature object. The feature must exist on this site

-	* or a core exception will be thrown. Concrete implementations 

-	* may elect to cache instances, in which case subsequent calls 

-	* to create a feature with the same URL will

-	* return the same instance.

-	* param type the feature type that will be used to select the factory. If

-	* <code>null</code> is passed, default feature type will be used.

-	* param url URL of the feature archive as listed in the site.

-	* return newly created feature object, or a cached value if

-	* caching is implemented by this site.

-	* @deprecated use createFeature(String,URL,IProgressMonitor) instead

-	* @since 2.0.2

-	*/

-	IFeature createFeature(String type, URL url) throws CoreException;

-

-	/**

-	* Creates a new feature object. The feature must exist on this site

-	* or a core exception will be thrown. Concrete implementations 

-	* may elect to cache instances, in which case subsequent calls 

-	* to create a feature with the same URL will

-	* return the same instance.

-	* param type the feature type that will be used to select the factory. If

-	* <code>null</code> is passed, default feature type will be used.

-	* param url URL of the feature archive as listed in the site.

-	* return newly created feature object, or a cached value if

-	* caching is implemented by this site.

-	* @param monitor the progress monitor

-	* @since 2.1

-	*/

-	IFeature createFeature(String type, URL url,IProgressMonitor monitor) throws CoreException;

-

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
deleted file mode 100644
index 0f9e8e4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.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.core;

- 

-import java.net.*;

-

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

-

-/**

- * Site content provider.

- * A site content provider is an abstraction of each site internal 

- * organization. It allows the site content to be accessed in

- * a standard way regardless of the internal organization. All concrete site

- * implementations need to implement a site content provider.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.SiteContentProvider

- * @since 2.0

- */

- 

-public interface ISiteContentProvider {

-	

-	/**

-	 * Returns the URL of this site

-	 * 

-	 * @return site URL

-	 * @since 2.0

-	 */	

-	public URL getURL();

-			

-	

-	/**

-	 * Returns a URL for the identified archive 

-	 * 

-	 * @param id archive identifier

-	 * @return archive URL, or <code>null</code>.

-	 * @exception CoreException 

-	 * @since 2.0 

-	 */

-	public URL getArchiveReference(String id)  throws CoreException;

-

-	/**

-	 * Returns the site for this provider

-	 * 

-	 * @return provider site

-	 * @since 2.0

-	 */

-	public ISite getSite();	

-	

-	/**

-	 * Sets the site for this provider.

-	 * In general, this method should only be called as part of

-	 * site creation. Once set, the site should not be reset.

-	 * 

-	 * @param site provider site

-	 * @since 2.0

-	 */

-	public void setSite(ISite site);

-}

-

-


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
deleted file mode 100644
index 714252b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.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.update.core;

-

-import java.net.*;

-

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

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

-

-/**

- * Site factory interface.

- * A site factory is used to construct new instances of concrete

- * sites. 

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.BaseSiteFactory

- * @since 2.0

- */

-

-public interface ISiteFactory {

-

-	/**

-	 * Returns a site defined by the supplied URL. 

-	 * <p>

-	 * The actual interpretation of the URL is site-type specific.

-	 * In most cases the URL will point to some site-specific

-	 * file that can be used (directly or indirectly) to construct

-	 * the site object.

-	 * </p>

-	 * @param url URL interpreted by the site

-	 * @return site object

-	 * @exception CoreException

-	 * @exception InvalidSiteTypeException the referenced site type is

-	 * not a supported type for this factory 

-	 * @since 2.0 

-	 */

-	public ISite createSite(URL url)

-		throws CoreException, InvalidSiteTypeException;

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
deleted file mode 100644
index 7ff5fd9..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.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.update.core;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-
-/**
- * <p>
- * This is an extension to the standard ISiteFactory interface.
- * If a factory implements this interface and is handling
- * URL connections, a progress monitor can be passed to 
- * allow canceling of frozen connections. 
- * </p>
- * <p>Input stream is obtained from the connection on
- * a separate thread. When connection is canceled, 
- * the thread is still active. It is allowed to terminate
- * when the connection times out on its own.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.BaseSiteFactory
- * @since 2.1
- */
-
-public interface ISiteFactoryExtension {
-	/**
-	 * Returns a site defined by the supplied URL. 
-	 * <p>
-	 * The actual interpretation of the URL is site-type specific.
-	 * In most cases the URL will point to some site-specific
-	 * file that can be used (directly or indirectly) to construct
-	 * the site object.
-	 * </p>
-	 * @param url URL interpreted by the site
-	 * @param monitor a progress monitor that can be canceled
-	 * @return site object
-	 * @exception CoreException
-	 * @exception InvalidSiteTypeException the referenced site type is
-	 * not a supported type for this factory 
-	 * @since 2.0 
-	 */
-	public ISite createSite(URL url, IProgressMonitor monitor)
-		throws CoreException, InvalidSiteTypeException;
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
deleted file mode 100644
index d549edd..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.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.update.core;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Site Feature reference.
- * A reference to a feature on a particular update site.
- * <p>
- * Clients may implement this interface. However, in most cases clients should 
- * directly instantiate or subclass the provided implementation of this 
- * interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.SiteFeatureReference
- * @since 2.1
- */
-public interface ISiteFeatureReference extends IFeatureReference, IAdaptable {
-
-	/**
-	 * Returns an array of categories the referenced feature belong to.
-	 * 
-	 * @return an array of categories, or an empty array
-	 * @since 2.1 
-	 */
-	public ICategory[] getCategories();
-
-	/**
-	 * Adds a category to the referenced feature.
-	 * 
-	 * @param category new category
-	 * @since 2.1 
-	 */
-	public void addCategory(ICategory category);
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
deleted file mode 100644
index cf1345b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.net.*;

-

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

-

-/**

- * URL entry is an annotated URL object. It allows descriptive text to be

- * associated with a URL. When used as description object, the annotation

- * typically corresponds to short descriptive text, with the URL reference

- * pointing to full browsable description.

- * <p>

- * Clients may implement this interface. However, in most cases clients should 

- * directly instantiate or subclass the provided implementation of this 

- * interface.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.URLEntry

- * @since 2.0

- */

-public interface IURLEntry extends IAdaptable {

-

-	public static final int UPDATE_SITE = 0;

-	public static final int WEB_SITE = 1;	

-

-	/** 

-	 * Returns the URL annotation or <code>null</code> if none

-	 * 

-	 * @return url annotation or <code>null</code> if none

-	 * @since 2.0 

-	 */

-	public String getAnnotation();

-

-	/**

-	 * Returns the actual URL.

-	 * 

-	 * @return url.

-	 * @since 2.0 

-	 */

-	public URL getURL();

-	

-	/**

-	 * Returns the type of the URLEntry

-	 * 

-	 * @see #UPDATE_SITE

-	 * @see #WEB_SITE

-	 * @return type

-	 * @since 2.0 

-	 */

-	public int getType();	

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
deleted file mode 100644
index b406ba2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
- 
-/**
- * Manages a list of static constants.
- * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0.2
- */
-public interface IUpdateConstants {
-	
-		/**
-	 * No matching rule specified 
-	 * @since 2.0
-	 */
-	public static final int RULE_NONE = 0;
-
-	/**
-	 * Dependency can be satisfied only with plug-in version matching 
-	 * exactly the specified version.
-	 * @since 2.0
-	 */
-	public static final int RULE_PERFECT = 1;
-
-	/**
-	 * Dependency can be satisfied only with plug-in version that is 
-	 * equivalent to the specified version (same major and minor version
-	 * identifier, greater than or equal service identifier).
-	 * @since 2.0
-	 */
-	public static final int RULE_EQUIVALENT = 2;
-
-	/**
-	 * Dependency can be satisfied only with plug-in version that is 
-	 * compatible with the specified version (either is equivalent,
-	 * or greater minor identifier (but same major identifier)).
-	 * @since 2.0
-	 */
-	public static final int RULE_COMPATIBLE = 3;
-
-	/**
-	 * Dependency can be satisfied only with plug-in version that is 
-	 * greater or equal to the specified version.
-	 * @since 2.0
-	 */
-	public static final int RULE_GREATER_OR_EQUAL = 4;
-	
-	/**
-	 * Dependency can be satisfied only if the required identifier
-	 * is a prefix of the specified identifier.
-	 * @since 2.1
-	 */
-	public static final int RULE_PREFIX = 1;
-
-	/**
-	 * The search location for updates is defined by the root feature.
-	 * @since 2.0.2
-	 */
-	public static final int SEARCH_ROOT = 1<<1;
-	
-	/**
-	 * The search location for updates is defined by this feature.
-	 * @since 2.0.2
-	 */
-	public static final int SEARCH_SELF = 1<<2;
-	
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
deleted file mode 100644
index 439186e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
- 
-/**
- * Verification listener. This interface abstract the user interaction
- * that may be required as a result of feature installation. In particular,
- * as feature archives are downloaded and verified, the user may need to 
- * indicate whether to accept any one of the archives, or abort the 
- * installation.
- * <p>
- * Clients may implement this interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IVerificationResult
- * @see org.eclipse.update.core.IVerifier
- * @since 2.0
- */
-
-public interface IVerificationListener {
-	
-	/**
-	 * Indicate the action that resulted in this notification should be aborted.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int CHOICE_ABORT = 0;
-	
-	/**
-	 * Indicate there was an error in processing the request.
-	 * The action that resulted in this notification should be aborted.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int CHOICE_ERROR = 1;
-	
-	/**
-	 * Indicate that the target of the verification should be accepted,
-	 * but the information supplied with the verification result
-	 * should be trusted only for this request.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int CHOICE_INSTALL_TRUST_ONCE = 2;
-	
-	/**
-	 * Indicate that the target of the verification should be accepted,
-	 * and the information supplied with the verification result
-	 * should be trusted for this request, and subsequent requests.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int CHOICE_INSTALL_TRUST_ALWAYS = 3;
-	
-	/**
-	 * Determine if we should continue with the current action
-	 * based on the indicated verification results. Typically,
-	 * the implementation of this method will prompt the user
-	 * for the appropriate answer. However, other respose 
-	 * implementations can be provided.
-	 * 
-	 * @param result verification result 
-	 * @since 2.0
-	 */
-	public int prompt(IVerificationResult result);
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
deleted file mode 100644
index b83289e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.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.core;
-
-/**
- * Verification result. An object implementing this interface represents
- * a token passed between the update framework and the verifier and verification
- * listener. The verifier uses the token to capture the result of the file
- * verification. It is then passed to the verification listener
- * to optionally present this information to the user (in an 
- * implementation-specific way). The verification listener in turn
- * uses this token to capture the desired response.
- * <p>
- * Clients may implement this interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IVerificationResult {
-
-	/**
-	 * Indicates the file type is recognized but the file is not signed
-	 * 
-	 * @see #TYPE_ENTRY_UNRECOGNIZED
-	 * @since 2.0
-	 */
-	public static final int TYPE_ENTRY_NOT_SIGNED = 1;
-
-	/**
-	 * Indicates the file has been modified since it was signed
-	 * 
-	 * @since 2.0
-	 */
-	public static final int TYPE_ENTRY_CORRUPTED = 2;
-
-	/**
-	 * Indicates the file is signed by a known signer
-	 * 
-	 * @since 2.0
-	 */
-	public static final int TYPE_ENTRY_SIGNED_RECOGNIZED = 3;
-
-	/**
-	 * Indicates the file is signed but the signer is not known
-	 * 
-	 * @since 2.0
-	 */
-	public static final int TYPE_ENTRY_SIGNED_UNRECOGNIZED = 5;
-
-	/**
-	 * Error occurred during verification
-	 * 
-	 * @since 2.0
-	 */
-	public static final int UNKNOWN_ERROR = 6;
-
-	/**
-	 * Verification was cancelled
-	 * 
-	 * @since 2.0
-	 */
-	public static final int VERIFICATION_CANCELLED = 7;
-
-	/**
-	 * Could not perform verification due to unrecognized file
-	 * 
-	 * @see #TYPE_ENTRY_NOT_SIGNED
-	 * @since 2.0
-	 */
-	public static final int TYPE_ENTRY_UNRECOGNIZED = 8;
-
-	/**
-	 * Returns the content reference that is the target of the verification.
-	 * 
-	 * @return content reference
-	 * @since 2.0
-	 */
-	public ContentReference getContentReference();
-
-	/**
-	 * Returns the feature the referenced file is part of.
-	 * 
-	 * @return feature
-	 * @since 2.0
-	 */
-	public IFeature getFeature();
-
-	/**
-	 * Returns the verification code.
-	 * 
-	 * @return verification code, as defined in this interface.
-	 * @since 2.0
-	 */
-	public int getVerificationCode();
-
-	/**
-	 * Returns any exception caught during verification
-	 * 
-	 * @return exception, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public Exception getVerificationException();
-
-	/**
-	 * Returns display text describing the result of the verification.
-	 * 
-	 * @return result text, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getText();
-
-	/**
-	 * Returns text describing the signer
-	 * 
-	 * @return signer information, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getSignerInfo();
-
-	/**
-	 * Returns text describing the authority that verified/ certified 
-	 * the signer
-	 * 
-	 * @return verifier information, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getVerifierInfo();
-
-	/**
-	 * Indicates whether the referenced file is part of the overall feature
-	 * definition, or one of its component plug-in or non-plug-in entries.
-	 * 
-	 * @return <code>true</code> if reference is a feature file, 
-	 * <code>false</code> if reference is a plug-in or non-plug-in file
-	 * @since 2.0
-	 */
-	public boolean isFeatureVerification();
-	
-	/**
-	 * Indicates whether the signer and verifier info have already been accepted by the user
-	 * during a previous verification of one of the file of the feature.
-	 * 
-	 * @return <code>true</code> if the result has already been accepted, <code>false</code>
-	 * if the result has not yet been accepted by the user
-	 * @since 2.0
-	 */
-	public boolean alreadySeen();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
deleted file mode 100644
index 618185a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.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.update.core;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Verifier. This interface abstracts the archive verification step
- * performed by specific feature implementations. The actual details
- * of the verification are the responsibility of the concrete implementation.
- * <p>
- * Clients may implement this interface.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IVerificationResult
- * @see org.eclipse.update.core.IFeatureContentProvider#getVerifier()
- * @since 2.0
- */
-public interface IVerifier {
-
-	/**
-	 * Perform verification of the specified archive.
-	 * 
-	 * @param feature feature containing this archive
-	 * @param reference actual archive reference
-	 * @param isFeatureVerification <code>true</code> indicates the specified
-	 * reference should be considered as part of the feature description
-	 * information (ie. verifying the overall feature), 
-	 * <code>false</code> indicates the specified reference is a plug-in
-	 * or a non-plug-in archive file (ie. verifying a component of the
-	 * feature)
-	 * @param monitor progress monitor, can be <code>null</code>
-	 * @return verification result
-	 * @exception CoreException
-	 * @since 2.0
-	 */
-	public IVerificationResult verify(
-		IFeature feature,
-		ContentReference reference,
-		boolean isFeatureVerification,
-		InstallMonitor monitor)
-		throws CoreException;
-		
-	/**
-	 * Sets the parent verifier.
-	 * 
-	 * The parent verifier can only be set once by the parent feature.
-	 * It may used for different verification strategies. 
-	 * (for instance, you may decide that both the parent and current verifier
-	 * must sucessfully verify the content reference, or that only one of them must verify)
-	 * @param parentVerifier the parent verifier.
-	 */
-	public void setParent(IVerifier parentVerifier);
-	
-	/**
-	 * Returns the parent verifier
-	 * 
-	 * @return the parent verifier
-	 * @since 2.0
-	 */
-	public IVerifier getParent();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
deleted file mode 100644
index c6fa357..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

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

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

-

-/**

- * Convenience implementation of a plug-in dependency.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.IImport

- * @see org.eclipse.update.core.model.ImportModel

- * @since 2.0

- */

-public class Import extends ImportModel implements IImport {

-

-	//PERF: new instance variable

-	private VersionedIdentifier versionId;

-

-	/**

-	 * Returns an identifier of the dependent plug-in.

-	 * @see IImport#getVersionedIdentifier()

-	 */

-	public VersionedIdentifier getVersionedIdentifier() {

-		if (versionId != null)

-			return versionId;

-

-		String id = getIdentifier();

-		String ver = getVersion();

-		if (id != null && ver != null) {

-			try {

-				versionId = new VersionedIdentifier(id, ver);

-				return versionId;

-			} catch (Exception e) {

-				UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-

-		

-		versionId = new VersionedIdentifier("",null); //$NON-NLS-1$

-		return versionId;		

-	}

-

-	/**

-	 * Returns the matching rule for the dependency.

-	 * @see IImport#getRule()

-	 */

-	public int getRule() {

-		return UpdateManagerUtils.getMatchingRule(getMatchingRuleName());

-	}

-	

-	/**

-	 * Returns the matching rule for the dependency identifier.

-	 * @see IImport#getIdRule()

-	 */

-	public int getIdRule() {

-		return UpdateManagerUtils.getMatchingIdRule(getMatchingIdRuleName());

-	}

-	

-	/**

-	 * 

-	 * @see org.eclipse.update.core.IImport#getKind()

-	 */

-

-	/**

-	 * Returns the dependency kind

-	 * @see org.eclipse.update.core.IImport#getKind()

-	 */

-	public int getKind() {

-		return isFeatureImport()?KIND_FEATURE:KIND_PLUGIN;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
deleted file mode 100644
index 16571ad..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.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.core;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * This is a utility class representing the options of a nested feature.
- * Feature will include other features. This class will represent the options of the inclusion.
- * <p>
- * Clients may instantiate; not intended to be subclassed by clients.
- * </p> 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.VersionedIdentifier
- * @since 2.0.1
- */
-public class IncludedFeatureReference
-	extends IncludedFeatureReferenceModel
-	implements IIncludedFeatureReference {
-
-	/**
-	 * Construct a included feature reference
-	 * 
-	 * @since 2.1
-	 */
-	public IncludedFeatureReference() {
-		super();
-	}
-
-	/**
-	 * Construct a feature options 
-	 * 
-	 * @param includedFeatureRef reference to clone
-	 * @since 2.0.2
-	 */
-	public IncludedFeatureReference(IIncludedFeatureReference includedFeatureRef) {
-		super((IncludedFeatureReferenceModel) includedFeatureRef);
-	}
-
-	/**
-	 * Constructor IncludedFeatureReference.
-	 * @param featureReference
-	 */
-	public IncludedFeatureReference(IFeatureReference featureReference) {
-		super(featureReference);
-	}
-
-	/*
-	 * Method isDisabled.
-	 * @return boolean
-	 */
-	private boolean isDisabled() {
-		IConfiguredSite cSite = getSite().getCurrentConfiguredSite();
-		if (cSite == null)
-			return false;
-		IFeatureReference[] configured = cSite.getConfiguredFeatures();
-		for (int i = 0; i < configured.length; i++) {
-			if (this.equals(configured[i]))
-				return false;
-		}
-		return true;
-		//		// FIXME: the above code was commented out and returned false. 
-		//		// Should this be commented out again?
-		//		return false;
-	}
-
-	/*
-	 * Method isInstalled.
-	 * @return boolean
-	 */
-	private boolean isUninstalled() {
-		if (!isDisabled())
-			return false;
-		IFeatureReference[] installed = getSite().getFeatureReferences();
-		for (int i = 0; i < installed.length; i++) {
-			if (this.equals(installed[i]))
-				return false;
-		}
-		// if we reached this point, the configured site exists and it does not
-		// contain this feature reference, so clearly the feature is uninstalled
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.update.core.IIncludedFeatureReference#getFeature(boolean,
-	 * IConfiguredSite)
-	 * @deprecated use getFeature(IProgressMonitor)
-	 */
-	public IFeature getFeature(
-		boolean perfectMatch,
-		IConfiguredSite configuredSite)
-		throws CoreException {
-		return getFeature(null);
-	}
-
-	/**
-	 * @see org.eclipse.update.core.IIncludedFeatureReference#getFeature(boolean,
-	 * IConfiguredSite,IProgressMonitor)
-	 * @deprecated use getFeature(IProgressMonitor)
-	 */
-	public IFeature getFeature(
-		boolean perfectMatch,
-		IConfiguredSite configuredSite,
-		IProgressMonitor monitor)
-		throws CoreException {
-			return getFeature(monitor);
-	}
-
-	/**
-	 * @see org.eclipse.update.core.IFeatureReference#getFeature()
-	 * @deprecated use getFeature(IProgressMonitor)
-	 */
-	public IFeature getFeature() throws CoreException {
-		return getFeature(null);
-	}
-	/**
-	 * @see org.eclipse.update.core.IFeatureReference#getFeature
-	 * (IProgressMonitor)
-	 */
-	public IFeature getFeature(IProgressMonitor monitor) throws CoreException {
-		if (isUninstalled())
-			throw new CoreException(new Status(IStatus.ERROR, UpdateCore.getPlugin().getBundle().getSymbolicName(), IStatus.OK, Policy.bind("IncludedFeatureReference.featureUninstalled", //$NON-NLS-1$
-					getFeatureIdentifier()), null));
-		else
-			return super.getFeature(monitor);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
deleted file mode 100644
index 134c396..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.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.update.core;
-
-import org.eclipse.update.core.model.*;
-
-/**
- * Convenience implementation of an install handler entry.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p> 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IInstallHandlerEntry
- * @see org.eclipse.update.core.model.InstallHandlerEntryModel
- * @see org.eclipse.update.core.IInstallHandler
- * @since 2.0
- */
-public class InstallHandlerEntry
-	extends InstallHandlerEntryModel
-	implements IInstallHandlerEntry {
-
-	/**
-	 * Constructor for InstallHandlerEntry.
-	 * @since 2.0
-	 */
-	public InstallHandlerEntry() {
-		super();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
deleted file mode 100644
index 6ae8c90..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
+++ /dev/null

@@ -1,273 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.util.*;

-

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

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

-

-/**

- * Install progress monitor

- * Delegating wrapper for IProgressMonitor used for installation handling.

- * 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @since 2.0

- */

-public class InstallMonitor implements IProgressMonitor {

-

-	protected IProgressMonitor monitor;

-	protected Stack tasks;

-

-	protected String taskString;

-	protected String subTaskString;

-	protected boolean showDetails;

-	protected long totalCopyCount;

-	protected	long currentCount = 0;

-

-	protected class MonitorState {

-

-		private String taskString;

-		private String subTaskString;

-		private boolean showDetails;

-		private long totalCopyCount;

-

-		private MonitorState(

-			String taskString,

-			String subTaskString,

-			boolean showDetails,

-			long totalCopyCount) {

-			this.taskString = taskString;

-			this.subTaskString = subTaskString;

-			this.showDetails = showDetails;

-			this.totalCopyCount = totalCopyCount;

-		}

-

-		private String getTaskString() {

-			return this.taskString;

-		}

-

-		private String getSubTaskString() {

-			return this.subTaskString;

-		}

-

-		private boolean getShowDetails() {

-			return this.showDetails;

-		}

-

-		private long getTotalCopyCount() {

-			return this.totalCopyCount;

-		}

-	}

-	

-	protected InstallMonitor() {

-	}

-

-	/**

-	 * Install monitor constructor

-	 * 

-	 * @param monitor base install monitor

-	 * @since 2.0

-	 */

-	public InstallMonitor(IProgressMonitor monitor) {

-		this.monitor = monitor;

-		this.tasks = new Stack();

-		this.taskString = ""; //$NON-NLS-1$

-		this.subTaskString = ""; //$NON-NLS-1$

-		this.showDetails = false;

-		this.totalCopyCount = 0;

-	}

-

-	/**

-	 * Begin new monitor task.

-	 * 

-	 * @see IProgressMonitor#beginTask(String, int)

-	 * @since 2.0

-	 */

-	public void beginTask(String name, int totalWork) {

-		taskString = name;

-		monitor.beginTask(name, totalWork);

-	}

-

-	/**

-	 * Indicate completion of monitor activity.

-	 * 

-	 * @see IProgressMonitor#done()

-	 * @since 2.0

-	 */

-	public void done() {

-		monitor.done();

-	}

-

-	/**

-	 * Indicate monitor progress.

-	 * 

-	 * @see IProgressMonitor#internalWorked(double)

-	 * @since 2.0

-	 */

-	public void internalWorked(double work) {

-		monitor.internalWorked(work);

-	}

-

-	/**

-	 * Check is use indicated that the operation be cancelled.

-	 * 

-	 * @see IProgressMonitor#isCanceled()

-	 * @since 2.0

-	 */

-	public boolean isCanceled() {

-		return monitor.isCanceled();

-	}

-

-	/**

-	 * Set the cancellation state.

-	 * 

-	 * @see IProgressMonitor#setCanceled(boolean)

-	 * @since 2.0

-	 */

-	public void setCanceled(boolean value) {

-		monitor.setCanceled(value);

-	}

-

-	/**

-	 * Set task name.

-	 * 

-	 * @see IProgressMonitor#setTaskName(String)

-	 * @since 2.0

-	 */

-	public void setTaskName(String name) {

-		this.taskString = name;

-		this.subTaskString = ""; //$NON-NLS-1$

-		this.showDetails = false;

-		this.totalCopyCount = 0;

-		monitor.subTask(""); //$NON-NLS-1$

-		monitor.setTaskName(name);

-	}

-

-	/**

-	 * Set subtask name.

-	 * 

-	 * @see IProgressMonitor#subTask(String)

-	 * @since 2.0

-	 */

-	public void subTask(String name) {

-		this.subTaskString = name;

-		this.showDetails = false;

-		this.totalCopyCount = 0;

-		monitor.subTask(name);

-	}

-

-	/**

-	 * Indicate monitor progress.

-	 * 

-	 * @see IProgressMonitor#worked(int)

-	 * @since 2.0

-	 */

-	public void worked(int work) {

-		monitor.worked(work);

-	}

-

-	/**

-	 * Save the current monitor state.

-	 * The states are saved on a push-down stack. Prior states

-	 * can be restored by calling restorState()

-	 * 

-	 * @see #restoreState()

-	 * @since 2.0

-	 */

-	public void saveState() {

-		tasks.push(

-			new MonitorState(taskString, subTaskString, showDetails, totalCopyCount));

-	}

-

-	/**

-	 * Restore the monitor state.

-	 * 

-	 * @see #saveState()

-	 * @since 2.0

-	 */

-	public void restoreState() {

-		if (tasks.size() > 0) {

-			MonitorState state = (MonitorState) tasks.pop();

-			setTaskName(state.getTaskString());

-			subTask(state.getSubTaskString());

-			this.showDetails = state.getShowDetails();

-			this.totalCopyCount = state.getTotalCopyCount();

-		}

-	}

-

-	/**

-	 * Indicate whether the monitor subtask message should include

-	 * copy progress counts.

-	 * 

-	 * @see #setCopyCount(long)

-	 * @see #setTotalCount(long)

-	 * @param setting <code>true</code> to show the copy count,

-	 * <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public void showCopyDetails(boolean setting) {

-		this.showDetails = setting;

-	}

-

-	/**

-	 * Sets the total number of bytes to copy.

-	 * 

-	 * @see #showCopyDetails(boolean)

-	 * @see #setCopyCount(long)

-	 * @param count total number of bytes to copy.

-	 * @since 2.0

-	 */

-	public void setTotalCount(long count) {

-		this.totalCopyCount = count;

-	}

-

-	/**

-	 * Sets the number of bytes already copied.

-	 * 

-	 * @see #showCopyDetails(boolean)

-	 * @see #setTotalCount(long)

-	 * @param count number of bytes already copied.

-	 * @since 2.0

-	 */

-	public void setCopyCount(long count) {

-		if (showDetails && count > 0) {

-			currentCount = count;

-			long countK = count / 1024;

-			long totalK = totalCopyCount / 1024;

-			String msg =

-				(totalK <= 0)

-					? Policy.bind("InstallMonitor.DownloadSize", Long.toString(countK)) //$NON-NLS-1$

-					: Policy.bind(

-						"InstallMonitor.DownloadSizeLong", //$NON-NLS-1$

-						Long.toString(countK),

-						Long.toString(totalK));

-			monitor.subTask(subTaskString + msg);

-		}

-	}

-	

-	/**

-	 * Increments the number of bytes copied.

-	 * 

-	 * @see #showCopyDetails(boolean)

-	 * @see #setTotalCount(long)

-	 * @param increment number of new bytes  copied.

-	 * @since 2.0

-	 */

-	public void incrementCount(long increment) {

-		setCopyCount(currentCount + increment);

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
deleted file mode 100644
index 3a0865f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
+++ /dev/null

@@ -1,366 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.io.*;

-import java.net.*;

-import java.util.*;

-import java.util.jar.*;

-

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

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

-

-/**

- * Local .jar file content reference.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ContentReference

- * @see org.eclipse.update.core.JarEntryContentReference

- * @since 2.0

- */

-public class JarContentReference extends ContentReference {

-

-	private static ArrayList referenceList = new ArrayList();

-	private JarFile jarFile;

-

-	/**

-	 * Content selector used in .jar operations.

-	 * Default implementation causes all file entries to be selected with

-	 * generated identifiers being the same as the original .jar entry name.

-	 * 

-	 * @since 2.0

-	 */

-	public static class ContentSelector {

-

-		/**

-		 * Indicates whether the .jar entry should be selected.

-		 * Default behavior is to select all non-directory entries.

-		 * 

-		 * @param entry .jar entry

-		 * @return <code>true</code> if entry is to be selected, 

-		 * <code>false</code> otherwise

-		 * @since 2.0

-		 */

-		public boolean include(JarEntry entry) {

-			return entry == null ? false : !entry.isDirectory();

-		}

-

-		/**

-		 * Defines the "symbolic" path identifier for the 

-		 * entry. Default identifier is the same as the jar entry name.

-		 * 

-		 * @param entry .jar entry

-		 * @return "symbolic" path identifier

-		 * @since 2.0

-		 */

-		public String defineIdentifier(JarEntry entry) {

-			return entry == null ? null : entry.getName();

-		}

-	}

-

-	/**

-	 * Create jar content reference from URL.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param url actual referenced URL

-	 * @since 2.0

-	 */

-	public JarContentReference(String id, URL url) {

-		super(id, url);

-		this.jarFile = null;

-		referenceList.add(this); // keep track of archives

-	}

-

-	/**

-	 * Create jar content reference from file.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param file actual referenced file

-	 * @since 2.0

-	 */

-	public JarContentReference(String id, File file) {

-		super(id, file);

-		this.jarFile = null;

-		referenceList.add(this); // keep track of archives

-	}

-

-	/**

-	 * A factory method to create a jar content reference.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param file actual referenced file

-	 * @return jar content reference

-	 * @since 2.0

-	 */

-	public ContentReference createContentReference(String id, File file) {

-		return new JarContentReference(id, file,true);

-	}

-	/**

-	 * Constructor JarContentReference.

-	 * @param id

-	 * @param file

-	 * @param b

-	 */

-	public JarContentReference(String id, File file, boolean b) {

-		this(id,file);

-		setTempLocal(b);

-	}

-

-	/**

-	 * Returns the content reference as a jar file. Note, that this method

-	 * <b>does not</b> cause the file to be downloaded if it

-	 * is not already local.

-	 * 

-	 * @return reference as jar file

-	 * @exception IOException reference cannot be returned as jar file

-	 * @since 2.0

-	 */

-	protected JarFile asJarFile() throws IOException {

-		if (this.jarFile == null) {

-			File file = asFile();

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)

-				UpdateCore.debug("asJarFile :" + file); //$NON-NLS-1$

-			if (file != null && !file.exists()) {

-				UpdateCore.warn("JarFile does not exits:" + file); //$NON-NLS-1$

-				throw new FileNotFoundException(file.getAbsolutePath());

-			}

-			this.jarFile = new JarFile(file);

-		}

-		return jarFile;

-	}

-

-	/**

-	 * Unpacks the referenced jar archive into the specified location.

-	 * Returns content references to the unpacked files.

-	 * 

-	 * @param dir location to unpack the jar into

-	 * @param selector selector, used to select entries to unpack, and to define

-	 * "symbolic" path identifiers for the entries.

-	 * @param monitor progress monitor 

-	 * @exception IOException

-	 * @exception InstallAbortedException

-	 * @since 2.0

-	 */

-	public ContentReference[] unpack(File dir, ContentSelector selector, InstallMonitor monitor) throws IOException, InstallAbortedException {

-

-		// make sure we have a selector

-		if (selector == null)

-			selector = new ContentSelector();

-

-		// get archive content

-		JarFile jarArchive = this.asJarFile();

-		List content = new ArrayList();

-		Enumeration entries = jarArchive.entries();

-

-		// run through the entries and unjar

-		String entryId;

-		JarEntry entry;

-		InputStream is;

-		OutputStream os;

-		File localFile;

-		try {

-			if (monitor != null) {

-				monitor.saveState();

-				monitor.setTaskName(Policy.bind("JarContentReference.Unpacking"));	//$NON-NLS-1$

-				monitor.subTask(this.getIdentifier());

-				monitor.showCopyDetails(false);

-			}

-			while (entries.hasMoreElements()) {

-				entry = (JarEntry) entries.nextElement();

-				if (entry != null && selector.include(entry)) {

-					is = null;

-					os = null;

-					entryId = selector.defineIdentifier(entry);

-					localFile = Utilities.createLocalFile(dir, entryId); // create temp file 

-					if (!entry.isDirectory()) {

-						try {

-							is = jarArchive.getInputStream(entry);

-							os = new FileOutputStream(localFile);

-							Utilities.copy(is, os, monitor);

-						} finally {

-							if (is != null)

-								try {

-									is.close();

-								} catch (IOException e) {

-								}

-							if (os != null)

-								try {

-									os.close();

-								} catch (IOException e) {

-								}

-						}

-						content.add(new ContentReference(entryId, localFile));

-					}

-				}

-			}

-		} finally {

-			if (monitor != null)

-				monitor.restoreState();

-		}

-		return (ContentReference[]) content.toArray(new ContentReference[0]);

-	}

-

-	/**

-	 * Unpacks the named jar entry into the specified location.

-	 * Returns content reference to the unpacked file.

-	 * 

-	 * @param dir location to unpack the jar into

-	 * @param entryName name of the jar entry

-	 * @param selector selector, used to define "symbolic" path identifier

-	 * for the entry

-	 * @param monitor progress monitor 

-	 * @exception IOException

-	 * @exception InstallAbortedException

-	 * @since 2.0

-	 */

-	public ContentReference unpack(File dir, String entryName, ContentSelector selector, InstallMonitor monitor) throws IOException, InstallAbortedException {

-

-		// make sure we have a selector

-		if (selector == null)

-			selector = new ContentSelector();

-

-		// unjar the entry

-		JarFile jarArchive = this.asJarFile();

-		entryName = entryName.replace(File.separatorChar, '/');

-		JarEntry entry = jarArchive.getJarEntry(entryName);

-		String entryId;

-		if (entry != null) {

-			InputStream is = null;

-			OutputStream os = null;

-			entryId = selector.defineIdentifier(entry);

-			File localFile = Utilities.createLocalFile(dir, entryId); // create temp file

-			if (!entry.isDirectory()) {

-				try {

-					is = jarArchive.getInputStream(entry);

-					os = new FileOutputStream(localFile);

-					Utilities.copy(is, os, monitor);

-				} finally {

-					if (is != null)

-						try {

-							is.close();

-						} catch (IOException e) {

-						}

-					if (os != null)

-						try {

-							os.close();

-						} catch (IOException e) {

-						}

-				}

-				return new ContentReference(entryId, localFile);

-			} else

-				return null; // entry was a directory

-		} else

-			throw new FileNotFoundException(this.asFile().getAbsolutePath() + " " + entryName);	//$NON-NLS-1$

-	}

-

-	/**

-	 * Peeks into the referenced jar archive.

-	 * Returns content references to the jar entries within the jar file.

-	 * 

-	 * @param selector selector, used to select entries to return, and to define

-	 * "symbolic" path identifiers for the entries.

-	 * @param monitor progress monitor 

-	 * @exception IOException

-	 * @since 2.0

-	 */

-	public ContentReference[] peek(ContentSelector selector, InstallMonitor monitor) throws IOException {

-

-		// make sure we have a selector

-		if (selector == null)

-			selector = new ContentSelector();

-

-		// get archive content

-		JarFile jarArchive = this.asJarFile();

-		List content = new ArrayList();

-		Enumeration entries = jarArchive.entries();

-

-		// run through the entries and create content references

-		JarEntry entry;

-		String entryId;

-		while (entries.hasMoreElements()) {

-			entry = (JarEntry) entries.nextElement();

-			if (selector.include(entry)) {

-				entryId = selector.defineIdentifier(entry);

-				content.add(new JarEntryContentReference(entryId, this, entry));

-			}

-		}

-		return (ContentReference[]) content.toArray(new ContentReference[0]);

-	}

-

-	/**

-	 * Peeks into the referenced jar archive looking for the named entry.

-	 * Returns content reference to the jar entry within the jar file.

-	 * 

-	 * @param entryName name of the jar entry

-	 * @param selector selector, used to define "symbolic" path identifier

-	 * for the entry

-	 * @param monitor progress monitor 

-	 * @return the content reference ofr <code>null</null> if the entry doesn't exist

-	 * @exception IOException

-	 * @since 2.0

-	 */

-	public ContentReference peek(String entryName, ContentSelector selector, InstallMonitor monitor) throws IOException {

-

-		// make sure we have a selector

-		if (selector == null)

-			selector = new ContentSelector();

-

-		// assume we have a reference that represents a jar archive.

-		JarFile jarArchive = this.asJarFile();

-		entryName = entryName.replace(File.separatorChar, '/');

-		JarEntry entry = jarArchive.getJarEntry(entryName);

-		if (entry == null)

-			return null;

-

-		String entryId = selector.defineIdentifier(entry);

-		return new JarEntryContentReference(entryId, this, entry);

-	}

-

-	/**

-	 * Closes the jar archive corresponding to this reference.

-	 * 

-	 * @exception IOException

-	 * @since 2.0

-	 */

-	public void closeArchive() throws IOException {

-		if (this.jarFile != null) {

-			this.jarFile.close();

-			this.jarFile = null;

-		}

-	}

-

-	/**

-	 * Perform shutdown processing for jar archive handling.

-	 * This method is called when platform is shutting down.

-	 * It is not intended to be called at any other time under

-	 * normal circumstances. A side-effect of calling this method

-	 * is that all jars referenced by JarContentReferences are closed.

-	 * 

-	 * @since 2.0

-	 */

-	public static void shutdown() {

-		for (int i = 0; i < referenceList.size(); i++) {

-			JarContentReference ref = (JarContentReference) referenceList.get(i);

-			try {

-				ref.closeArchive(); // ensure we are not leaving open jars

-			} catch (IOException e) {

-				// we tried, nothing we can do ...

-			}

-		}

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
deleted file mode 100644
index 7feeaff..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.io.*;

-import java.net.*;

-import java.util.jar.*;

-

-/**

- * .jar file entry content reference.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ContentReference

- * @see org.eclipse.update.core.JarContentReference

- * @since 2.0

- */

-public class JarEntryContentReference extends ContentReference {

-

-	private JarContentReference jarContentReference;

-	private JarEntry entry;

-

-	/**

-	 * Create jar entry content reference.

-	 * 

-	 * @param id "symbolic" path identifier

-	 * @param jarContentReference jar file content reference

-	 * @param entry jar entry

-	 * @since 2.0

-	 */

-	public JarEntryContentReference(

-		String id,

-		JarContentReference jarContentReference,

-		JarEntry entry) {

-		super(id, (File) null);

-		this.jarContentReference = jarContentReference;

-		this.entry = entry;

-	}

-	

-	/**

-	 * Creates an input stream for the reference.

-	 * 

-	 * @return input stream

-	 * @exception IOException unable to create stream

-	 * @since 2.0

-	 */

-	public InputStream getInputStream() throws IOException {

-		return jarContentReference.asJarFile().getInputStream(entry);

-	}	

-	

-	/**

-	 * Returns the size of the referenced entry.

-	 * 

-	 * @return input size

-	 * @since 2.0

-	 */

-	public long getInputSize() {

-		return entry.getSize();

-	}

-	

-	/**

-	 * Indicates whether the reference is to a an entry within a local jar.

-	 * 

-	 * @return <code>true</code> if the reference is local, 

-	 * otherwise <code>false</code>

-	 * @since 2.0

-	 */

-	public boolean isLocalReference() {

-		return jarContentReference.isLocalReference();

-	}	

-		

-	/**

-	 * Returns the content reference as a URL.

-	 * 

-	 * @return reference as URL

-	 * @exception IOException reference cannot be returned as URL

-	 * @since 2.0

-	 */

-	public URL asURL() throws IOException {

-		String fileName =

-			jarContentReference.asFile().getAbsolutePath().replace(File.separatorChar, '/');

-		return new URL("jar:file:" + fileName + "!/" + entry.getName());	//$NON-NLS-1$ //$NON-NLS-2$

-	}

-			

-	/**

-	 * Return string representation of this reference.

-	 * 

-	 * @return string representation

-	 * @since 2.0

-	 */

-	public String toString() {

-		URL url;

-		try {

-			url = asURL();

-		} catch (IOException e) {

-			url = null;

-		}

-		if (url != null)

-			return url.toExternalForm();

-		else

-			return getClass().getName() + "@" + hashCode(); //$NON-NLS-1$

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
deleted file mode 100644
index 06af571..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.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.core;

-

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

-

-/**

- * Convenience implementation of non-plug-in entry.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.INonPluginEntry

- * @see org.eclipse.update.core.model.NonPluginEntryModel

- * @since 2.0

- */

-public class NonPluginEntry

-	extends NonPluginEntryModel

-	implements INonPluginEntry {

-

-	/**

-	 * Non-plug-in entry default constructor

-	 */

-	public NonPluginEntry() {

-		super();

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
deleted file mode 100644
index 169f9f5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

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

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

-

-/**

- * Convenience implementation of plug-in entry.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.IPluginEntry

- * @see org.eclipse.update.core.model.PluginEntryModel

- * @since 2.0

- */

-public class PluginEntry extends PluginEntryModel implements IPluginEntry {

-	

-	// PERF: new instance variable

-	private VersionedIdentifier versionId;

-

-	/**

-	 * Plug-in entry default constructor

-	 */

-	public PluginEntry() {

-		super();

-	}

-

-	/**

-	 * Returns the identifier of this plugin entry

-	 * 

-	 * @see IPluginEntry#getVersionedIdentifier()

-	 * @since 2.0

-	 */

-	public VersionedIdentifier getVersionedIdentifier() {

-		if (versionId != null)

-			return versionId;

-

-		String id = getPluginIdentifier();

-		String ver = getPluginVersion();

-		if (id != null && ver != null) {

-			try {

-				versionId = new VersionedIdentifier(id, ver);

-				return versionId;

-			} catch (Exception e) {

-				UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-

-		versionId = new VersionedIdentifier("",null); //$NON-NLS-1$

-		return versionId;

-	}

-

-	/**

-	 * Sets the identifier of this plugin entry. 

-	 * 

-	 * @see IPluginEntry#setVersionedIdentifier(VersionedIdentifier)

-	 * @since 2.0

-	 */

-	public void setVersionedIdentifier(VersionedIdentifier identifier) {

-		setPluginIdentifier(identifier.getIdentifier());

-		setPluginVersion(identifier.getVersion().toString());

-	}	

-

-	/**

-	 * Compares two plugin entries for equality

-	 * 

-	 * @param object plugin entry object to compare with

-	 * @return <code>true</code> if the two entries are equal, 

-	 * <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public boolean equals(Object object) {

-		if (!(object instanceof IPluginEntry))

-			return false;

-		IPluginEntry e = (IPluginEntry) object;

-		return getVersionedIdentifier().equals(e.getVersionedIdentifier());

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
deleted file mode 100644
index 4313db3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
+++ /dev/null

@@ -1,527 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.net.*;

-import java.util.*;

-

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

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

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

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

-

-/**

- * Convenience implementation of a site.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ISite

- * @see org.eclipse.update.core.model.SiteModel

- * @since 2.0

- */

-public class Site extends SiteModel implements ISite {

-

-	/**

-	 * Default installation path for features

-	 * 

-	 * @since 2.0

-	 */

-	public static final String DEFAULT_INSTALLED_FEATURE_PATH = "features/"; //$NON-NLS-1$

-

-	/**

-	 * Default installation path for plug-ins and plug-in fragments

-	 * 

-	 * @since 2.0

-	 */

-	public static final String DEFAULT_PLUGIN_PATH = "plugins/"; //$NON-NLS-1$

-

-	/**

-	 * Default path on a site where packaged features are located

-	 * 

-	 * @since 2.0

-	 */

-	public static final String DEFAULT_FEATURE_PATH = "features/"; //$NON-NLS-1$

-

-	/**

-	 * Default site manifest file name

-	 * 

-	 * @since 2.0

-	 */

-	public static final String SITE_FILE = "site"; //$NON-NLS-1$

-

-	/**

-	 * Default site manifest extension

-	 * 

-	 * @since 2.0

-	 */

-	public static final String SITE_XML = SITE_FILE + ".xml"; //$NON-NLS-1$

-

-	private ISiteContentProvider siteContentProvider;

-	

-	private Map featureCache = new HashMap(); // key=URLKey value=IFeature

-	

-	/**

-	 * Constructor for Site

-	 */

-	public Site() {

-		super();

-	}

-

-	/**

-	 * Compares two sites for equality

-	 * 

-	 * @param obj site object to compare with

-	 * @return <code>true</code> if the two sites are equal, 

-	 * <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public boolean equals(Object obj) {

-		if (!(obj instanceof ISite))

-			return false;

-		if (getURL() == null)

-			return false;

-		ISite otherSite = (ISite) obj;

-

-		return UpdateManagerUtils.sameURL(getURL(), otherSite.getURL());

-	}

-

-	/**

-	 * Returns the site URL

-	 * 

-	 * @see ISite#getURL()

-	 * @since 2.0

-	 */

-	public URL getURL() {

-		URL url = null;

-		try {

-			url = getSiteContentProvider().getURL();

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-		}

-		return url;

-	}

-

-	/**

-	 * Returns the site description.

-	 * 

-	 * @see ISite#getDescription()

-	 * @since 2.0

-	 */

-	public IURLEntry getDescription() {

-		return (IURLEntry) getDescriptionModel();

-	}

-

-	/**

-	 * Returns an array of categories defined by the site.

-	 * 

-	 * @see ISite#getCategories()

-	 * @since 2.0

-	 */

-	public ICategory[] getCategories() {

-		CategoryModel[] result = getCategoryModels();

-		if (result.length == 0)

-			return new ICategory[0];

-		else

-			return (ICategory[]) result;

-	}

-

-	/**

-	 * Returns the named site category.

-	 * 

-	 * @see ISite#getCategory(String)

-	 * @since 2.0

-	 */

-	public ICategory getCategory(String key) {

-		ICategory result = null;

-		boolean found = false;

-		int length = getCategoryModels().length;

-

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

-			if (getCategoryModels()[i].getName().equals(key)) {

-				result = (ICategory) getCategoryModels()[i];

-				found = true;

-				break;

-			}

-		}

-

-		//DEBUG:

-		if (!found) {

-			String URLString = (this.getURL() != null) ? this.getURL().toExternalForm() : "<no site url>"; //$NON-NLS-1$

-			UpdateCore.warn(Policy.bind("Site.CannotFindCategory", key, URLString)); //$NON-NLS-1$ //$NON-NLS-2$

-			if (getCategoryModels().length <= 0)

-				UpdateCore.warn(Policy.bind("Site.NoCategories"));	//$NON-NLS-1$

-		}

-

-		return result;

-	}

-

-	/**

-	 * Returns an array of references to features on this site.

-	 * 

-	 * @see ISite#getFeatureReferences()

-	 * @since 2.0

-	 */

-	public ISiteFeatureReference[] getRawFeatureReferences() {

-		FeatureReferenceModel[] result = getFeatureReferenceModels();

-		if (result.length == 0)

-			return new ISiteFeatureReference[0];

-		else

-			return (ISiteFeatureReference[]) result;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#getFeatureReferences()

-	 */

-	public ISiteFeatureReference[] getFeatureReferences() {

-		// only filter local site

-		if (getCurrentConfiguredSite()!=null)

-			return filterFeatures(getRawFeatureReferences());

-		else 

-			return getRawFeatureReferences();

-		

-	}

-

-	/*

-	 * Method filterFeatures.

-	 * Also implemented in Feature

-	 *  

-	 * @param list

-	 * @return List

-	 */

-	private ISiteFeatureReference[] filterFeatures(ISiteFeatureReference[] allIncluded) {

-		List list = new ArrayList();

-		if (allIncluded!=null){

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

-				ISiteFeatureReference included = allIncluded[i];

-				if (UpdateManagerUtils.isValidEnvironment(included))

-					list.add(included);

-				else{

-					if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS){

-						UpdateCore.warn("Filtered out feature reference:"+included); //$NON-NLS-1$

-					}

-				}

-			}

-		}

-		

-		ISiteFeatureReference[] result = new ISiteFeatureReference[list.size()];

-		if (!list.isEmpty()){

-			list.toArray(result);

-		}

-		

-		return result;	

-	}

-

-	/**

-	 * Returns a reference to the specified feature on this site.

-	 * 

-	 * @see ISite#getFeatureReference(IFeature)

-	 * @since 2.0

-	 */

-	public ISiteFeatureReference getFeatureReference(IFeature feature) {

-

-		if (feature == null) {

-			UpdateCore.warn("Site:getFeatureReference: The feature is null"); //$NON-NLS-1$

-			return null;

-		}

-

-		ISiteFeatureReference[] references = getFeatureReferences();

-		ISiteFeatureReference currentReference = null;

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

-			currentReference = references[i];

-			if (UpdateManagerUtils.sameURL(feature.getURL(), currentReference.getURL()))

-				return currentReference;

-		}

-

-		UpdateCore.warn("Feature " + feature + " not found on site" + this.getURL()); //$NON-NLS-1$ //$NON-NLS-2$

-		return null;

-	}

-

-	/**

-	 * Returns an array of plug-in and non-plug-in archives located

-	 * on this site

-	 * 

-	 * @see ISite#getArchives()

-	 * @since 2.0

-	 */

-	public IArchiveReference[] getArchives() {

-		ArchiveReferenceModel[] result = getArchiveReferenceModels();

-		if (result.length == 0)

-			return new IArchiveReference[0];

-		else

-			return (IArchiveReference[]) result;

-	}

-

-	/**

-	 * Returns the content provider for this site.

-	 * 

-	 * @see ISite#getSiteContentProvider()

-	 * @since 2.0

-	 */

-	public ISiteContentProvider getSiteContentProvider() throws CoreException {

-		if (siteContentProvider == null) {

-			throw Utilities.newCoreException(Policy.bind("Site.NoContentProvider"), null);	//$NON-NLS-1$

-		}

-		return siteContentProvider;

-	}

-

-	/**

-	 * Returns the default type for a packaged feature supported by this site

-	 * 

-	 * @see ISite#getDefaultPackagedFeatureType()

-	 * @since 2.0

-	 */

-	public String getDefaultPackagedFeatureType() {

-		return DEFAULT_PACKAGED_FEATURE_TYPE;

-	}

-

-	/**

-	 * Returns an array of entries corresponding to plug-ins installed

-	 * on this site.

-	 * 

-	 * @see ISite#getPluginEntries()

-	 * @since 2.0

-	 */

-	public IPluginEntry[] getPluginEntries() {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Returns the number of plug-ins installed on this site

-	 * 

-	 * @see ISite#getPluginEntryCount()

-	 * @since 2.0

-	 */

-	public int getPluginEntryCount() {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Returns an array of entries corresponding to plug-ins that are

-	 * installed on this site and are referenced only by the specified

-	 * feature. 

-	 * 

-	 * @see ISite#getPluginEntriesOnlyReferencedBy(IFeature)	 * 

-	 * @since 2.0

-	 */

-	public IPluginEntry[] getPluginEntriesOnlyReferencedBy(IFeature feature) throws CoreException {

-

-		IPluginEntry[] pluginsToRemove = new IPluginEntry[0];

-		if (feature == null)

-			return pluginsToRemove;

-

-		// get the plugins from the feature

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

-		if (entries != null) {

-			// get all the other plugins from all the other features

-			Set allPluginID = new HashSet();

-			ISiteFeatureReference[] features = getFeatureReferences();

-			if (features != null) {

-				for (int indexFeatures = 0; indexFeatures < features.length; indexFeatures++) {

-					IFeature featureToCompare = null;

-					try {

-						featureToCompare = features[indexFeatures].getFeature(null);

-					} catch (CoreException e) {

-						UpdateCore.warn(null, e);

-					}

-					if (!feature.equals(featureToCompare)) {

-						IPluginEntry[] pluginEntries = features[indexFeatures].getFeature(null).getPluginEntries();

-						if (pluginEntries != null) {

-							for (int indexEntries = 0; indexEntries < pluginEntries.length; indexEntries++) {

-								allPluginID.add(pluginEntries[indexEntries].getVersionedIdentifier());

-							}

-						}

-					}

-				}

-			}

-

-			// create the delta with the plugins that may be still used by other configured or unconfigured feature

-			List plugins = new ArrayList();

-			for (int indexPlugins = 0; indexPlugins < entries.length; indexPlugins++) {

-				if (!allPluginID.contains(entries[indexPlugins].getVersionedIdentifier())) {

-					plugins.add(entries[indexPlugins]);

-				}

-			}

-

-			// move List into Array

-			if (!plugins.isEmpty()) {

-				pluginsToRemove = new IPluginEntry[plugins.size()];

-				plugins.toArray(pluginsToRemove);

-			}

-		}

-

-		return pluginsToRemove;

-	}

-

-	/**

-	 * Adds a new plug-in entry to this site.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the install action.

-	 * 

-	 * @see ISite#addPluginEntry(IPluginEntry)

-	 * @exception java.lang.UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public void addPluginEntry(IPluginEntry pluginEntry) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Get download size for the specified feature on this site.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the install action.

-	 * 

-	 * @see ISite#getDownloadSizeFor(IFeature)

-	 * @exception java.lang.UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public long getDownloadSizeFor(IFeature feature) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Get install size for the specified feature on this site.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the install action.

-	 * 

-	 * @see ISite#getInstallSizeFor(IFeature)

-	 * @exception java.lang.UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public long getInstallSizeFor(IFeature feature) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Install the specified feature and all optional features on this site.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the install action.

-	 * 

-	 * @see ISite#install(IFeature, IVerificationListener, IProgressMonitor)

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @exception java.lang.UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public IFeatureReference install(IFeature sourceFeature, IVerificationListener verificationListener, IProgressMonitor progress) throws InstallAbortedException, CoreException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Install the specified feature and listed optional features on this site.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the install action.

-	 * 

-	 * @see ISite#install(IFeature, IVerificationListener, IProgressMonitor)

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @exception java.lang.UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalFeatures, IVerificationListener verificationListener, IProgressMonitor progress) throws InstallAbortedException, CoreException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Install the specified feature on this site using the content consumer as 

-	 * a context to install the feature in.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the install action.

-	 * 

-	 * @param sourceFeature feature to install

-	 * @param parentContentConsumer content consumer of the parent feature

-	 * @param parentVerifier verifier of the parent feature

-	 * @param verificationListener install verification listener

-	 * @param progress install monitor, can be <code>null</code>

-	 * @exception InstallAbortedException when the user cancels the install

-	 * @exception CoreException

-	 * @exception java.lang.UnsupportedOperationException 

-	 * @since 2.0 

-	 */

-	public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalFeatures, IFeatureContentConsumer parentContentConsumer, IVerifier parentVerifier, IVerificationListener verificationListener, IProgressMonitor progress)

-		throws CoreException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Remove (uninstall) the specified feature from this site.

-	 * This implementation always throws UnsupportedOperationException

-	 * because this implementation does not support the remove action.

-	 * 

-	 * @see ISite#remove(IFeature, IProgressMonitor)

-	 * @exception java.lang.UnsupportedOperationException

-	 * @since 2.0

-	 */

-	public void remove(IFeature feature, IProgressMonitor progress) throws CoreException {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Sets the site content provider.

-	 * 

-	 * @see ISite#setSiteContentProvider(ISiteContentProvider)

-	 * @since 2.0

-	 */

-	public void setSiteContentProvider(ISiteContentProvider siteContentProvider) {

-		this.siteContentProvider = siteContentProvider;

-	}

-	/**

-	 * @see ISite#getCurrentConfiguredSite()

-	 */

-	public IConfiguredSite getCurrentConfiguredSite() {

-		return (IConfiguredSite) getConfiguredSiteModel();

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#createFeature(String, URL)

-	 * @deprecated

-	 */

-	public IFeature createFeature(String type, URL url) throws CoreException {

-		return createFeature(type,url,null);

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#createFeature(String, URL,

-	 * IProgressMonitor)

-	 */

-	public IFeature createFeature(String type, URL url, IProgressMonitor monitor) throws CoreException {

-

-		// First check the cache

-		URLKey key = new URLKey(url);

-		IFeature feature = (IFeature) featureCache.get(key);

-		if (feature != null) return feature;

-

-		// Create a new one

-		if (type == null || type.equals("")) { //$NON-NLS-1$

-			// ask the Site for the default type

-			type = getDefaultPackagedFeatureType();

-		}

-

-		IFeatureFactory factory = FeatureTypeFactory.getInstance().getFactory(type);

-		feature = factory.createFeature(url, this, monitor);

-		if (feature != null) {

-			// Add the feature to the cache

-			featureCache.put(key, feature);

-		}

-		return feature;

-	}

-

-	protected void removeFeatureFromCache(URL featureURL) {

-		URLKey key = new URLKey(featureURL);

-		featureCache.remove(key);

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
deleted file mode 100644
index 8461e87..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

- 

-import java.net.*;

-

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

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

-

-/**

- * Base site content provider

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- */

-public abstract class SiteContentProvider implements ISiteContentProvider {

-

-	private URL base;

-	private ISite site;

-

-	/**

-	 * Constructor for SiteContentProvider

-	 */

-	public SiteContentProvider(URL url) {

-		super();

-		this.base = url;

-	}

-

-	/**

-	 * Returns the URL of this site

-	 * 

-	 * @see ISiteContentProvider#getURL()

-	 * @since 2.0

-	 */

-	public URL getURL() {

-		return base;

-	}

-

-	/**

-	 * Returns a URL for the identified archive

-	 * 

-	 * @see ISiteContentProvider#getArchiveReference(String)

-	 * @since 2.0

-	 */

-	public URL getArchiveReference(String archiveID) throws CoreException {

-		try {

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

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(

-					Policy.bind(

-						"SiteContentProvider.ErrorCreatingURLForArchiveID", //$NON-NLS-1$

-						archiveID,

-						getURL().toExternalForm()),

-					e);

-		}

-	}

-

-	/**

-	 * Returns the site for this provider

-	 * 

-	 * @see ISiteContentProvider#getSite()

-	 * @since 2.0

-	 */

-	public ISite getSite() {

-		return site;

-	}

-

-	/**

-	 * Sets the site for this provider

-	 * 

-	 * @param site site for this provider

-	 * @since 2.0

-	 */

-	public void setSite(ISite site) {

-		this.site = site;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
deleted file mode 100644
index 31d5175..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.util.*;
-
-import org.eclipse.update.internal.core.*;
-
-/**
- * Convenience implementation of a feature reference.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p> 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IFeatureReference
- * @see org.eclipse.update.core.model.FeatureReferenceModel
- * @see org.eclipse.update.core.ISiteFeatureReference
- * @see org.eclipse.update.core.SiteFeatureReferenceModel 
- * @since 2.1
- */
-public class SiteFeatureReference extends SiteFeatureReferenceModel implements ISiteFeatureReference {
-
-	private List categories;
-
-	/**
-	 * Feature reference default constructor
-	 */
-	public SiteFeatureReference() {
-		super();
-	}
-
-	/**
-	 * Constructor FeatureReference.
-	 * @param ref the reference to copy
-	 */
-	public SiteFeatureReference(ISiteFeatureReference ref) {
-		super(ref);
-	}
-
-	/**
-	 * Returns an array of categories the referenced feature belong to.
-	 * 
-	 * @see ISiteFeatureReference#getCategories()
-	 * @since 2.1 
-	 */
-	public ICategory[] getCategories() {
-
-		if (categories == null) {
-			categories = new ArrayList();
-			String[] categoriesAsString = getCategoryNames();
-			for (int i = 0; i < categoriesAsString.length; i++) {
-				ICategory siteCat = getSite().getCategory(categoriesAsString[i]);
-				if (siteCat != null)
-					categories.add(siteCat);
-				else {
-					String siteURL = getSite().getURL() != null ? getSite().getURL().toExternalForm() : null;
-					UpdateCore.warn("Category " + categoriesAsString[i] + " not found in Site:" + siteURL); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-
-		ICategory[] result = new ICategory[0];
-
-		if (!(categories == null || categories.isEmpty())) {
-			result = new ICategory[categories.size()];
-			categories.toArray(result);
-		}
-		return result;
-	}
-
-	/**
-	 * Adds a category to the referenced feature.
-	 * 
-	 * @see ISiteFeatureReference#addCategory(ICategory)
-	 * @since 2.1 
-	 */
-	public void addCategory(ICategory category) {
-		this.addCategoryName(category.getName());
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
deleted file mode 100644
index 7213dbc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.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.update.core;
-
-import java.util.*;
-
-/**
- * Site Feature reference model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most 
- * cases clients should instead instantiate or subclass the provided 
- * concrete implementation of this model.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.FeatureReference
- * @since 2.1
- */
-public class SiteFeatureReferenceModel extends FeatureReference {
-
-	private List /* of String*/
-	categoryNames;
-
-
-	/**
-	 * Creates an uninitialized feature reference model object.
-	 * 
-	 * @since 2.0
-	 */
-	public SiteFeatureReferenceModel() {
-		super();
-	}
-
-	/**
-	 * Constructor FeatureReferenceModel.
-	 * @param ref
-	 */
-	public SiteFeatureReferenceModel(ISiteFeatureReference ref) {
-		super(ref);
-		if (ref instanceof SiteFeatureReferenceModel) {
-			SiteFeatureReferenceModel refModel = (SiteFeatureReferenceModel) ref;
-			setCategoryNames(refModel.getCategoryNames());
-		}
-	}
-
-
-	/**
-	 * Returns the names of categories the referenced feature belongs to.
-	 * 
-	 * @return an array of names, or an empty array.
-	 * @since 2.0
-	 */
-	public String[] getCategoryNames() {
-		if (categoryNames == null)
-			return new String[0];
-
-		return (String[]) categoryNames.toArray(new String[0]);
-	}
-
-	/**
-	 * Sets the names of categories this feature belongs to.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param categoryNames an array of category names
-	 * @since 2.0
-	 */
-	public void setCategoryNames(String[] categoryNames) {
-		assertIsWriteable();
-		if (categoryNames == null)
-			this.categoryNames = null;
-		else
-			this.categoryNames = new ArrayList(Arrays.asList(categoryNames));
-	}
-
-	/**
-	 * Adds the name of a category this feature belongs to.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param categoryName category name
-	 * @since 2.0
-	 */
-	public void addCategoryName(String categoryName) {
-		assertIsWriteable();
-		if (this.categoryNames == null)
-			this.categoryNames = new ArrayList();
-		if (!this.categoryNames.contains(categoryName))
-			this.categoryNames.add(categoryName);
-	}
-	
-	/**
-	 * Removes the name of a categorys this feature belongs to.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param categoryName category name
-	 * @since 2.0
-	 */
-	public void removeCategoryName(String categoryName) {
-		assertIsWriteable();
-		if (this.categoryNames != null)
-			this.categoryNames.remove(categoryName);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
deleted file mode 100644
index e7b34fa..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
+++ /dev/null

@@ -1,314 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies this distribution, and is available at

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

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *     Laurent Fourrier (laurent@fourrier.nom.fr) - HTTP Proxy code and NetAccess Plugin 

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

-package org.eclipse.update.core;

-

-import java.net.*;

-

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

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

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

-

-/**

- * Site Manager.

- * A helper class used for creating site instance. 

- * Site manager is a singleton class. It cannot be instantiated; 

- * all functionality is provided by static methods.

- * 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ISite

- * @see org.eclipse.update.configuration.ILocalSite

- * @see org.eclipse.update.configuration.IConfiguredSite

- * @since 2.0

- */

-public class SiteManager {

-

-	private static String os;

-	private static String ws;

-	private static String arch;

-	private static String nl;

-	private static boolean isHttpProxyEnable;

-	

-	private static final String P_HTTP_HOST = "http.proxyHost"; //$NON-NLS-1$

-	private static final String P_HTTP_PORT = "http.proxyPort";	 //$NON-NLS-1$

-	private static final String P_HTTP_PROXY = "http.proxySet"; //$NON-NLS-1$

-

-	private SiteManager() {

-	}

-

-	/** 

-	 * Returns a site object for the site specified by the argument URL.

-	 * Typically, the URL references a site manifest file on an update 

-	 * site. An update site acts as a source of features for installation

-	 * actions.

-	 * 

-	 * @param siteURL site URL

-	 * @return site object for the url

-	 * @exception CoreException

-	 * @deprecated use getSite(URL,IPogressMonitor) instead

-	 * @since 2.0 

-	 */

-	public static ISite getSite(URL siteURL) throws CoreException {

-		return InternalSiteManager.getSite(siteURL, true,null);

-	}

-

-	/** 

-	 * Returns a site object for the site specified by the argument URL.

-	 * Typically, the URL references a site manifest file on an update 

-	 * site. An update site acts as a source of features for installation

-	 * actions.

-	 * 

-	 * @param siteURL site URL

-	 * @param monitor the progress monitor

-	 * @return site object for the url or <samp>null</samp> in case a 

-	 * user canceled the connection in the progress monitor.

-	 * @exception CoreException

-	 * @since 2.1 

-	 */

-	public static ISite getSite(URL siteURL, IProgressMonitor monitor) throws CoreException {

-		return InternalSiteManager.getSite(siteURL, true, monitor);

-	}

-

-	/** 

-	 * Returns a site object for the site specified by the argument URL.

-	 * Typically, the URL references a site manifest file on an update 

-	 * site. An update site acts as a source of features for installation

-	 * actions.

-	 * 

-	 * @param siteURL site URL

-	 * @param usesCache <code>false</code> if the cache should be refreshed, and the site entirely reparsed, <code>false</code> otherwise.

-	 * @return site object for the url

-	 * @exception CoreException

-	 * @deprecated use getSite(URL,boolean,IPogressMonitor) instead

-	 * @since 2.0 

-	 */

-	public static ISite getSite(URL siteURL, boolean usesCache) throws CoreException {

-		return InternalSiteManager.getSite(siteURL, usesCache,null);

-	}

-

-	/** 

-	 * Returns a site object for the site specified by the argument URL.

-	 * Typically, the URL references a site manifest file on an update 

-	 * site. An update site acts as a source of features for installation

-	 * actions.

-	 * 

-	 * @param siteURL site URL

-	 * @param usesCache <code>false</code> if the cache should be refreshed, and the site entirely reparsed, <code>false</code> otherwise.

-	 * @param monitor the progress monitor

-	 * @return site object for the url or <samp>null</samp> in case a 

-	 * user canceled the connection in the progress monitor.

-	 * @exception CoreException

-	 * @since 2.1

-	 */

-	public static ISite getSite(URL siteURL, boolean usesCache, IProgressMonitor monitor) throws CoreException {

-		return InternalSiteManager.getSite(siteURL, usesCache, monitor);

-	}

-

-

-	/**

-	 * Returns the "local site". A local site is a logical collection

-	 * of configuration information plus one or more file system 

-	 * installation directories, represented as intividual sites. 

-	 * These are potential targets for installation actions.

-	 * 

-	 * @return the local site

-	 * @exception CoreException

-	 * @since 2.0 

-	 */

-	public static ILocalSite getLocalSite() throws CoreException {

-		return InternalSiteManager.getLocalSite();

-	}

-

-	/**

-	 * Trigger handling of newly discovered features. This method

-	 * can be called by the executing application whenever it

-	 * is invoked with the -newUpdates command line argument.

-	 * 

-	 * @throws CoreException if an error occurs.

-	 * @since 2.0

-	 * @deprecated Do not use this method

-	 */

-	public static void handleNewChanges() throws CoreException {

-	}

-	/**

-	 * Returns system architecture specification. A comma-separated list of arch

-	 * designators defined by the platform. 

-	 * 

-	 * This information is used as a hint by the installation and update

-	 * support.

-	 * 

-	 * @return system architecture specification

-	 * @since 2.1

-	 */

-	public static String getOSArch() {

-		if (arch == null)

-			arch = Platform.getOSArch();

-		return arch;

-	}

-

-	/**

-	 * Returns operating system specification. A comma-separated list of os

-	 * designators defined by the platform.

-	 * 

-	 * This information is used as a hint by the installation and update

-	 * support.

-	 *

-	 * @return the operating system specification.

-	 * @since 2.1

-	 */

-	public static String getOS() {

-		if (os == null)

-			os = Platform.getOS();

-		return os;

-	}

-

-	/**

-	 * Returns system architecture specification. A comma-separated list of arch

-	 * designators defined by the platform. 

-	 * 

-	 * This information is used as a hint by the installation and update

-	 * support.

-	 * @return system architecture specification.

-	 * @since 2.1

-	 */

-	public static String getWS() {

-		if (ws == null)

-			ws = Platform.getWS();

-		return ws;

-	}

-

-	/**

-	 * Sets the arch.

-	 * @param arch The arch to set

-	 */

-	public static void setOSArch(String arch) {

-		SiteManager.arch = arch;

-	}

-

-	/**

-	 * Sets the os.

-	 * @param os The os to set

-	 */

-	public static void setOS(String os) {

-		SiteManager.os = os;

-	}

-

-	/**

-	 * Sets the ws.

-	 * @param ws The ws to set

-	 */

-	public static void setWS(String ws) {

-		SiteManager.ws = ws;

-	}

-

-	/**

-	 * Sets the nl.

-	 * @param nl The nl to set

-	 */

-	public static void setNL(String nl) {

-		SiteManager.nl = nl;

-	}

-	

-	/**

-	 * Returns an estimate of bytes per second transfer rate for this URL

-	 * @param site the URL of the site

-	 * @return long a bytes per second estimate rate

-	 * @since 2.1

- 	 */	

-	public static long getEstimatedTransferRate(URL site) {

-		if (site == null)

-			return 0;

-		return InternalSiteManager.getEstimatedTransferRate(site.getHost());

-	}

-

-	/**

-	 * Returns current locale

-	 * 

-	 * @return the string name of the current locale or <code>null</code>

-	 * @since 2.1

-	 */

-	public static String getNL() {

-		if (nl == null)

-			nl = Platform.getNL();

-		return nl;

-	}

-

-	/**

-	 * Returns the HTTP Proxy Server or <code>null</code> if none

-	 * @return the HTTP proxy Server 

-	 */

-	public static String getHttpProxyServer() {

-		return System.getProperty(P_HTTP_HOST);

-	}

-	/**

-	 * Returns the HTTP Proxy Port or <code>null</code> if none

-	 * @return the HTTP proxy Port 

-	 */

-	public static String getHttpProxyPort() {

-		return System.getProperty(P_HTTP_PORT);

-	}

-	/**

-	 * Returns <code>true</code> if the connection should use the 

-	 * http proxy server, <code>false</code> otherwise

-	 * @return is the http proxy server enable

-	 */

-	public static boolean isHttpProxyEnable() {

-		return isHttpProxyEnable;

-	}

-	/**

-	 * Sets the HTTP Proxy information

-	 * Sets the HTTP proxy server for the HTTP proxy server 

-	 * Sets the HTTP proxy port for the HTTP proxy server 

-	 * If the proxy name is <code>null</code> or the proxy port is

-	 * <code>null</code> the connection will not use HTTP proxy server.

-	 * 

-	 * @param enable <code>true</code> if the connection should use an http

-	 * proxy server, <code>false </code> otherwise.

-	 * @param httpProxyServer the HTTP proxy server name or IP adress

-	 * @param httpProxyPort the HTTP proxy port

-	 */

-	public static void setHttpProxyInfo(boolean enable, String httpProxyServer, String httpProxyPort) {

-		isHttpProxyEnable = enable;

-

-		// if enable is false, or values are null,

-		// we should remove the properties and save the fact that proxy is disable 

-		if (!enable || httpProxyServer == null || httpProxyPort == null) {

-			System.getProperties().remove(P_HTTP_HOST);

-			System.getProperties().remove(P_HTTP_PORT);

-			System.getProperties().remove(P_HTTP_PROXY);

-			//if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS)

-			UpdateCore.warn("Remove proxy server info"); //$NON-NLS-1$

-			UpdateCore.getPlugin().getPluginPreferences().setValue(UpdateCore.HTTP_PROXY_ENABLE, isHttpProxyEnable());

-			UpdateCore.getPlugin().savePluginPreferences();

-			return;

-		}

-		

-		//System.getProperties().put("proxySet", "true");

-		//System.getProperties().put("proxyHost", proxyHost);

-		//System.getProperties().put("proxyPort", proxyPort);

-		

-		System.getProperties().setProperty(P_HTTP_PROXY, enable?"true":"false"); //$NON-NLS-1$ //$NON-NLS-2$

-		System.getProperties().setProperty(P_HTTP_HOST, httpProxyServer);

-		System.getProperties().setProperty(P_HTTP_PORT, httpProxyPort);

-		//if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS)

-		UpdateCore.warn("Added proxy server info:" + httpProxyServer + ":" + httpProxyPort); //$NON-NLS-1$ //$NON-NLS-2$

-		UpdateCore.getPlugin().getPluginPreferences().setValue(UpdateCore.HTTP_PROXY_HOST, getHttpProxyServer());

-		UpdateCore.getPlugin().getPluginPreferences().setValue(UpdateCore.HTTP_PROXY_PORT, getHttpProxyPort());

-		UpdateCore.getPlugin().getPluginPreferences().setValue(UpdateCore.HTTP_PROXY_ENABLE, isHttpProxyEnable());

-		UpdateCore.getPlugin().savePluginPreferences();

-

-	}

-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
deleted file mode 100644
index 056df76..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.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.update.core;

-

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

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

-

-/**

- * Convenience implementation of an annotated URL.

- * <p>

- * This class may be instantiated or subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.IURLEntry

- * @see org.eclipse.update.core.model.URLEntryModel

- * @since 2.0

- */

-public class URLEntry extends URLEntryModel implements IURLEntry {

-

-	/**

-	 * Default constructor for annotated URL

-	 * 

-	 * @since 2.0

-	 */

-	public URLEntry() {

-		super();

-	}

-

-	/**

-	 * Returns a string representation of an annotated URL.

-	 * 

-	 * @return annotated url as String

-	 * @since 2.0

-	 */

-	public String toString() {

-		String result = "IURLEntry: "; //$NON-NLS-1$

-		String URLString =

-			(getURL() == null) ? Policy.bind("Feature.NoURL") : getURL().toExternalForm();	//$NON-NLS-1$

-		result =

-			result

-				+ ((getAnnotation() == null) ? URLString : getAnnotation() + " : " + URLString); //$NON-NLS-1$

-		return result;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
deleted file mode 100644
index 7653500..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
+++ /dev/null

@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * This class is a collection of utility functions that can be 
- * used for install processing
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
-public class Utilities {
-
-	private static Map entryMap;
-	private static final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
-	private static long tmpseed = (new Date()).getTime();
-	private static String dirRoot = null;
-
-	/**
-	 * Returns a new working directory (in temporary space). Ensures
-	 * the directory exists. Any directory levels that had to be created
-	 * are marked for deletion on exit.
-	 * 
-	 * @return working directory
-	 * @exception IOException
-	 * @since 2.0
-	 */
-	public static synchronized File createWorkingDirectory() throws IOException {
-
-		if (dirRoot == null) {
-			dirRoot = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
-			// in Linux, returns '/tmp', we must add '/'
-			if (!dirRoot.endsWith(File.separator))
-				dirRoot += File.separator;
-
-			// on Unix/Linux, the temp dir is shared by many users, so we need to ensure 
-			// that the top working directory is different for each user
-			if (!Platform.getOS().equals("win32")) { //$NON-NLS-1$
-				String home = System.getProperty("user.home"); //$NON-NLS-1$
-				home = Integer.toString(home.hashCode());
-				dirRoot += home + File.separator;
-			}
-			dirRoot += "eclipse" + File.separator + ".update" + File.separator + Long.toString(tmpseed) + File.separator; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		String tmpName = dirRoot + Long.toString(++tmpseed) + File.separator;
-
-		File tmpDir = new File(tmpName);
-		verifyPath(tmpDir, false);
-		if (!tmpDir.exists())
-			throw new FileNotFoundException(tmpName);
-		return tmpDir;
-	}
-
-	/**
-	 * Create a new working file. The file is marked for deletion on exit.
-	 * 
-	 * @see #lookupLocalFile(String)
-	 * @param tmpDir directory location for new file. Any missing directory
-	 * levels are created (and marked for deletion on exit)
-	 * @param name optional file name, or <code>null</code>. If name is not
-	 * specified, a temporary name is generated.
-	 * @return created working file
-	 * @exception IOException
-	 * @since 2.0
-	 */
-	public static synchronized File createLocalFile(File tmpDir, String name) throws IOException {
-		// create the local file
-		File temp;
-		String filePath;
-		if (name != null) {
-			// create file with specified name
-			filePath = name.replace('/', File.separatorChar);
-			if (filePath.startsWith(File.separator))
-				filePath = filePath.substring(1);
-			temp = new File(tmpDir, filePath);
-		} else {
-			// create file with temp name
-			temp = File.createTempFile("eclipse", null, tmpDir); //$NON-NLS-1$
-		}
-		temp.deleteOnExit();
-		verifyPath(temp, true);
-
-		return temp;
-	}
-
-	/**
-	 * The file is associated with a lookup key.
-	 * @param key optional lookup key, or <code>null</code>.
-	 * @param temp the local working file
-	 * @since 2.0.2
-	 */
-	public synchronized static void mapLocalFile(String key, File temp) {
-		// create file association 
-		if (key != null) {
-			if (entryMap == null)
-				entryMap = new HashMap();
-			entryMap.put(key, temp);
-		}
-	}
-
-	/**
-	 * Returns a previously cached local file (in temporary area) matching the
-	 * specified key. 
-	 * 
-	 * @param key lookup key
-	 * @return cached file, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public static synchronized File lookupLocalFile(String key) {
-		if (entryMap == null)
-			return null;
-		return (File) entryMap.get(key);
-	}
-
-	/**
-	 * Flushes all the keys from the local file map.
-	 * Reinitialize the cache.
-     *
-	 * @since 2.1
-	 */
-	public synchronized static void flushLocalFile() {
-		entryMap = null;
-	}
-
-	/**
-	 * Removes the specified key from the local file map. The file is
-	 * not actually deleted until VM termination.
-	 * 
-	 * @param key lookup key
-	 * @since 2.0
-	 */
-	public static synchronized void removeLocalFile(String key) {
-		if (entryMap != null)
-			entryMap.remove(key);
-	}
-
-	/**
-	 * Copies specified input stream to the output stream. Neither stream
-	 * is closed as part of this operation.
-	 * 
-	 * @param is input stream
-	 * @param os output stream
-	 * @param monitor progress monitor
-	 * @exception IOException
-	 * @exception InstallAbortedException
-	 * @since 2.0
-	 */
-	public static void copy(InputStream is, OutputStream os, InstallMonitor monitor) throws IOException, InstallAbortedException {
-		long offset = UpdateManagerUtils.copy(is, os, monitor, 0);
-		if (offset != -1) {
-			if (monitor.isCanceled()) {
-				String msg = Policy.bind("Feature.InstallationCancelled"); //$NON-NLS-1$
-				throw new InstallAbortedException(msg, null);
-			} else {
-				throw new IOException();
-			}
-		}
-	}
-
-	/**
-	 * Creates a CoreException from some other exception.
-	 * The type of the CoreException is <code>IStatus.ERROR</code>
-	 * If the exception passed as a parameter is also a CoreException,
-	 * the new CoreException will contain all the status of the passed
-	 * CoreException.
-	 * 
-	 * @see IStatus#ERROR
-	 * @param s exception string
-	 * @param code the code reported
-	 * @param e actual exception being reported
-	 * @return a CoreException
-	 * @since 2.0
-	 */
-	public static CoreException newCoreException(String s, int code, Throwable e) {
-		String id = UpdateCore.getPlugin().getBundle().getSymbolicName();
-
-		// check the case of a multistatus
-		IStatus status;
-		if (e instanceof FeatureDownloadException)
-			return (FeatureDownloadException)e;
-		else if (e instanceof CoreException) {
-			if (s == null)
-				s = ""; //$NON-NLS-1$
-			status = new MultiStatus(id, code, s, e);
-			IStatus childrenStatus = ((CoreException) e).getStatus();
-			((MultiStatus) status).add(childrenStatus);
-			((MultiStatus) status).addAll(childrenStatus);
-		} else {
-			StringBuffer completeString = new StringBuffer(""); //$NON-NLS-1$
-			if (s != null)
-				completeString.append(s);
-			if (e != null) {
-				completeString.append(" ["); //$NON-NLS-1$
-				String msg = e.getLocalizedMessage();
-				completeString.append(msg!=null?msg:e.toString());
-				completeString.append("]"); //$NON-NLS-1$
-			}
-			status = new Status(IStatus.ERROR, id, code, completeString.toString(), e);
-		}
-		return new CoreException(status); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a CoreException from some other exception.
-	 * The type of the CoreException is <code>IStatus.ERROR</code>
-	 * If the exceptionpassed as a parameter is also a CoreException,
-	 * the new CoreException will contain all the status of the passed
-	 * CoreException.
-	 * 
-	 * @see IStatus#ERROR
-	 * @param s exception string
-	 * @param e actual exception being reported
-	 * @return a CoreException
-	 * @since 2.0
-	 */
-	public static CoreException newCoreException(String s, Throwable e) {
-		return newCoreException(s, IStatus.OK, e);
-	}
-
-	/**
-	 * Creates a CoreException from two other CoreException
-	 * 
-	 * @param s overall exception string
-	 * @param s1 string for first detailed exception
-	 * @param s2 string for second detailed exception
-	 * @param e1 first detailed exception
-	 * @param e2 second detailed exception
-	 * @return a CoreException with multi-status
-	 * @since 2.0
-	 */
-	public static CoreException newCoreException(String s, String s1, String s2, CoreException e1, CoreException e2) {
-		String id = UpdateCore.getPlugin().getBundle().getSymbolicName();
-		if (s == null)
-			s = ""; //$NON-NLS-1$
-
-		IStatus childStatus1 = ((CoreException) e1).getStatus();
-		IStatus childStatus2 = ((CoreException) e2).getStatus();
-		int code = (childStatus1.getCode() == childStatus2.getCode()) ? childStatus1.getCode() : IStatus.OK;
-		MultiStatus multi = new MultiStatus(id, code, s, null);
-
-		multi.add(childStatus1);
-		multi.addAll(childStatus1);
-		multi.add(childStatus2);
-		multi.addAll(childStatus2);
-
-		return new CoreException(multi); //$NON-NLS-1$
-	}
-
-	/**
-	 * Formats a Date based on the default Locale 
-	 * If teh Date is <code>null</code> returns an empty String
-	 * 
-	 * @param date the Date to format
-	 * @return the formatted Date as a String
-	 * @since 2.0
-	 */
-	public static String format(Date date) {
-		if (date == null)
-			return ""; //$NON-NLS-1$
-		return dateFormat.format(date);
-	}
-
-	/**
-	 * Perform shutdown processing for temporary file handling.
-	 * This method is called when platform is shutting down.
-	 * It is not intended to be called at any other time under
-	 * normal circumstances. A side-effect of calling this method
-	 * is that the contents of the temporary directory managed 
-	 * by this class are deleted. 
-	 * 
-	 * @since 2.0
-	 */
-	public static void shutdown() {
-		if (dirRoot == null)
-			return;
-
-		File temp = new File(dirRoot); // temp directory root for this run
-		cleanupTemp(temp);
-		temp.delete();
-	}
-
-	private static void cleanupTemp(File root) {
-		File[] files = root.listFiles();
-		for (int i = 0; files != null && i < files.length; i++) {
-			if (files[i].isDirectory())
-				cleanupTemp(files[i]);
-			files[i].delete();
-		}
-	}
-
-	private static void verifyPath(File path, boolean isFile) {
-		// if we are expecting a file back off 1 path element
-		if (isFile) {
-			if (path.getAbsolutePath().endsWith(File.separator)) {
-				// make sure this is a file
-				path = path.getParentFile();
-				isFile = false;
-			}
-		}
-
-		// already exists ... just return
-		if (path.exists())
-			return;
-
-		// does not exist ... ensure parent exists
-		File parent = path.getParentFile();
-		verifyPath(parent, false);
-
-		// ensure directories are made. Mark files or directories for deletion
-		if (!isFile)
-			path.mkdir();
-		path.deleteOnExit();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
deleted file mode 100644
index d014468..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.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.core;
- 
-import org.eclipse.core.runtime.*;
-
-/**
- * Convenience implementation of a verifier.
- * <p>
- * This class may be subclassed by clients.
- * </p> 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IVerifier
- * @since 2.0
- */
-public abstract class Verifier implements IVerifier {
-	
-	private IVerifier parent;
-
-	/**
-	 * @see IVerifier#verify(IFeature, ContentReference, boolean, InstallMonitor)
-	 */
-	public abstract IVerificationResult verify(
-		IFeature feature,
-		ContentReference reference,
-		boolean isFeatureVerification,
-		InstallMonitor monitor)
-		throws CoreException ;
-
-	/**
-	 * @see IVerifier#verify(IFeature, ContentReference, boolean, InstallMonitor)
-	 */
-	public void setParent(IVerifier parentVerifier){
-		if (this.parent==null){
-			this.parent = parentVerifier;
-		}
-	}
-	
-	/**
-	 * Returns the parent verifier
-	 * 
-	 * @return the parent verifier
-	 * @since 2.0
-	 */
-	public IVerifier getParent(){
-		return parent;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
deleted file mode 100644
index be2d713..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

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

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

-

-/**

- * Versioned Identifier. This is a utility class combining an identification

- * string with a version.

- * <p>

- * Clients may instantiate; not intended to be subclassed by clients.

- * </p> 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.core.runtime.PluginVersionIdentifier

- * @since 2.0

- */

-public class VersionedIdentifier {

-	private String id;

-	private PluginVersionIdentifier version;

-	private static final String SEPARATOR = "_"; //$NON-NLS-1$

-

-	/**

-	 * Construct a versioned identifier from an identifier and a string

-	 * representation of a version

-	 * 

-	 * @see org.eclipse.core.runtime.PluginVersionIdentifier#toString()

-	 * @param id identifier string

-	 * @param versionName string representation of version

-	 * @since 2.0

-	 */

-	public VersionedIdentifier(String id, String versionName) {

-		if (id == null	|| (id = id.trim()).equals("")) //$NON-NLS-1$

-			throw new IllegalArgumentException(

-				Policy.bind("VersionedIdentifier.IdOrVersionNull", id, versionName)); //$NON-NLS-1$

-		this.id = id;

-		// 15707

-		if (versionName != null){

-			// if (PluginVersionIdentifier.validateVersionIdentifier(versionName).isOk())

-			try {

-				this.version = new PluginVersionIdentifier(versionName);

-			} catch (RuntimeException e){

-				UpdateCore.warn("Invalid Version:"+versionName,e); //$NON-NLS-1$

-			}

-		}

-		if (this.version==null)

-			version = new PluginVersionIdentifier(0, 0, 0);

-	}

-

-	/**

-	 * Returns the identifier

-	 * 

-	 * @return identifier

-	 * @since 2.0

-	 */

-	public String getIdentifier() {

-		return id;

-	}

-

-	/**

-	 * Returns the version

-	 * 

-	 * @return version

-	 * @since 2.0

-	 */

-	public PluginVersionIdentifier getVersion() {

-		return version;

-	}

-

-	/**

-	 * Returns a string representation of the versioned identifier.

-	 * 

-	 * @return string representation of versioned identifier. The resulting 

-	 * string is <id>_<version>, where <id> is the identifier and 

-	 * <version> is the string representation of the version

-	 * @since 2.0

-	 */

-	public String toString() {

-		return id.equals("") ? "" : id + SEPARATOR + version.toString(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * Compares two versioned identifiers for equality

-	 * 

-	 * @param obj other versioned identifier to compare to

-	 * @return <code>true</code> if the two objects are equal, 

-	 * <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public boolean equals(Object obj) {

-		if (!(obj instanceof VersionedIdentifier))

-			return false;

-		VersionedIdentifier vid = (VersionedIdentifier) obj;

-		if (!this.id.equals(vid.id))

-			return false;

-		return this.version.equals(vid.version);

-	}

-

-	/**

-	 * Returns a computed hashcode for the versioned identifier.

-	 * 

-	 * @return hash code

-	 * @since 2.0

-	 */

-	public int hashCode() {

-		return toString().hashCode();

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
deleted file mode 100644
index e8d9aa8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.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.update.core.model;

-

-import java.net.*;

-

-/**

- * Site archive model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.ArchiveReference

- * @since 2.0

- */

-public class ArchiveReferenceModel extends ModelObject {

-

-	private String path;

-	private String urlString;

-	private URL url;

-

-	/**

-	 * Creates a uninitialized model object.

-	 *  

-	 * @since 2.0

-	 */

-	public ArchiveReferenceModel() {

-		super();

-	}

-

-	/**

-	 * Retrieve the site archive "symbolic" path

-	 *

-	 * @return path, or <code>null</code>

-	 * @since 2.0

-	 */

-	public String getPath() {

-		return path;

-	}

-

-	/**

-	 * Returns the unresolved URL string for the archive.

-	 *

-	 * @return url string, or <code>null</code>

-	 * @since 2.0

-	 */

-	public String getURLString() {

-		return urlString;

-	}

-

-	/**

-	 * Returns the resolved URL for the archive.

-	 * 

-	 * @return url, or <code>null</code>

-	 * @since 2.0

-	 */

-	public URL getURL() {

-		return url;

-	}

-

-	/**

-	 * Sets the site archive "symbolic" path.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param path archive "symbolic" path.

-	 * @since 2.0

-	 */

-	public void setPath(String path) {

-		assertIsWriteable();

-		this.path = path;

-	}

-

-	/**

-	 * Sets the unresolved URL string for the archive.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param urlString unresolved url string.

-	 * @since 2.0

-	 */

-	public void setURLString(String urlString) {

-		assertIsWriteable();

-		this.urlString = urlString;

-		this.url = null;

-	}

-

-	/**

-	 * Resolve the model object.

-	 * Any URL strings in the model are resolved relative to the 

-	 * base URL argument. Any translatable strings in the model that are

-	 * specified as translation keys are localized using the supplied 

-	 * resource bundle.

-	 * 

-	 * @param base URL

-	 * @param bundleURL resource bundle URL

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	public void resolve(URL base,URL bundleURL)

-		throws MalformedURLException {

-		// resolve local elements

-		url = resolveURL(base, bundleURL, urlString);

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
deleted file mode 100644
index 4c6fdef..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.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.core.model;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.update.core.*;
-
-/**
- * Feature category definition model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most 
- * cases clients should instead instantiate or subclass the provided 
- * concrete implementation of this model.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.Category
- * @since 2.0
- */
-
-public class CategoryModel extends ModelObject {
-
-	private String name;
-	private String label;
-	private String localizedLabel;
-	private URLEntryModel description;
-	private static Comparator comp;
-
-	/**
-	 * Creates an uninitialized model object.
-	 * 
-	 * @since 2.0
-	 */
-	public CategoryModel() {
-		super();
-	}
-
-	/**
-	 * Retrieve the name of the category.
-	 * 
-	 * @return category name, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Retrieve the displayable label for the category. If the model
-	 * object has been resolved, the label is localized.
-	 * 
-	 * @return displayable label, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getLabel() {
-		if (localizedLabel != null)
-			return localizedLabel;
-		else
-			return label;
-	}
-
-	/**
-	 * Retrieve the non-localized displayable label for the category.
-	 * 
-	 * @return non-localized displayable label, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getLabelNonLocalized() {
-		return label;
-	}
-
-	/**
-	 * Retrieve the detailed category description
-	 * 
-	 * @return category description, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public URLEntryModel getDescriptionModel() {
-		return description;
-	}
-
-	/**
-	 * Sets the category displayable label.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param label displayable label, or resource key
-	 * @since 2.0
-	 */
-	public void setLabel(String label) {
-		assertIsWriteable();
-		this.label = label;
-		this.localizedLabel = null;
-	}
-
-	/**
-	 * Sets the category name.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param name category name
-	 * @since 2.0
-	 */
-	public void setName(String name) {
-		assertIsWriteable();
-		this.name = name;
-	}
-
-	/**
-	 * Sets the category description.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param description category description
-	 * @since 2.0
-	 */
-	public void setDescriptionModel(URLEntryModel description) {
-		assertIsWriteable();
-		this.description = description;
-	}
-
-	/**
-	 * Marks the model object as read-only.
-	 * 
-	 * @since 2.0
-	 */
-	public void markReadOnly() {
-		super.markReadOnly();
-		markReferenceReadOnly(getDescriptionModel());
-	}
-
-	/**
-	 * Resolve the model object.
-	 * Any URL strings in the model are resolved relative to the 
-	 * base URL argument. Any translatable strings in the model that are
-	 * specified as translation keys are localized using the supplied 
-	 * resource bundle.
-	 * 
-	 * @param base URL
-	 * @param bundleURL resource bundle URL
-	 * @exception MalformedURLException
-	 * @since 2.0
-	 */
-	public void resolve(URL base,URL bundleURL)
-		throws MalformedURLException {
-		// resolve local elements
-		localizedLabel = resolveNLString(bundleURL, label);
-
-		// delegate to references
-		resolveReference(getDescriptionModel(),base, bundleURL);
-	}
-
-	/**
-	 * Compare two category models for equality.
-	 * 
-	 * @see Object#equals(Object)
-	 * @since 2.0
-	 */
-	public boolean equals(Object obj) {
-		boolean result = false;
-		if (obj instanceof CategoryModel) {
-			CategoryModel otherCategory = (CategoryModel) obj;
-			result = getName().equalsIgnoreCase(otherCategory.getName());
-		}
-		return result;
-	}
-
-	/**
-	 * Compute hash code for category model.
-	 * 
-	 * @see Object#hashCode()
-	 * @since 2.0
-	 */
-	public int hashCode() {
-		return getName().hashCode();
-	}
-
-	/**
-	 * Returns a comparator for category models.
-	 * 
-	 * @return comparator
-	 * @since 2.0
-	 */
-	public static Comparator getComparator() {
-		if (comp == null) {
-			comp = new Comparator() {
-				/*
-				 * @see Comparator#compare(Object,Object)
-				 * Returns 0 if versions are equal.
-				 * Returns -1 if object1 is after than object2.
-				 * Returns +1 if object1 is before than object2.
-				 */
-				public int compare(Object o1, Object o2) {
-
-					CategoryModel cat1 = (CategoryModel) o1;
-					CategoryModel cat2 = (CategoryModel) o2;
-
-					if (cat1.equals(cat2))
-						return 0;
-					return cat1.getName().compareTo(cat2.getName());
-				}
-			};
-		}
-		return comp;
-	}
-	
-	/**
-	 * @see org.eclipse.update.core.model.ModelObject#getPropertyName()
-	 */
-	protected String getPropertyName() {
-		return Site.SITE_FILE;
-	}	
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
deleted file mode 100644
index 42b0961..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
+++ /dev/null

@@ -1,196 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-

-/**

- * Content entry model object.

- * This is the base class for plug-in and non-plug-in entry models.

- * <p>

- * This class must be subclassed by clients. 

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.model.PluginEntryModel

- * @see org.eclipse.update.core.model.NonPluginEntryModel

- * @since 2.0

- */

-public abstract class ContentEntryModel extends ModelObject {

-

-	/**

-	 * An indication the size could not be determined

-	 * 

-	 * @since 2.0

-	 */

-	public static final long UNKNOWN_SIZE = -1;

-

-	private long downloadSize = UNKNOWN_SIZE;

-	private long installSize = UNKNOWN_SIZE;

-	private String os;

-	private String ws;

-	private String nl;

-	private String arch;

-

-	/**

-	 * Creates a uninitialized content entry model object.

-	 * 

-	 * @since 2.0

-	 */

-	protected ContentEntryModel() {

-		super();

-	}

-

-	/**

-	 * Returns the download size of the entry, if it can be determined.

-	 * 

-	 * @return download size of the entry in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0 

-	 */

-

-	public long getDownloadSize() {

-		return downloadSize;

-	}

-

-	/**

-	 * Returns the install size of the entry, if it can be determined.

-	 * 

-	 * @return install size of the entry in KiloBytes, or an indication 

-	 * the size could not be determined

-	 * @since 2.0

-	 */

-	public long getInstallSize() {

-		return installSize;

-	}

-

-	/**

-	 * Returns optional operating system specification.

-	 *

-	 * @return the operating system specification or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public String getOS() {

-		return os;

-	}

-

-	/**

-	 * Returns optional windowing system specification.

-	 *

-	 * @return the windowing system specification or <code>null</code>.

-	 * @since 2.0 

-	 */

-

-	public String getWS() {

-		return ws;

-	}

-

-	/**

-	 * Returns optional system architecture specification. 

-	 * 

-	 * @return the system architecture specification or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public String getOSArch() {

-		return arch;

-	}

-

-	/**

-	 * Returns optional locale specification.

-	 *

-	 * @return the locale specification, or <code>null</code>.

-	 * @since 2.0 

-	 */

-	public String getNL() {

-		return nl;

-	}

-

-	/**

-	 * Sets the download size of the entry.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param downloadSize download size of the entry in KiloBytes

-	 * @since 2.0 

-	 */

-	public void setDownloadSize(long downloadSize) {

-		assertIsWriteable();

-		if (downloadSize < 0)

-			this.downloadSize = UNKNOWN_SIZE;

-		else

-			this.downloadSize = downloadSize;

-	}

-

-	/**

-	 * Sets the install size of the entry.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param installSize install size of the entry in KiloBytes

-	 * @since 2.0

-	 */

-	public void setInstallSize(long installSize) {

-		assertIsWriteable();

-		if (installSize < 0)

-			this.installSize = UNKNOWN_SIZE;

-		else

-			this.installSize = installSize;

-	}

-

-	/**

-	 * Sets the operating system specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param os comma-separated list of OS identifiers as defined by Eclipse.

-	 * @since 2.0

-	 */

-	public void setOS(String os) {

-		assertIsWriteable();

-		this.os = os;

-	}

-

-	/**

-	 * Sets the windowing system specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param ws comma-separated list of WS identifiers as defined by Eclipse.

-	 * @since 2.0

-	 */

-	public void setWS(String ws) {

-		assertIsWriteable();

-		this.ws = ws;

-	}

-

-	/**

-	 * Sets the system architecture specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param arch comma-separated list of arch identifiers as defined by Eclipse.

-	 * @since 2.0

-	 */

-	public void setArch(String arch) {

-		assertIsWriteable();

-		this.arch = arch;

-	}

-

-	/**

-	 * Sets the locale specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param nl comma-separated list of locale identifiers.

-	 * @since 2.0

-	 */

-	public void setNL(String nl) {

-		assertIsWriteable();

-		this.nl = nl;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
deleted file mode 100644
index 324e114..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
+++ /dev/null

@@ -1,1199 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-

-import java.io.*;

-import java.util.*;

-import javax.xml.parsers.*;

-

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

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

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

-import org.xml.sax.*;

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

-

-/**

- * Default feature parser.

- * Parses the feature manifest file as defined by the platform. Defers

- * to a model factory to create the actual concrete model objects. The 

- * update framework supplies two factory implementations:

- * <ul>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * <li>@see org.eclipse.update.core.model.FeatureModelFactory

- * <li>@see org.eclipse.update.core.BaseFeatureFactory

- * </ul>

- * 

- * @since 2.0

- */

-public class DefaultFeatureParser extends DefaultHandler {

-

-	private SAXParser parser;

-	private FeatureModelFactory factory;

-	private MultiStatus status;

-

-	private boolean URL_ALREADY_SEEN = false;

-

-	private static final int STATE_IGNORED_ELEMENT = -1;

-	private static final int STATE_INITIAL = 0;

-	private static final int STATE_INCLUDES = 1;

-	private static final int STATE_FEATURE = 2;

-	private static final int STATE_HANDLER = 3;

-	private static final int STATE_DESCRIPTION = 4;

-	private static final int STATE_COPYRIGHT = 5;

-	private static final int STATE_LICENSE = 6;

-	private static final int STATE_URL = 7;

-	private static final int STATE_UPDATE = 8;

-	private static final int STATE_DISCOVERY = 9;

-	private static final int STATE_REQUIRES = 10;

-	private static final int STATE_IMPORT = 11;

-	private static final int STATE_PLUGIN = 12;

-	private static final int STATE_DATA = 13;

-	private static final String PLUGIN_ID = UpdateCore.getPlugin().getBundle().getSymbolicName();

-

-	private static final String FEATURE = "feature"; //$NON-NLS-1$

-	private static final String INCLUDES = "includes"; //$NON-NLS-1$

-	private static final String HANDLER = "install-handler"; //$NON-NLS-1$

-	private static final String DESCRIPTION = "description"; //$NON-NLS-1$

-	private static final String COPYRIGHT = "copyright"; //$NON-NLS-1$

-	private static final String LICENSE = "license"; //$NON-NLS-1$

-	private static final String URL = "url"; //$NON-NLS-1$

-	private static final String UPDATE = "update"; //$NON-NLS-1$

-	private static final String DISCOVERY = "discovery"; //$NON-NLS-1$

-	private static final String REQUIRES = "requires"; //$NON-NLS-1$

-	private static final String IMPORT = "import"; //$NON-NLS-1$

-	private static final String PLUGIN = "plugin"; //$NON-NLS-1$

-	private static final String DATA = "data"; //$NON-NLS-1$

-	// Current State Information

-	Stack stateStack = new Stack();

-

-	// Current object stack (used to hold the current object we are

-	// populating in this plugin descriptor

-	Stack objectStack = new Stack();

-

-	private int currentState;

-	

-	private final static SAXParserFactory parserFactory =

-		SAXParserFactory.newInstance();

-

-	/**

-	 * Constructs a feature parser.

-	 * 

-	 * @since 2.0

-	 */

-	public DefaultFeatureParser() {

-		super();

-		try {

-			parserFactory.setNamespaceAware(true);

-			this.parser = parserFactory.newSAXParser();

-		} catch (ParserConfigurationException e) {

-			UpdateCore.log(e);

-		} catch (SAXException e) {

-			UpdateCore.log(e);

-		}

-	}

-

-	public void init(FeatureModelFactory factory) {

-		// PERF: separate instance creation from parsing

-		this.factory = factory;

-		stateStack = new Stack();

-		objectStack = new Stack();

-		status = null;

-		URL_ALREADY_SEEN = false;

-		//parser.reset();

-	}

-

-	/**

-	 * Parses the specified input steam and constructs a feature model.

-	 * The input stream is not closed as part of this operation.

-	 * 

-	 * @param in input stream

-	 * @return feature model

-	 * @exception SAXException

-	 * @exception IOException

-	 * @since 2.0

-	 */

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

-		stateStack.push(new Integer(STATE_INITIAL));

-		currentState = ((Integer) stateStack.peek()).intValue();

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

-		if (objectStack.isEmpty())

-			throw new SAXException(Policy.bind("DefaultFeatureParser.NoFeatureTag")); //$NON-NLS-1$

-		else {

-			if (objectStack.peek() instanceof FeatureModel) {

-				return (FeatureModel) objectStack.pop();

-			} else {

-				String stack = ""; //$NON-NLS-1$

-				Iterator iter = objectStack.iterator();

-				while (iter.hasNext()) {

-					stack = "\r\n" + iter.next().toString() + stack; //$NON-NLS-1$

-				}

-				throw new SAXException(Policy.bind("DefaultFeatureParser.WrongParsingStack", stack));//$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * Returns all status objects accumulated by the parser.

-	 *

-	 * @return multi-status containing accumulated status, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public MultiStatus getStatus() {

-		return status;

-	}

-

-	/**

-	 * Handle start of element tags

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

-	 * @since 2.0

-	 */

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

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-		switch (currentState) {

-			case STATE_IGNORED_ELEMENT :

-				internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", localName, getState(currentState)));	//$NON-NLS-1$

-				break;

-

-			case STATE_INITIAL :

-				handleInitialState(localName, attributes);

-				break;

-

-			case STATE_FEATURE :

-			case STATE_INCLUDES :

-			case STATE_HANDLER :

-			case STATE_DESCRIPTION :

-			case STATE_COPYRIGHT :

-			case STATE_LICENSE :

-				handleFeatureState(localName, attributes);

-				break;

-

-			case STATE_URL :

-				if (URL_ALREADY_SEEN)

-					internalError(Policy.bind("DefaultFeatureParser.TooManyURLtag")); //$NON-NLS-1$

-				handleURLState(localName, attributes);

-				break;

-

-			case STATE_UPDATE :

-			case STATE_DISCOVERY :

-				handleUpdateDiscoveryState(localName, attributes);

-				break;

-

-			case STATE_REQUIRES :

-				handleRequiresState(localName, attributes);

-				break;

-

-			case STATE_IMPORT :

-				handleImportState(localName,attributes);

-				break;

-				

-			case STATE_PLUGIN :

-			case STATE_DATA :

-				handleFeatureState(localName, attributes);

-				break;

-

-			default :

-				internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownStartState", Integer.toString(currentState)));	//$NON-NLS-1$

-				break;

-		}

-

-		int newState = ((Integer) stateStack.peek()).intValue();

-		if (newState != STATE_IGNORED_ELEMENT)

-			currentState = newState;

-

-	}

-

-	/**

-	 * Handle end of element tags

-	 * @see DefaultHandler#endElement(String, String, String)

-	 * @since 2.0

-	 */

-	public void endElement(String uri, String localName, String qName) {

-

-		// variables used

-		URLEntryModel info = null;

-		FeatureModel featureModel = null;

-		String text = null;

-		int innerState = 0;

-

-		int state = ((Integer) stateStack.peek()).intValue();

-		switch (state) {

-			case STATE_IGNORED_ELEMENT :

-				stateStack.pop();

-				break;

-

-			case STATE_INITIAL :

-				internalError(Policy.bind("DefaultFeatureParser.ParsingStackBackToInitialState")); //$NON-NLS-1$

-				break;

-

-			case STATE_FEATURE :

-				stateStack.pop();

-				if (objectStack.peek() instanceof String) {

-					text = (String) objectStack.pop();

-					FeatureModel feature = (FeatureModel) objectStack.peek();

-					feature.getDescriptionModel().setAnnotation(text);

-				}

-				//do not pop

-				break;

-

-			case STATE_INCLUDES :

-				stateStack.pop();

-				if (objectStack.peek() instanceof IncludedFeatureReferenceModel) {

-					IncludedFeatureReferenceModel includedFeatureRefModel = ((IncludedFeatureReferenceModel) objectStack.pop());

-					if (objectStack.peek() instanceof FeatureModel) {

-						featureModel = (FeatureModel) objectStack.peek();

-						featureModel.addIncludedFeatureReferenceModel(includedFeatureRefModel);

-					}

-				}

-				break;

-

-			case STATE_HANDLER :

-				stateStack.pop();

-				if (objectStack.peek() instanceof InstallHandlerEntryModel) {

-					InstallHandlerEntryModel handlerModel = (InstallHandlerEntryModel) objectStack.pop();

-					featureModel = (FeatureModel) objectStack.peek();

-					if (featureModel.getInstallHandlerModel() != null)

-						internalError(Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state))); //$NON-NLS-1$

-					else

-						featureModel.setInstallHandlerModel(handlerModel);

-				}

-				break;

-

-			case STATE_DESCRIPTION :

-				stateStack.pop();

-

-				text = ""; //$NON-NLS-1$

-				while (objectStack.peek() instanceof String) {

-					text = (String) objectStack.pop() + text;

-				}

-				if (objectStack.peek() instanceof URLEntryModel) {

-					info = (URLEntryModel) objectStack.pop();

-					text = cleanupText(text);

-					if (text != null)

-						info.setAnnotation(text);

-

-					innerState = ((Integer) stateStack.peek()).intValue();

-					switch (innerState) {

-						case STATE_FEATURE :

-							if (objectStack.peek() instanceof FeatureModel) {

-								featureModel = (FeatureModel) objectStack.peek();

-								if (featureModel.getDescriptionModel() != null)

-									internalError(Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));	//$NON-NLS-1$

-								else

-									featureModel.setDescriptionModel(info);

-							}

-							break;

-

-						default :

-							internalError(Policy.bind("DefaultFeatureParser.StateIncludeWrongElement", getState(innerState), getState(state)));	//$NON-NLS-1$

-							break;

-

-					}

-				}

-				break;

-

-			case STATE_COPYRIGHT :

-				stateStack.pop();

-				text = ""; //$NON-NLS-1$

-				while (objectStack.peek() instanceof String) {

-					text = (String) objectStack.pop() + text;

-				}

-				if (objectStack.peek() instanceof URLEntryModel) {

-					info = (URLEntryModel) objectStack.pop();

-					text = cleanupText(text);

-					if (text != null) {

-						info.setAnnotation(text);

-					}

-

-					innerState = ((Integer) stateStack.peek()).intValue();

-					switch (innerState) {

-						case STATE_FEATURE :

-							if (objectStack.peek() instanceof FeatureModel) {

-								featureModel = (FeatureModel) objectStack.peek();

-								if (featureModel.getCopyrightModel() != null)

-									internalError(Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));//$NON-NLS-1$

-								else

-									featureModel.setCopyrightModel(info);

-							}

-							break;

-

-						default :

-							internalError(Policy.bind("DefaultFeatureParser.StateIncludeWrongElement", getState(innerState), getState(state)));	//$NON-NLS-1$

-							break;

-

-					}

-				}

-				break;

-

-			case STATE_LICENSE :

-				stateStack.pop();

-

-				text = ""; //$NON-NLS-1$

-				while (objectStack.peek() instanceof String) {

-					text = (String) objectStack.pop() + text;

-				}

-				if (objectStack.peek() instanceof URLEntryModel) {

-					info = (URLEntryModel) objectStack.pop();

-					text = cleanupText(text);

-					if (text != null) {

-						info.setAnnotation(text);

-					}

-

-					innerState = ((Integer) stateStack.peek()).intValue();

-					switch (innerState) {

-						case STATE_FEATURE :

-							if (objectStack.peek() instanceof FeatureModel) {

-								featureModel = (FeatureModel) objectStack.peek();

-								if (featureModel.getLicenseModel() != null)

-									internalError(Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));	//$NON-NLS-1$

-								else

-									featureModel.setLicenseModel(info);

-							}

-							break;

-

-						default :

-							internalError(Policy.bind("DefaultFeatureParser.StateIncludeWrongElement", getState(innerState), getState(state)));	//$NON-NLS-1$

-							break;

-

-					}

-				}

-				break;

-

-			case STATE_URL :

-				stateStack.pop();

-				URL_ALREADY_SEEN = true;

-				break;

-

-			case STATE_UPDATE :

-				stateStack.pop();

-				if (objectStack.peek() instanceof URLEntryModel) {

-					info = (URLEntryModel) objectStack.pop();

-					if (objectStack.peek() instanceof FeatureModel) {

-						featureModel = (FeatureModel) objectStack.peek();

-						if (featureModel.getUpdateSiteEntryModel() != null) {

-							internalError(Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));	//$NON-NLS-1$

-						} else {

-							featureModel.setUpdateSiteEntryModel(info);

-						}

-					}

-				}

-				break;

-

-			case STATE_DISCOVERY :

-				stateStack.pop();

-				if (objectStack.peek() instanceof URLEntryModel) {

-					info = (URLEntryModel) objectStack.pop();

-					if (objectStack.peek() instanceof FeatureModel) {

-						featureModel = (FeatureModel) objectStack.peek();

-						featureModel.addDiscoverySiteEntryModel(info);

-					}

-				}

-				break;

-

-			case STATE_REQUIRES :

-				stateStack.pop();

-				if (objectStack.peek() instanceof FeatureModel) {

-					featureModel = (FeatureModel) objectStack.peek();

-					ImportModel[] importModels = featureModel.getImportModels();

-					if (importModels.length == 0) {

-						internalError(Policy.bind("DefaultFeatureParser.RequireStateWithoutImportElement")); //$NON-NLS-1$

-					} else {

-						boolean patchMode = false;

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

-							ImportModel importModel = importModels[i];

-							if (importModel.isPatch()) {

-								if (patchMode == false)

-									patchMode = true;

-								else {

-									internalError(Policy.bind("DefaultFeatureParser.MultiplePatchImports")); //$NON-NLS-1$

-									break;

-								}

-							}

-						}

-					}

-				}

-				break;

-

-			case STATE_IMPORT :

-				stateStack.pop();

-				if (objectStack.peek() instanceof ImportModel) {

-					ImportModel importModel = (ImportModel) objectStack.pop();

-					if (objectStack.peek() instanceof FeatureModel) {

-						featureModel = (FeatureModel) objectStack.peek();

-						featureModel.addImportModel(importModel);

-					}

-				}

-				break;

-

-			case STATE_PLUGIN :

-				stateStack.pop();

-				if (objectStack.peek() instanceof PluginEntryModel) {

-					PluginEntryModel pluginEntry = (PluginEntryModel) objectStack.pop();

-					if (objectStack.peek() instanceof FeatureModel) {

-						featureModel = (FeatureModel) objectStack.peek();

-						featureModel.addPluginEntryModel(pluginEntry);

-					}

-				}

-				break;

-

-			case STATE_DATA :

-				stateStack.pop();

-				if (objectStack.peek() instanceof NonPluginEntryModel) {

-					NonPluginEntryModel nonPluginEntry = (NonPluginEntryModel) objectStack.pop();

-					if (objectStack.peek() instanceof FeatureModel) {

-						featureModel = (FeatureModel) objectStack.peek();

-						featureModel.addNonPluginEntryModel(nonPluginEntry);

-					}

-				}

-				break;

-

-			default :

-				internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownEndState") + state);//$NON-NLS-1$

-				break;

-		}

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End Element:" + uri + ":" + localName + ":" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-	}

-	

-	/*

-	 * Method cleanupText.

-	 * Removes pre white space and post white space

-	 * return null if the text only contains whitespaces (\t \r\n and spaces)

-	 * 

-	 * @param text or null

-	 * @return String

-	 */

-	private String cleanupText(String text) {

-		text = text.trim();

-		if ("".equals(text)) return null; //$NON-NLS-1$

-		return text;

-	}

-

-	/**

-	 * Handle character text

-	 * @see DefaultHandler#characters(char[], int, int)

-	 * @since 2.0

-	 */

-	public void characters(char[] ch, int start, int length) {

-		String text = ""; //$NON-NLS-1$

-		boolean valid = true;

-

-		if (valid) {

-			text = new String(ch, start, length);

-		}

-

-		//only push if not unknown state

-		int state = ((Integer) stateStack.peek()).intValue();

-		if (state == STATE_DESCRIPTION || state == STATE_COPYRIGHT || state == STATE_LICENSE)

-			objectStack.push(text);

-	}

-

-	/**

-	 * Handle errors

-	 * @see DefaultHandler#error(SAXParseException)

-	 * @since 2.0

-	 */

-	public void error(SAXParseException ex) {

-		logStatus(ex);

-	}

-

-	/**

-	 * Handle fatal errors

-	 * @see DefaultHandler#fatalError(SAXParseException)

-	 * @exception SAXException

-	 * @since 2.0

-	 */

-	public void fatalError(SAXParseException ex) throws SAXException {

-		logStatus(ex);

-		throw ex;

-	}

-

-	private void handleInitialState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(FEATURE)) {

-			stateStack.push(new Integer(STATE_FEATURE));

-			processFeature(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", elementName, getState(currentState)));//$NON-NLS-1$

-	}

-

-	private void handleFeatureState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(HANDLER)) {

-			stateStack.push(new Integer(STATE_HANDLER));

-			processHandler(attributes);

-		} else if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION));

-			processInfo(attributes);

-		} else if (elementName.equals(COPYRIGHT)) {

-			stateStack.push(new Integer(STATE_COPYRIGHT));

-			processInfo(attributes);

-		} else if (elementName.equals(LICENSE)) {

-			stateStack.push(new Integer(STATE_LICENSE));

-			processInfo(attributes);

-		} else if (elementName.equals(URL)) {

-			stateStack.push(new Integer(STATE_URL));

-			//No process as URL tag does not contain any element itself

-		} else if (elementName.equals(INCLUDES)) {

-			stateStack.push(new Integer(STATE_INCLUDES));

-			processIncludes(attributes);

-		} else if (elementName.equals(REQUIRES)) {

-			stateStack.push(new Integer(STATE_REQUIRES));

-			processRequire(attributes);

-		} else if (elementName.equals(PLUGIN)) {

-			stateStack.push(new Integer(STATE_PLUGIN));

-			processPlugin(attributes);

-		} else if (elementName.equals(DATA)) {

-			stateStack.push(new Integer(STATE_DATA));

-			processData(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$

-	}

-

-	private void handleURLState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(UPDATE)) {

-			stateStack.push(new Integer(STATE_UPDATE));

-			processURLInfo(attributes);

-		} else if (elementName.equals(DISCOVERY)) {

-			stateStack.push(new Integer(STATE_DISCOVERY));

-			processURLInfo(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$

-	}

-

-	private void handleRequiresState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(IMPORT)) {

-			stateStack.push(new Integer(STATE_IMPORT));

-			processImport(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$

-	}

-	private void handleUpdateDiscoveryState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(HANDLER)) {

-			stateStack.push(new Integer(STATE_HANDLER));

-			processHandler(attributes);

-		} else if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION));

-			processInfo(attributes);

-		} else if (elementName.equals(COPYRIGHT)) {

-			stateStack.push(new Integer(STATE_COPYRIGHT));

-			processInfo(attributes);

-		} else if (elementName.equals(LICENSE)) {

-			stateStack.push(new Integer(STATE_LICENSE));

-			processInfo(attributes);

-		} else if (elementName.equals(URL)) {

-			stateStack.push(new Integer(STATE_URL));

-			//No process as URL tag does not contain any element itself

-		} else if (elementName.equals(INCLUDES)) {

-			stateStack.push(new Integer(STATE_INCLUDES));

-			processIncludes(attributes);

-		} else if (elementName.equals(REQUIRES)) {

-			stateStack.push(new Integer(STATE_REQUIRES));

-			processRequire(attributes);

-		} else if (elementName.equals(PLUGIN)) {

-			stateStack.push(new Integer(STATE_PLUGIN));

-			processPlugin(attributes);

-		} else if (elementName.equals(DATA)) {

-			stateStack.push(new Integer(STATE_DATA));

-			processData(attributes);

-		} else if (elementName.equals(UPDATE)) {

-			stateStack.push(new Integer(STATE_UPDATE));

-			processURLInfo(attributes);

-		} else if (elementName.equals(DISCOVERY)) {

-			stateStack.push(new Integer(STATE_DISCOVERY));

-			processURLInfo(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$

-	}

-

-

-

-	private void handleImportState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(HANDLER)) {

-			stateStack.push(new Integer(STATE_HANDLER));

-			processHandler(attributes);

-		} else if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION));

-			processInfo(attributes);

-		} else if (elementName.equals(COPYRIGHT)) {

-			stateStack.push(new Integer(STATE_COPYRIGHT));

-			processInfo(attributes);

-		} else if (elementName.equals(LICENSE)) {

-			stateStack.push(new Integer(STATE_LICENSE));

-			processInfo(attributes);

-		} else if (elementName.equals(URL)) {

-			stateStack.push(new Integer(STATE_URL));

-			//No process as URL tag does not contain any element itself

-		} else if (elementName.equals(INCLUDES)) {

-			stateStack.push(new Integer(STATE_INCLUDES));

-			processIncludes(attributes);

-		} else if (elementName.equals(REQUIRES)) {

-			stateStack.push(new Integer(STATE_REQUIRES));

-			processRequire(attributes);

-		} else if (elementName.equals(PLUGIN)) {

-			stateStack.push(new Integer(STATE_PLUGIN));

-			processPlugin(attributes);

-		} else if (elementName.equals(DATA)) {

-			stateStack.push(new Integer(STATE_DATA));

-			processData(attributes);

-		} else if (elementName.equals(IMPORT)) {

-			stateStack.push(new Integer(STATE_IMPORT));

-			processImport(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultFeatureParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$

-	}

-

-	/*

-	 * Process feature information

-	 */

-	private void processFeature(Attributes attributes) {

-

-		// identifier and version

-		String id = attributes.getValue("id"); //$NON-NLS-1$

-		String ver = attributes.getValue("version"); //$NON-NLS-1$

-

-		if (id == null || id.trim().equals("") //$NON-NLS-1$

-		|| ver == null || ver.trim().equals("")) { //$NON-NLS-1$

-			internalError(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid", new String[] { id, ver, getState(currentState)}));	//$NON-NLS-1$

-		} else {

-			// create feature model

-			FeatureModel feature = factory.createFeatureModel();

-

-			feature.setFeatureIdentifier(id);

-			feature.setFeatureVersion(ver);

-

-			// label

-			String label = attributes.getValue("label"); //$NON-NLS-1$

-			feature.setLabel(label);

-

-			// provider

-			String provider = attributes.getValue("provider-name"); //$NON-NLS-1$

-			feature.setProvider(provider);

-

-			//image

-			String imageURL = attributes.getValue("image"); //$NON-NLS-1$

-			feature.setImageURLString(imageURL);

-

-			// OS

-			String os = attributes.getValue("os"); //$NON-NLS-1$

-			feature.setOS(os);

-

-			// WS

-			String ws = attributes.getValue("ws"); //$NON-NLS-1$

-			feature.setWS(ws);

-

-			// NL

-			String nl = attributes.getValue("nl"); //$NON-NLS-1$

-			feature.setNL(nl);

-

-			// arch

-			String arch = attributes.getValue("arch"); //$NON-NLS-1$

-			feature.setArch(arch);

-

-			// primary

-			String primary = attributes.getValue("primary"); //$NON-NLS-1$

-			feature.setPrimary(primary != null && primary.trim().equalsIgnoreCase("true")); //$NON-NLS-1$

-

-			// exclusive

-			String exclusive = attributes.getValue("exclusive"); //$NON-NLS-1$

-			feature.setExclusive(exclusive != null && exclusive.trim().equalsIgnoreCase("true")); //$NON-NLS-1$

-

-			// application

-			String application = attributes.getValue("application"); //$NON-NLS-1$

-			feature.setApplication(application);

-

-			// affinity

-			String affinity = attributes.getValue("colocation-affinity"); //$NON-NLS-1$

-			feature.setAffinityFeature(affinity);

-

-			// primary plugin

-			String plugin = attributes.getValue("plugin"); //$NON-NLS-1$

-			feature.setPrimaryPluginID(plugin);

-

-			objectStack.push(feature);

-

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-				debug("End process DefaultFeature tag: id:" //$NON-NLS-1$

-				+id + " ver:" //$NON-NLS-1$

-				+ver + " label:" //$NON-NLS-1$

-				+label + " provider:" //$NON-NLS-1$

-				+provider);

-				debug("End process DefaultFeature tag: image:" + imageURL); //$NON-NLS-1$

-				debug("End process DefaultFeature tag: ws:" //$NON-NLS-1$

-				+ws + " os:" //$NON-NLS-1$

-				+os + " nl:" //$NON-NLS-1$

-				+nl + " application:" //$NON-NLS-1$

-				+application);

-			}

-		}

-	}

-

-	/* 

-	 * process URL info with element text

-	 */

-	private void processHandler(Attributes attributes) {

-		InstallHandlerEntryModel handler = factory.createInstallHandlerEntryModel();

-

-		String handlerURL = attributes.getValue("url"); //$NON-NLS-1$

-		handler.setURLString(handlerURL);

-

-		String library = attributes.getValue("library"); //$NON-NLS-1$

-		handler.setLibrary(library);

-

-		String clazz = attributes.getValue("handler"); //$NON-NLS-1$

-		handler.setHandlerName(clazz);

-

-		objectStack.push(handler);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("Processed Handler: url:" //$NON-NLS-1$

-			+handlerURL + " library:" //$NON-NLS-1$

-			+library + " class:" //$NON-NLS-1$

-			+clazz);

-	}

-

-	/* 

-	 * process URL info with element text

-	 */

-	private void processInfo(Attributes attributes) {

-		URLEntryModel inf = factory.createURLEntryModel();

-		String infoURL = attributes.getValue("url"); //$NON-NLS-1$

-		inf.setURLString(infoURL);

-

-		objectStack.push(inf);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("Processed Info: url:" + infoURL); //$NON-NLS-1$

-	}

-

-	/*

-	 * Process includes information

-	 */

-	private void processIncludes(Attributes attributes) {

-

-		// identifier and version

-		String id = attributes.getValue("id"); //$NON-NLS-1$

-		String ver = attributes.getValue("version"); //$NON-NLS-1$

-

-		if (id == null || id.trim().equals("") //$NON-NLS-1$

-		|| ver == null || ver.trim().equals("")) { //$NON-NLS-1$

-			internalError(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid", new String[] { id, ver, getState(currentState)}));	//$NON-NLS-1$

-		}

-

-		IncludedFeatureReferenceModel includedFeature = factory.createIncludedFeatureReferenceModel();

-		includedFeature.setFeatureIdentifier(id);

-		includedFeature.setFeatureVersion(ver);

-

-		// name

-		String name = attributes.getValue("name");//$NON-NLS-1$

-		includedFeature.setLabel(name);

-

-		// optional

-		String optional = attributes.getValue("optional");//$NON-NLS-1$

-		boolean isOptional = "true".equalsIgnoreCase(optional);//$NON-NLS-1$

-		includedFeature.isOptional(isOptional);

-

-		// search location

-		String locationName = attributes.getValue("search-location");//$NON-NLS-1$

-		// bug 27030

-		if (locationName == null)

-			locationName = attributes.getValue("search_location");//$NON-NLS-1$

-		int searchLocation = IUpdateConstants.SEARCH_ROOT;

-		if ("both".equalsIgnoreCase(locationName))//$NON-NLS-1$

-			searchLocation = IUpdateConstants.SEARCH_ROOT & IUpdateConstants.SEARCH_SELF;

-		if ("self".equalsIgnoreCase(locationName))//$NON-NLS-1$

-			searchLocation = IUpdateConstants.SEARCH_SELF;				

-		includedFeature.setSearchLocation(searchLocation);

-

-		// os arch ws

-		String os = attributes.getValue("os");//$NON-NLS-1$

-		includedFeature.setOS(os);

-

-		String ws = attributes.getValue("ws");//$NON-NLS-1$

-		includedFeature.setWS(ws);

-

-		String arch = attributes.getValue("arch");//$NON-NLS-1$

-		includedFeature.setArch(arch);

-

-		objectStack.push(includedFeature);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-			debug("End process Includes tag: id:" //$NON-NLS-1$

-			+id + " ver:" + ver); //$NON-NLS-1$

-			debug("name =" + name + " optional=" + optional + " search-location=" + locationName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-			debug("os=" + os + " ws=" + ws + " arch=" + arch); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		}

-	}

-

-	/* 

-	 * process URL info with label attribute

-	 */

-	private void processURLInfo(Attributes attributes) {

-		URLEntryModel inf = factory.createURLEntryModel();

-		String infoURL = attributes.getValue("url"); //$NON-NLS-1$

-		String label = attributes.getValue("label"); //$NON-NLS-1$

-		String type = attributes.getValue("type"); //$NON-NLS-1$

-		inf.setURLString(infoURL);

-		inf.setAnnotation(label);

-		

-		if ("web".equalsIgnoreCase(type)) //$NON-NLS-1$

-			inf.setType(IURLEntry.WEB_SITE);

-		else 

-			inf.setType(IURLEntry.UPDATE_SITE);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("Processed URLInfo: url:" + infoURL + " label:" + label+" type:"+type);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-		objectStack.push(inf);

-	}

-

-	/* 

-	 * process import info

-	 */

-	private void processImport(Attributes attributes) {

-		String pluginID = attributes.getValue("plugin"); //$NON-NLS-1$

-		String featureID = attributes.getValue("feature"); //$NON-NLS-1$

-		String idMatch = attributes.getValue("id-match"); //$NON-NLS-1$

-

-		if (!(pluginID == null ^ featureID == null)) {

-			internalError(Policy.bind("DefaultFeatureParser.PluginAndFeatureId")); //$NON-NLS-1$

-			return;

-		}

-

-		// since 2.0.2 , manage feature and plugin import

-		String id = null;

-		if (pluginID == null) {

-			id = featureID;

-		} else {

-			id = pluginID;

-		}

-

-		if (id == null || id.trim().equals("")) //$NON-NLS-1$

-			internalError(Policy.bind("DefaultFeatureParser.MissingId", getState(currentState)));//$NON-NLS-1$

-		else {

-			ImportModel imp = factory.createImportModel();

-			String ver = attributes.getValue("version"); //$NON-NLS-1$

-			String match = attributes.getValue("match"); //$NON-NLS-1$

-			String patch = attributes.getValue("patch"); //$NON-NLS-1$

-

-			imp.setPatch(patch != null && patch.equalsIgnoreCase("true")); //$NON-NLS-1$

-

-			if (ver == null) {

-				if (imp.isPatch()) {

-					internalError(Policy.bind("DefaultFeatureParser.MissingPatchVersion")); //$NON-NLS-1$

-				}

-				ver = "0.0.0"; //$NON-NLS-1$

-				match = "greaterOrEqual"; //$NON-NLS-1$

-			} else if (match == null) {

-				if (imp.isPatch())

-					match = "perfect"; //$NON-NLS-1$

-				else

-					match = "compatible"; //$NON-NLS-1$

-			}

-

-			imp.setIdentifier(id);

-			imp.setVersion(ver);

-			imp.setFeatureImport(featureID != null);

-			imp.setMatchingRuleName(match);

-			imp.setMatchingIdRuleName(idMatch);

-

-			if (imp.isPatch()) {

-				// patch reference must be perfect.

-				if (match != null && !match.equalsIgnoreCase("perfect")) { //$NON-NLS-1$

-					internalError(Policy.bind("DefaultFeatureParser.wrongMatchForPatch")); //$NON-NLS-1$

-				}

-				if (imp.isFeatureImport() == false) {

-					imp.setPatch(false);

-					internalError(Policy.bind("DefaultFeatureParser.patchWithPlugin")); //$NON-NLS-1$

-				}

-			}

-

-			// os arch ws

-			String os = attributes.getValue("os"); //$NON-NLS-1$

-			imp.setOS(os);

-

-			String ws = attributes.getValue("ws"); //$NON-NLS-1$

-			imp.setWS(ws);

-

-			String arch = attributes.getValue("arch"); //$NON-NLS-1$

-			imp.setOSArch(arch);

-

-			objectStack.push(imp);

-

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-				debug("Processed import: id:" + id + " ver:" + ver);//$NON-NLS-1$ //$NON-NLS-2$

-				debug("Processed import: match:" + match); //$NON-NLS-1$

-			}

-

-		}

-	}

-

-	/* 

-	 * process import info

-	 */

-	private void processRequire(Attributes attributes) {

-	}

-

-	/* 

-	 * process plugin entry info

-	 */

-	private void processPlugin(Attributes attributes) {

-		String id = attributes.getValue("id"); //$NON-NLS-1$

-		String ver = attributes.getValue("version"); //$NON-NLS-1$

-		if (id == null || id.trim().equals("") //$NON-NLS-1$

-		|| ver == null || ver.trim().equals("")) { //$NON-NLS-1$

-			internalError(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid", new String[] { id, ver, getState(currentState)}));	//$NON-NLS-1$

-		} else {

-			PluginEntryModel pluginEntry = factory.createPluginEntryModel();

-			pluginEntry.setPluginIdentifier(id);

-			pluginEntry.setPluginVersion(ver);

-

-			String fragment = attributes.getValue("fragment"); //$NON-NLS-1$

-			pluginEntry.isFragment(fragment != null && fragment.trim().equalsIgnoreCase("true"));//$NON-NLS-1$			

-

-			//setOS

-			String os = attributes.getValue("os"); //$NON-NLS-1$

-			pluginEntry.setOS(os);

-

-			//setWS

-			String ws = attributes.getValue("ws"); //$NON-NLS-1$

-			pluginEntry.setWS(ws);

-

-			//setNL

-			String nl = attributes.getValue("nl"); //$NON-NLS-1$

-			pluginEntry.setNL(nl);

-

-			// setArch

-			String arch = attributes.getValue("arch"); //$NON-NLS-1$

-			pluginEntry.setArch(arch);

-

-			// setUnpack

-			String unpack = attributes.getValue("unpack"); //$NON-NLS-1$

-			pluginEntry.setUnpack(!"false".equalsIgnoreCase(unpack)); //$NON-NLS-1$

-

-			// download size

-			long download_size = ContentEntryModel.UNKNOWN_SIZE;

-			String download = attributes.getValue("download-size"); //$NON-NLS-1$

-			if (download != null && !download.trim().equals("")) { //$NON-NLS-1$

-				try {

-					download_size = Long.valueOf(download).longValue();

-				} catch (NumberFormatException e) {

-					// use UNKNOWN_SIZE

-				}

-			}

-			pluginEntry.setDownloadSize(download_size);

-

-			// install size	

-			long install_size = ContentEntryModel.UNKNOWN_SIZE;

-			String install = attributes.getValue("install-size"); //$NON-NLS-1$

-			if (install != null && !install.trim().equals("")) { //$NON-NLS-1$

-				try {

-					install_size = Long.valueOf(install).longValue();

-				} catch (NumberFormatException e) {

-					// use UNKNOWN_SIZE

-				}

-			}

-			pluginEntry.setInstallSize(install_size);

-

-			objectStack.push(pluginEntry);

-

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-				debug("Processed Plugin: id:" + id + " ver:" + ver + " fragment:" + fragment); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				debug("Processed Plugin: os:" + os + " ws:" + ws + " nl:" + nl); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				debug("Processed Plugin: download size:" //$NON-NLS-1$

-				+download_size + " install size:" //$NON-NLS-1$

-				+install_size);

-			}

-

-		}

-	}

-

-	/* 

-	 * process non-plug-in entry info

-	 */

-	private void processData(Attributes attributes) {

-		String id = attributes.getValue("id"); //$NON-NLS-1$

-		if (id == null || id.trim().equals("")) { //$NON-NLS-1$

-			internalError(Policy.bind("DefaultFeatureParser.MissingId", getState(currentState)));	//$NON-NLS-1$

-		} else {

-			NonPluginEntryModel dataEntry = factory.createNonPluginEntryModel();

-			dataEntry.setIdentifier(id);

-

-			//setOS

-			String os = attributes.getValue("os"); //$NON-NLS-1$

-			dataEntry.setOS(os);

-

-			//setWS

-			String ws = attributes.getValue("ws"); //$NON-NLS-1$

-			dataEntry.setWS(ws);

-

-			//setNL

-			String nl = attributes.getValue("nl"); //$NON-NLS-1$

-			dataEntry.setNL(nl);

-

-			// setArch

-			String arch = attributes.getValue("arch"); //$NON-NLS-1$

-			dataEntry.setArch(arch);

-

-			// download size

-			long download_size = ContentEntryModel.UNKNOWN_SIZE;

-			String download = attributes.getValue("download-size"); //$NON-NLS-1$

-			if (download != null && !download.trim().equals("")) { //$NON-NLS-1$

-				try {

-					download_size = Long.valueOf(download).longValue();

-				} catch (NumberFormatException e) {

-					// use UNKNOWN_SIZE

-				}

-			}

-			dataEntry.setDownloadSize(download_size);

-

-			// install size	

-			long install_size = ContentEntryModel.UNKNOWN_SIZE;

-			String install = attributes.getValue("install-size"); //$NON-NLS-1$

-			if (install != null && !install.trim().equals("")) { //$NON-NLS-1$

-				try {

-					install_size = Long.valueOf(install).longValue();

-				} catch (NumberFormatException e) {

-					// use UNKNOWN_SIZE

-				}

-			}

-			dataEntry.setInstallSize(install_size);

-

-			objectStack.push(dataEntry);

-

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-				debug("Processed Data: id:" + id); //$NON-NLS-1$

-				debug("Processed Data: download size:" //$NON-NLS-1$

-				+download_size + " install size:" //$NON-NLS-1$

-				+install_size);

-			}

-

-		}

-	}

-

-	private void debug(String s) {

-		UpdateCore.debug("DefaultFeatureParser: " + s); //$NON-NLS-1$

-	}

-

-	private void logStatus(SAXParseException ex) {

-		String name = ex.getSystemId();

-		if (name == null)

-			name = ""; //$NON-NLS-1$

-		else

-			name = name.substring(1 + name.lastIndexOf("/")); //$NON-NLS-1$

-

-		String msg;

-		if (name.equals("")) { //$NON-NLS-1$

-			msg = Policy.bind("DefaultFeatureParser.ErrorParsing", ex.getMessage());//$NON-NLS-1$

-		} else {

-			String[] values = new String[] { name, Integer.toString(ex.getLineNumber()), Integer.toString(ex.getColumnNumber()), ex.getMessage()};

-			msg = Policy.bind("DefaultFeatureParser.ErrorlineColumnMessage", values);//$NON-NLS-1$

-		}

-		error(new Status(IStatus.ERROR, PLUGIN_ID, Platform.PARSE_PROBLEM, msg, ex));

-	}

-

-	/*

-	 * Handles an error state specified by the status.  The collection of all logged status

-	 * objects can be accessed using <code>getStatus()</code>.

-	 *

-	 * @param error a status detailing the error condition

-	 */

-	private void error(IStatus error) {

-

-		if (status == null) {

-			status = new MultiStatus(PLUGIN_ID, Platform.PARSE_PROBLEM, Policy.bind("DefaultFeatureParser.ErrorParsingFeature"), null);	//$NON-NLS-1$

-		}

-

-		status.add(error);

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			UpdateCore.log(error);

-	}

-

-	private void internalErrorUnknownTag(String msg) {

-		stateStack.push(new Integer(STATE_IGNORED_ELEMENT));

-		internalError(msg);

-	}

-

-	private void internalError(String message) {

-		error(new Status(IStatus.ERROR, PLUGIN_ID, Platform.PARSE_PROBLEM, message, null));

-	}

-

-	/*

-	 * return the state as String

-	 */

-	private String getState(int state) {

-

-		switch (state) {

-			case STATE_IGNORED_ELEMENT :

-				return "Ignored"; //$NON-NLS-1$

-

-			case STATE_INITIAL :

-				return "Initial"; //$NON-NLS-1$

-

-			case STATE_FEATURE :

-				return "Feature"; //$NON-NLS-1$

-

-			case STATE_HANDLER :

-				return "Install Handler"; //$NON-NLS-1$

-

-			case STATE_DESCRIPTION :

-				return "description"; //$NON-NLS-1$

-

-			case STATE_INCLUDES :

-				return "includes"; //$NON-NLS-1$

-

-			case STATE_COPYRIGHT :

-				return "Copyright"; //$NON-NLS-1$

-

-			case STATE_LICENSE :

-				return "License"; //$NON-NLS-1$

-

-			case STATE_URL :

-				return "URL"; //$NON-NLS-1$

-

-			case STATE_UPDATE :

-				return "Update URL"; //$NON-NLS-1$

-

-			case STATE_DISCOVERY :

-				return "Discovery URL"; //$NON-NLS-1$

-

-			case STATE_REQUIRES :

-				return "Require"; //$NON-NLS-1$

-

-			case STATE_IMPORT :

-				return "Import"; //$NON-NLS-1$

-

-			case STATE_PLUGIN :

-				return "Plugin"; //$NON-NLS-1$

-

-			case STATE_DATA :

-				return "Data"; //$NON-NLS-1$

-

-			default :

-				return Policy.bind("DefaultFeatureParser.UnknownState", Integer.toString(state));//$NON-NLS-1$

-		}

-

-	}

-

-	/**

-	 * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)

-	 */

-	public void ignorableWhitespace(char[] arg0, int arg1, int arg2) throws SAXException {

-		super.ignorableWhitespace(arg0, arg1, arg2);

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
deleted file mode 100644
index ba495d7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
+++ /dev/null

@@ -1,723 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-import java.io.*;

-import java.util.*;

-import javax.xml.parsers.*;

-

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

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

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

-import org.xml.sax.*;

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

-

-/**

- * Default site parser.

- * Parses the site manifest file as defined by the platform. Defers

- * to a model factory to create the actual concrete model objects. The 

- * update framework supplies two factory implementations:

- * <ul>

- * <li>@see org.eclipse.update.core.model.SiteModelFactory

- * <li>@see org.eclipse.update.core.BaseSiteFactory

- * </ul>

- * 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @since 2.0

- */

-public class DefaultSiteParser extends DefaultHandler {

-	

-	private final static SAXParserFactory parserFactory =

-		SAXParserFactory.newInstance();

-	

-	private SAXParser parser;

-	private SiteModelFactory factory;

-

-	private MultiStatus status;

-

-	private boolean DESCRIPTION_SITE_ALREADY_SEEN = false;

-

-	private static final int STATE_IGNORED_ELEMENT = -1;

-	private static final int STATE_INITIAL = 0;

-	private static final int STATE_SITE = 1;

-	private static final int STATE_FEATURE = 2;

-	private static final int STATE_ARCHIVE = 3;

-	private static final int STATE_CATEGORY = 4;

-	private static final int STATE_CATEGORY_DEF = 5;

-	private static final int STATE_DESCRIPTION_SITE = 6;

-	private static final int STATE_DESCRIPTION_CATEGORY_DEF = 7;

-	private static final String PLUGIN_ID = UpdateCore.getPlugin().getBundle().getSymbolicName();

-

-	private static final String SITE = "site"; //$NON-NLS-1$

-	private static final String FEATURE = "feature"; //$NON-NLS-1$

-	private static final String ARCHIVE = "archive"; //$NON-NLS-1$

-	private static final String CATEGORY_DEF = "category-def"; //$NON-NLS-1$

-	private static final String CATEGORY = "category"; //$NON-NLS-1$

-	private static final String DESCRIPTION = "description"; //$NON-NLS-1$

-

-	private static final String DEFAULT_INFO_URL = "index.html"; //$NON-NLS-1$

-

-	// Current State Information

-	Stack stateStack = new Stack();

-

-	// Current object stack (used to hold the current object we are

-	// populating in this plugin descriptor

-	Stack objectStack = new Stack();

-

-	private int currentState;

-

-	/**

-	 * Constructs a site parser.

-	 */

-	public DefaultSiteParser() {

-		super();

-		try {

-			parserFactory.setNamespaceAware(true);

-			this.parser = parserFactory.newSAXParser();

-		} catch (ParserConfigurationException e) {

-			UpdateCore.log(e);

-		} catch (SAXException e) {

-			UpdateCore.log(e);

-		}

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("Created"); //$NON-NLS-1$

-	}

-

-	public void init(SiteModelFactory factory) {

-		// PERF: separate instance creation from parsing

-		this.factory = factory;

-		stateStack = new Stack();

-		objectStack = new Stack();

-		status = null;

-		DESCRIPTION_SITE_ALREADY_SEEN = false;

-	}

-

-	/**

-	 * Parses the specified input steam and constructs a site model.

-	 * The input stream is not closed as part of this operation.

-	 * 

-	 * @param in input stream

-	 * @return site model

-	 * @exception SAXException

-	 * @exception IOException

-	 * @since 2.0

-	 */

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

-		stateStack.push(new Integer(STATE_INITIAL));

-		currentState = ((Integer) stateStack.peek()).intValue();

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

-		if (objectStack.isEmpty())

-			throw new SAXException(Policy.bind("DefaultSiteParser.NoSiteTag"));	//$NON-NLS-1$

-		else {

-			if (objectStack.peek() instanceof SiteModel) {

-				return (SiteModel) objectStack.pop();

-			} else {

-				String stack = ""; //$NON-NLS-1$

-				Iterator iter = objectStack.iterator();

-				while (iter.hasNext()) {

-					stack = stack + iter.next().toString() + "\r\n"; //$NON-NLS-1$

-				}

-				throw new SAXException(Policy.bind("DefaultSiteParser.WrongParsingStack", stack));	//$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * Returns all status objects accumulated by the parser.

-	 *

-	 * @return multi-status containing accumulated status, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public MultiStatus getStatus() {

-		return status;

-	}

-

-	/**

-	 * Handle start of element tags

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

-	 * @since 2.0

-	 */

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

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-			debug("State: " + currentState); //$NON-NLS-1$

-			debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		}

-

-		switch (currentState) {

-			case STATE_IGNORED_ELEMENT :

-				internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownElement", localName, getState(currentState)));//$NON-NLS-1$

-				break;

-			case STATE_INITIAL :

-				handleInitialState(localName, attributes);

-				break;

-

-			case STATE_SITE :

-				handleSiteState(localName, attributes);

-				break;

-

-			case STATE_FEATURE :

-				handleFeatureState(localName, attributes);

-				break;

-

-			case STATE_ARCHIVE :

-				handleSiteState(localName, attributes);

-				break;

-

-			case STATE_CATEGORY :

-				handleCategoryState(localName, attributes);

-				break;

-

-			case STATE_CATEGORY_DEF :

-				handleCategoryDefState(localName, attributes);

-				break;

-

-			case STATE_DESCRIPTION_SITE :

-				handleSiteState(localName, attributes);

-				break;

-

-			case STATE_DESCRIPTION_CATEGORY_DEF :

-				handleSiteState(localName, attributes);

-				break;

-

-			default :

-				internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownStartState", getState(currentState)));//$NON-NLS-1$

-				break;

-		}

-		int newState = ((Integer) stateStack.peek()).intValue();

-		if (newState != STATE_IGNORED_ELEMENT)

-			currentState = newState;

-

-	}

-

-	/**

-	 * Handle end of element tags

-	 * @see DefaultHandler#endElement(String, String, String)

-	 * @since 2.0

-	 */

-	public void endElement(String uri, String localName, String qName) {

-

-		String text = null;

-		URLEntryModel info = null;

-

-		int state = ((Integer) stateStack.peek()).intValue();

-		switch (state) {

-			case STATE_IGNORED_ELEMENT :

-			case STATE_ARCHIVE :

-			case STATE_CATEGORY :

-				stateStack.pop();

-				break;

-

-			case STATE_INITIAL :

-				internalError(Policy.bind("DefaultSiteParser.ParsingStackBackToInitialState"));	//$NON-NLS-1$

-				break;

-

-			case STATE_SITE :

-				stateStack.pop();

-				if (objectStack.peek() instanceof String) {

-					text = (String) objectStack.pop();

-					SiteModel site = (SiteModel) objectStack.peek();

-					site.getDescriptionModel().setAnnotation(text);

-				}

-				//do not pop the object

-				break;

-

-			case STATE_FEATURE :

-				stateStack.pop();

-				objectStack.pop();

-				break;

-

-			case STATE_CATEGORY_DEF :

-				stateStack.pop();

-				if (objectStack.peek() instanceof String) {

-					text = (String) objectStack.pop();

-					CategoryModel category = (CategoryModel) objectStack.peek();

-					category.getDescriptionModel().setAnnotation(text);

-				}

-				objectStack.pop();

-				break;

-

-			case STATE_DESCRIPTION_SITE :

-				stateStack.pop();

-				text = ""; //$NON-NLS-1$

-				while (objectStack.peek() instanceof String) {

-					// add text, preserving at most one space between text fragments

-					String newText = (String) objectStack.pop();

-					if (trailingSpace(newText) && !leadingSpace(text)) {

-						text = " " + text; //$NON-NLS-1$

-					}

-					text = newText.trim() + text;

-					if (leadingSpace(newText) && !leadingSpace(text)) {

-						text = " " + text; //$NON-NLS-1$

-					}

-				}

-				text = text.trim();

-

-				info = (URLEntryModel) objectStack.pop();

-				if (text != null)

-					info.setAnnotation(text);

-

-				SiteModel siteModel = (SiteModel) objectStack.peek();

-				// override description.

-				// do not raise error as previous description may be default one

-				// when parsing site tag

-				if (DESCRIPTION_SITE_ALREADY_SEEN)

-					debug(Policy.bind("DefaultSiteParser.ElementAlreadySet", getState(state)));	//$NON-NLS-1$

-				siteModel.setDescriptionModel(info);

-				DESCRIPTION_SITE_ALREADY_SEEN = true;

-				break;

-

-			case STATE_DESCRIPTION_CATEGORY_DEF :

-				stateStack.pop();

-				text = ""; //$NON-NLS-1$

-				while (objectStack.peek() instanceof String) {

-					// add text, preserving at most one space between text fragments

-					String newText = (String) objectStack.pop();

-					if (trailingSpace(newText) && !leadingSpace(text)) {

-						text = " " + text; //$NON-NLS-1$

-					}

-					text = newText.trim() + text;

-					if (leadingSpace(newText) && !leadingSpace(text)) {

-						text = " " + text; //$NON-NLS-1$

-					}

-				}

-				text = text.trim();

-

-				info = (URLEntryModel) objectStack.pop();

-				if (text != null)

-					info.setAnnotation(text);

-

-				CategoryModel category = (CategoryModel) objectStack.peek();

-				if (category.getDescriptionModel() != null)

-					internalError(Policy.bind("DefaultSiteParser.ElementAlreadySet2", getState(state), category.getLabel()));//$NON-NLS-1$

-				else

-					category.setDescriptionModel(info);

-				break;

-

-			default :

-				internalError(Policy.bind("DefaultSiteParser.UnknownEndState", getState(state)));//$NON-NLS-1$

-				break;

-		}

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End Element:" + uri + ":" + localName + ":" + qName);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-	}

-

-	/**

-	 * Handle character text

-	 * @see DefaultHandler#characters(char[], int, int)

-	 * @since 2.0

-	 */

-	public void characters(char[] ch, int start, int length) {

-		String text = new String(ch, start, length);

-		//only push if description

-		int state = ((Integer) stateStack.peek()).intValue();

-		if (state == STATE_DESCRIPTION_SITE || state == STATE_DESCRIPTION_CATEGORY_DEF)

-			objectStack.push(text);

-

-	}

-

-	/**

-	 * Handle errors

-	 * @see DefaultHandler#error(SAXParseException)

-	 * @since 2.0

-	 */

-	public void error(SAXParseException ex) {

-		logStatus(ex);

-	}

-

-	/**

-	 * Handle fatal errors

-	 * @see DefaultHandler#fatalError(SAXParseException)

-	 * @exception SAXException

-	 * @since 2.0

-	 */

-	public void fatalError(SAXParseException ex) throws SAXException {

-		logStatus(ex);

-		throw ex;

-	}

-

-	private void handleInitialState(String elementName, Attributes attributes) throws SAXException {

-		if (elementName.equals(SITE)) {

-			stateStack.push(new Integer(STATE_SITE));

-			processSite(attributes);

-		} else {

-			internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownElement", elementName, getState(currentState)));	//$NON-NLS-1$

-			// what we received was not a site.xml, no need to continue

-			throw new SAXException(Policy.bind("DefaultSiteParser.InvalidXMLStream")); //$NON-NLS-1$

-		}

-

-	}

-

-	private void handleSiteState(String elementName, Attributes attributes) {

-		if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION_SITE));

-			processInfo(attributes);

-		} else if (elementName.equals(FEATURE)) {

-			stateStack.push(new Integer(STATE_FEATURE));

-			processFeature(attributes);

-		} else if (elementName.equals(ARCHIVE)) {

-			stateStack.push(new Integer(STATE_ARCHIVE));

-			processArchive(attributes);

-		} else if (elementName.equals(CATEGORY_DEF)) {

-			stateStack.push(new Integer(STATE_CATEGORY_DEF));

-			processCategoryDef(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$ 			

-	}

-

-	private void handleFeatureState(String elementName, Attributes attributes) {

-		if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION_SITE));

-			processInfo(attributes);

-		} else if (elementName.equals(FEATURE)) {

-			stateStack.push(new Integer(STATE_FEATURE));

-			processFeature(attributes);

-		} else if (elementName.equals(ARCHIVE)) {

-			stateStack.push(new Integer(STATE_ARCHIVE));

-			processArchive(attributes);

-		} else if (elementName.equals(CATEGORY_DEF)) {

-			stateStack.push(new Integer(STATE_CATEGORY_DEF));

-			processCategoryDef(attributes);

-		} else if (elementName.equals(CATEGORY)) {

-			stateStack.push(new Integer(STATE_CATEGORY));

-			processCategory(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownElement", elementName, getState(currentState))); //$NON-NLS-1$ 			

-	}

-

-	private void handleCategoryDefState(String elementName, Attributes attributes) {

-		if (elementName.equals(FEATURE)) {

-			stateStack.push(new Integer(STATE_FEATURE));

-			processFeature(attributes);

-		} else if (elementName.equals(ARCHIVE)) {

-			stateStack.push(new Integer(STATE_ARCHIVE));

-			processArchive(attributes);

-		} else if (elementName.equals(CATEGORY_DEF)) {

-			stateStack.push(new Integer(STATE_CATEGORY_DEF));

-			processCategoryDef(attributes);

-		} else if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION_CATEGORY_DEF));

-			processInfo(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownElement", elementName, getState(currentState)));	//$NON-NLS-1$ 			

-	}

-

-	private void handleCategoryState(String elementName, Attributes attributes) {

-		if (elementName.equals(DESCRIPTION)) {

-			stateStack.push(new Integer(STATE_DESCRIPTION_SITE));

-			processInfo(attributes);

-		} else if (elementName.equals(FEATURE)) {

-			stateStack.push(new Integer(STATE_FEATURE));

-			processFeature(attributes);

-		} else if (elementName.equals(ARCHIVE)) {

-			stateStack.push(new Integer(STATE_ARCHIVE));

-			processArchive(attributes);

-		} else if (elementName.equals(CATEGORY_DEF)) {

-			stateStack.push(new Integer(STATE_CATEGORY_DEF));

-			processCategoryDef(attributes);

-		} else if (elementName.equals(CATEGORY)) {

-			stateStack.push(new Integer(STATE_CATEGORY));

-			processCategory(attributes);

-		} else

-			internalErrorUnknownTag(Policy.bind("DefaultSiteParser.UnknownElement", elementName, getState(currentState)));//$NON-NLS-1$ 			

-	}

-

-	/* 

-	 * process site info

-	 */

-	private void processSite(Attributes attributes) throws SAXException {

-		// create site map

-		SiteModel site = factory.createSiteMapModel();

-

-		// if URL is specified, it replaces the URL of the site

-		// used to calculate the location of features and archives

-		String siteURL = attributes.getValue("url"); //$NON-NLS-1$

-		if (siteURL != null && !("".equals(siteURL.trim()))) { //$NON-NLS-1$

-			if (!siteURL.endsWith("/") && !siteURL.endsWith(File.separator)) { //$NON-NLS-1$

-				siteURL += "/"; //$NON-NLS-1$

-			}

-			site.setLocationURLString(siteURL);

-		}

-

-		// provide default description URL

-		// If <description> is specified, for the site,  it takes precedence		

-		URLEntryModel description = factory.createURLEntryModel();

-		description.setURLString(DEFAULT_INFO_URL);

-		site.setDescriptionModel(description);

-

-		// verify we can parse the site ...if the site has

-		// a different type throw an exception to force reparsing

-		// with the matching parser

-		String type = attributes.getValue("type"); //$NON-NLS-1$

-		if (!factory.canParseSiteType(type)) {

-			throw new SAXException(new InvalidSiteTypeException(type));

-		}

-		site.setType(type);

-		objectStack.push(site);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End process Site tag: siteURL:" + siteURL + " type:" + type);//$NON-NLS-1$ //$NON-NLS-2$

-

-	}

-

-	/* 

-	 * process feature info

-	 */

-	private void processFeature(Attributes attributes) {

-		SiteFeatureReferenceModel feature = factory.createFeatureReferenceModel();

-		String urlInfo = attributes.getValue("url"); //$NON-NLS-1$

-		if (urlInfo == null || urlInfo.trim().equals("")) //$NON-NLS-1$

-			internalError(Policy.bind("DefaultSiteParser.Missing", "url", getState(currentState)));	//$NON-NLS-1$  //$NON-NLS-2$

-

-		feature.setURLString(urlInfo);

-

-		String type = attributes.getValue("type"); //$NON-NLS-1$

-		feature.setType(type);

-

-		// identifier and version

-		String id = attributes.getValue("id"); //$NON-NLS-1$

-		String ver = attributes.getValue("version"); //$NON-NLS-1$

-

-		// if one is null, and not the other

-		if ((id == null || id.trim().equals("")) //$NON-NLS-1$

-		^ (ver == null || ver.trim().equals(""))) { //$NON-NLS-1$

-			String[] values = new String[] { id, ver, getState(currentState)};

-			UpdateCore.warn(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid", values));//$NON-NLS-1$

-		} else {

-			feature.setFeatureIdentifier(id);

-			feature.setFeatureVersion(ver);

-		}

-

-		// get label if it exists

-		String label = attributes.getValue("label"); //$NON-NLS-1$

-		if (label != null) {

-			if ("".equals(label.trim())) //$NON-NLS-1$

-				label = null;

-		}

-		feature.setLabel(label);

-

-		// OS

-		String os = attributes.getValue("os"); //$NON-NLS-1$

-		feature.setOS(os);

-

-		// WS

-		String ws = attributes.getValue("ws"); //$NON-NLS-1$

-		feature.setWS(ws);

-

-		// NL

-		String nl = attributes.getValue("nl"); //$NON-NLS-1$

-		feature.setNL(nl);

-

-		// arch

-		String arch = attributes.getValue("arch"); //$NON-NLS-1$

-		feature.setArch(arch);

-

-		//patch

-		String patch = attributes.getValue("patch"); //$NON-NLS-1$

-		feature.setPatch(patch);

-

-		SiteModel site = (SiteModel) objectStack.peek();

-		site.addFeatureReferenceModel(feature);

-		feature.setSiteModel(site);

-

-		objectStack.push(feature);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End Processing DefaultFeature Tag: url:" + urlInfo + " type:" + type); //$NON-NLS-1$ //$NON-NLS-2$

-

-	}

-

-	/* 

-	 * process archive info

-	 */

-	private void processArchive(Attributes attributes) {

-		ArchiveReferenceModel archive = factory.createArchiveReferenceModel();

-		String id = attributes.getValue("path"); //$NON-NLS-1$

-		if (id == null || id.trim().equals("")) { //$NON-NLS-1$

-			internalError(Policy.bind("DefaultSiteParser.Missing", "path", getState(currentState))); //$NON-NLS-1$  //$NON-NLS-2$

-		}

-

-		archive.setPath(id);

-

-		String url = attributes.getValue("url"); //$NON-NLS-1$

-		if (url == null || url.trim().equals("")) { //$NON-NLS-1$

-			internalError(Policy.bind("DefaultSiteParser.Missing", "archive", getState(currentState)));	//$NON-NLS-1$  //$NON-NLS-2$

-		} else {

-			archive.setURLString(url);

-

-			SiteModel site = (SiteModel) objectStack.peek();

-			site.addArchiveReferenceModel(archive);

-		}

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End processing Archive: path:" + id + " url:" + url);//$NON-NLS-1$ //$NON-NLS-2$

-

-	}

-

-	/* 

-	 * process the Category  info

-	 */

-	private void processCategory(Attributes attributes) {

-		String category = attributes.getValue("name"); //$NON-NLS-1$

-		SiteFeatureReferenceModel feature = (SiteFeatureReferenceModel) objectStack.peek();

-		feature.addCategoryName(category);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End processing Category: name:" + category); //$NON-NLS-1$

-	}

-

-	/* 

-	 * process category def info

-	 */

-	private void processCategoryDef(Attributes attributes) {

-		CategoryModel category = factory.createSiteCategoryModel();

-		String name = attributes.getValue("name"); //$NON-NLS-1$

-		String label = attributes.getValue("label"); //$NON-NLS-1$

-		category.setName(name);

-		category.setLabel(label);

-

-		SiteModel site = (SiteModel) objectStack.peek();

-		site.addCategoryModel(category);

-		objectStack.push(category);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("End processing CategoryDef: name:" + name + " label:" + label); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/* 

-	 * process URL info with element text

-	 */

-	private void processInfo(Attributes attributes) {

-		URLEntryModel inf = factory.createURLEntryModel();

-		String infoURL = attributes.getValue("url"); //$NON-NLS-1$

-		inf.setURLString(infoURL);

-

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			debug("Processed Info: url:" + infoURL); //$NON-NLS-1$

-

-		objectStack.push(inf);

-	}

-

-	/*

-	 * 

-	 */

-	private void debug(String s) {

-		UpdateCore.debug("DefaultSiteParser" + s); //$NON-NLS-1$

-	}

-

-	/*

-	 * 

-	 */

-	private void logStatus(SAXParseException ex) {

-		String name = ex.getSystemId();

-		if (name == null)

-			name = ""; //$NON-NLS-1$

-		else

-			name = name.substring(1 + name.lastIndexOf("/")); //$NON-NLS-1$

-

-		String msg;

-		if (name.equals("")) //$NON-NLS-1$

-			msg = Policy.bind("DefaultSiteParser.ErrorParsing", ex.getMessage());	//$NON-NLS-1$

-		else {

-			String[] values = new String[] { name, Integer.toString(ex.getLineNumber()), Integer.toString(ex.getColumnNumber()), ex.getMessage()};

-			msg = Policy.bind("DefaultSiteParser.ErrorLineColumnMessage", values);//$NON-NLS-1$

-		}

-		error(new Status(IStatus.ERROR, PLUGIN_ID, Platform.PARSE_PROBLEM, msg, ex));

-	}

-

-	/*

-	 * Handles an error state specified by the status.  The collection of all logged status

-	 * objects can be accessed using <code>getStatus()</code>.

-	 *

-	 * @param error a status detailing the error condition

-	 */

-	private void error(IStatus error) {

-

-		if (status == null) {

-			status = new MultiStatus(PLUGIN_ID, Platform.PARSE_PROBLEM, Policy.bind("DefaultSiteParser.ErrorParsingSite"), null);//$NON-NLS-1$

-		}

-

-		status.add(error);

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)

-			UpdateCore.log(error);

-	}

-

-	/*

-	 * 

-	 */

-	private void internalErrorUnknownTag(String msg) {

-		stateStack.push(new Integer(STATE_IGNORED_ELEMENT));

-		internalError(msg);

-	}

-

-	/*

-	 * 

-	 */

-	private void internalError(String message) {

-		error(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, message, null));

-	}

-

-	/*

-	 * return the state as String

-	 */

-	private String getState(int state) {

-

-		switch (state) {

-			case STATE_IGNORED_ELEMENT :

-				return "Ignored"; //$NON-NLS-1$

-

-			case STATE_INITIAL :

-				return "Initial"; //$NON-NLS-1$

-

-			case STATE_SITE :

-				return "Site"; //$NON-NLS-1$

-

-			case STATE_FEATURE :

-				return "Feature"; //$NON-NLS-1$

-

-			case STATE_ARCHIVE :

-				return "Archive"; //$NON-NLS-1$

-

-			case STATE_CATEGORY :

-				return "Category"; //$NON-NLS-1$

-

-			case STATE_CATEGORY_DEF :

-				return "Category Def"; //$NON-NLS-1$

-

-			case STATE_DESCRIPTION_CATEGORY_DEF :

-				return "Description / Category Def"; //$NON-NLS-1$

-

-			case STATE_DESCRIPTION_SITE :

-				return "Description / Site"; //$NON-NLS-1$

-

-			default :

-				return Policy.bind("DefaultSiteParser.UnknownState"); //$NON-NLS-1$

-		}

-	}

-	private boolean leadingSpace(String str) {

-		if (str.length() <= 0) {

-			return false;

-		}

-		return Character.isWhitespace(str.charAt(0));

-	}

-	private boolean trailingSpace(String str) {

-		if (str.length() <= 0) {

-			return false;

-		}

-		return Character.isWhitespace(str.charAt(str.length() - 1));

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
deleted file mode 100644
index 90ed7b4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
+++ /dev/null

@@ -1,942 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-

-import java.net.*;

-import java.util.*;

-

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

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

-

-/**

- * Feature model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.Feature

- * @since 2.0

- */

-public class FeatureModel extends ModelObject {

-

-	private String featureId;

-	private String featureVersion;

-	private String label;

-	private String localizedLabel;

-	private String provider;

-	private String localizedProvider;

-	private String imageURLString;

-	private URL imageURL;

-	private String os;

-	private String ws;

-	private String nl;

-	private String arch;

-	private boolean primary = false;

-	private boolean exclusive=false;

-	private String primaryPluginID;

-	private String application;

-	private String affinity;

-	private InstallHandlerEntryModel installHandler;

-	private URLEntryModel description;

-	private URLEntryModel copyright;

-	private URLEntryModel license;

-	private URLEntryModel updateSiteInfo;

-	private List /*of InfoModel*/

-	discoverySiteInfo;

-	private List /*of ImportModel*/

-	imports;

-	private List /*of PluginEntryModel*/

-	pluginEntries;

-	private List /*of IncludedFeatureReferenceModel */

-	featureIncludes;

-	private List /*of NonPluginEntryModel*/

-	nonPluginEntries;

-

-	// performance

-	private URL bundleURL;

-	private URL base;

-	private boolean resolved = false;

-

-	/**

-	 * Creates an uninitialized feature object.

-	 * 

-	 * @since 2.0

-	 */

-	public FeatureModel() {

-		super();

-	}

-

-	/**

-	 * Compares 2 feature models for equality

-	 *  

-	 * @param obj feature model to compare with

-	 * @return <code>true</code> if the two models are equal, 

-	 * <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public boolean equals(Object obj) {

-		if (!(obj instanceof FeatureModel))

-			return false;

-		FeatureModel model = (FeatureModel) obj;

-

-		return (featureId.toLowerCase().equals(model.getFeatureIdentifier()) && featureVersion.toLowerCase().equals(model.getFeatureVersion()));

-	}

-

-	/**

-	 * Returns the feature identifier as a string

-	 * 

-	 * @see org.eclipse.update.core.IFeature#getVersionedIdentifier()

-	 * @return feature identifier

-	 * @since 2.0

-	 */

-	public String getFeatureIdentifier() {

-		//delayedResolve(); no delay

-		return featureId;

-	}

-

-	/**

-	 * Returns the feature version as a string

-	 * 

-	 * @see org.eclipse.update.core.IFeature#getVersionedIdentifier()

-	 * @return feature version 

-	 * @since 2.0

-	 */

-	public String getFeatureVersion() {

-		//delayedResolve(); no delay

-		return featureVersion;

-	}

-

-	/**

-	 * Retrieve the displayable label for the feature. If the model

-	 * object has been resolved, the label is localized.

-	 * 

-	 * @return displayable label, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getLabel() {

-		delayedResolve();

-		if (localizedLabel != null)

-			return localizedLabel;

-		else

-			return label;

-	}

-

-	/**

-	 * Retrieve the non-localized displayable label for the feature.

-	 * 

-	 * @return non-localized displayable label, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getLabelNonLocalized() {

-		return label;

-	}

-

-	/**

-	 * Retrieve the displayable label for the feature provider. If the model

-	 * object has been resolved, the label is localized.

-	 * 

-	 * @return displayable label, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getProvider() {

-		delayedResolve();

-		if (localizedProvider != null)

-			return localizedProvider;

-		else

-			return provider;

-	}

-

-	/**

-	 * Retrieve the non-localized displayable label for the feature provider.

-	 * 

-	 * @return non-localized displayable label, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getProviderNonLocalized() {

-		return provider;

-	}

-

-	/**

-	 * Returns the unresolved URL string for the feature image.

-	 *

-	 * @return url string, or <code>null</code>

-	 * @since 2.0

-	 */

-	public String getImageURLString() {

-		delayedResolve();

-		return imageURLString;

-	}

-

-	/**

-	 * Returns the resolved URL for the image.

-	 * 

-	 * @return url, or <code>null</code>

-	 * @since 2.0

-	 */

-	public URL getImageURL() {

-		delayedResolve();

-		return imageURL;

-	}

-

-	/**

-	 * Get optional operating system specification as a comma-separated string.

-	 * 

-	 * @return the operating system specification string, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getOS() {

-		return os;

-	}

-

-	/**

-	 * Get optional windowing system specification as a comma-separated string.

-	 * @return the windowing system specification string, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getWS() {

-		return ws;

-	}

-

-	/**

-	 * Get optional system architecture specification as a comma-separated string.

-	 * 

-	 * @return the system architecture specification string, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getOSArch() {

-		return arch;

-	}

-

-	/**

-	 * Get optional locale specification as a comma-separated string.

-	 * 

-	 * @return the locale specification string, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getNL() {

-		return nl;

-	}

-

-	/**

-	 * Indicates whether the feature can be used as a primary feature.

-	 * 

-	 * @return <code>true</code> if this is a primary feature, 

-	 * otherwise <code>false</code>

-	 * @since 2.0

-	 */

-	public boolean isPrimary() {

-		return primary;

-	}

-	

-	/**

-	 * Indicates whether the feature must be processed alone

-	 * during installation and configuration. Features that

-	 * are not exclusive can be installed in a batch.

-	 * 

-	 * @return <code>true</code> if feature requires

-	 * exclusive processing, <code>false</code> otherwise.

-	 * @since 2.1

-	 */

-	public boolean isExclusive() {

-		return exclusive;

-	}

-

-	/**

-	 * Returns an optional identifier for the feature application

-	 * 

-	 * @return application identifier, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getApplication() {

-		return application;

-	}

-

-	/**

-	 * Returns an optional identifier for the colocation affinity feature

-	 * 

-	 * @return feature identifier, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getAffinityFeature() {

-		return affinity;

-	}

-

-	/**

-	 * Returns and optional custom install handler entry.

-	 * 

-	 * @return install handler entry, or <code>null</code> if

-	 * none was specified

-	 * @since 2.0

-	 */

-	public InstallHandlerEntryModel getInstallHandlerModel() {

-		//delayedResolve(); no delay

-		return installHandler;

-	}

-

-	/**

-	 * Returns the feature description.

-	 * 

-	 * @return feature rescription, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public URLEntryModel getDescriptionModel() {

-		//delayedResolve(); no delay

-		return description;

-	}

-

-	/**

-	 * Returns the copyright information for the feature.

-	 * 

-	 * @return copyright information, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public URLEntryModel getCopyrightModel() {

-		//delayedResolve(); no delay

-		return copyright;

-	}

-

-	/**

-	 * Returns the license information for the feature.

-	 * 

-	 * @return feature license, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public URLEntryModel getLicenseModel() {

-		//delayedResolve(); no delay;

-		return license;

-	}

-

-	/**

-	 * Returns an information entry referencing the location of the

-	 * feature update site.

-	 * 

-	 * @return update site entry, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public URLEntryModel getUpdateSiteEntryModel() {

-		//delayedResolve(); no delay;

-		return updateSiteInfo;

-	}

-

-	/**

-	 * Return an array of information entries referencing locations of other

-	 * update sites. 

-	 * 

-	 * @return an array of site entries, or an empty array.

-	 * @since 2.0 

-	 * @since 2.0

-	 */

-	public URLEntryModel[] getDiscoverySiteEntryModels() {

-		//delayedResolve(); no delay;

-		if (discoverySiteInfo == null)

-			return new URLEntryModel[0];

-

-		return (URLEntryModel[]) discoverySiteInfo.toArray(arrayTypeFor(discoverySiteInfo));

-	}

-

-	/**

-	 * Return a list of plug-in dependencies for this feature.

-	 * 

-	 * @return the list of required plug-in dependencies, or an empty array.

-	 * @since 2.0

-	 */

-	public ImportModel[] getImportModels() {

-		//delayedResolve(); no delay;

-		if (imports == null)

-			return new ImportModel[0];

-

-		return (ImportModel[]) imports.toArray(arrayTypeFor(imports));

-	}

-

-	/**

-	 * Returns an array of plug-in entries referenced by this feature

-	 * 

-	 * @return an erray of plug-in entries, or an empty array.

-	 * @since 2.0

-	 */

-	public PluginEntryModel[] getPluginEntryModels() {

-		if (pluginEntries == null)

-			return new PluginEntryModel[0];

-

-		return (PluginEntryModel[]) pluginEntries.toArray(arrayTypeFor(pluginEntries));

-	}

-

-	/**

-	 * Returns an array of versioned identifier referenced by this feature

-	 * 

-	 * @return an array of versioned identifier, or an empty array.

-	 * @deprecated use getFeatureIncludeIdentifier instead.

-	 * @since 2.0

-	 */

-	public VersionedIdentifier[] getFeatureIncludeVersionedIdentifier() {

-		//delayedResolve(); no delay

-		if (featureIncludes == null)

-			return new VersionedIdentifier[0];

-

-		//

-		Iterator iter = featureIncludes.iterator();

-		VersionedIdentifier[] versionIncluded = new VersionedIdentifier[featureIncludes.size()];

-		int index = 0;

-		while (iter.hasNext()) {

-			IncludedFeatureReferenceModel model = (IncludedFeatureReferenceModel) iter.next();

-			versionIncluded[index] = model.getVersionedIdentifier();

-			index++;

-		}

-		return versionIncluded;

-	}

-

-	/**

-	 * Returns an array of included feature reference model referenced by this feature.

-	 *

-	 * @return an array of included feature reference model, or an empty array.

-	 * @since 2.0

-	 */

-	public IIncludedFeatureReference[] getFeatureIncluded() {

-		//delayedResolve(); no delay

-		if (featureIncludes == null)

-			return new IIncludedFeatureReference[0];

-		return (IIncludedFeatureReference[]) featureIncludes.toArray(arrayTypeFor(featureIncludes));

-	}

-

-	/**

-	 * Returns an array of non-plug-in entries referenced by this feature

-	 * 

-	 * @return an erray of non-plug-in entries, or an empty array.

-	 * @since 2.0

-	 */

-	public NonPluginEntryModel[] getNonPluginEntryModels() {

-		if (nonPluginEntries == null)

-			return new NonPluginEntryModel[0];

-

-		return (NonPluginEntryModel[]) nonPluginEntries.toArray(arrayTypeFor(nonPluginEntries));

-	}

-

-	/**

-	 * Sets the feature identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param featureId feature identifier

-	 * @since 2.0

-	 */

-	public void setFeatureIdentifier(String featureId) {

-		assertIsWriteable();

-		this.featureId = featureId;

-	}

-

-	/**

-	 * Sets the feature version.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param featureVersion feature version

-	 * @since 2.0

-	 */

-	public void setFeatureVersion(String featureVersion) {

-		assertIsWriteable();

-		this.featureVersion = featureVersion;

-	}

-

-	/**

-	 * Sets the feature displayable label.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param label displayable label

-	 * @since 2.0

-	 */

-	public void setLabel(String label) {

-		assertIsWriteable();

-		this.label = label;

-		this.localizedLabel = null;

-	}

-

-	/**

-	 * Sets the feature provider displayable label.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param provider provider displayable label

-	 * @since 2.0

-	 */

-	public void setProvider(String provider) {

-		assertIsWriteable();

-		this.provider = provider;

-		this.localizedProvider = null;

-	}

-

-	/**

-	 * Sets the unresolved URL for the feature image.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param imageURLString unresolved URL string

-	 * @since 2.0

-	 */

-	public void setImageURLString(String imageURLString) {

-		assertIsWriteable();

-		this.imageURLString = imageURLString;

-		this.imageURL = null;

-	}

-

-	/**

-	 * Sets the operating system specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param os operating system specification as a comma-separated list

-	 * @since 2.0

-	 */

-	public void setOS(String os) {

-		assertIsWriteable();

-		this.os = os;

-	}

-

-	/**

-	 * Sets the windowing system specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param ws windowing system specification as a comma-separated list

-	 * @since 2.0

-	 */

-	public void setWS(String ws) {

-		assertIsWriteable();

-		this.ws = ws;

-	}

-

-	/**

-	 * Sets the locale specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param nl locale specification as a comma-separated list

-	 * @since 2.0

-	 */

-	public void setNL(String nl) {

-		assertIsWriteable();

-		this.nl = nl;

-	}

-

-	/**

-	 * Sets the system architecture specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param arch system architecture specification as a comma-separated list

-	 * @since 2.0

-	 */

-	public void setArch(String arch) {

-		assertIsWriteable();

-		this.arch = arch;

-	}

-

-	/**

-	 * Indicates whether this feature can act as a primary feature.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param primary <code>true</code> if this feature can act as primary,

-	 * <code>false</code> otherwise

-	 * 

-	 * @since 2.0

-	 */

-	public void setPrimary(boolean primary) {

-		assertIsWriteable();

-		this.primary = primary;

-	}

-	

-	/**

-	 * Indicates whether this feature can act as a primary feature.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param exclusive <code>true</code> if this feature must be

-	 * processed independently from other features, <code>false</code> 

-	 * if feature can be processed in a batch with other features.

-	 * 

-	 * @since 2.1

-	 */

-	public void setExclusive(boolean exclusive) {

-		assertIsWriteable();

-		this.exclusive = exclusive;

-	}

-

-	/**

-	 * Sets the feature application identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param application feature application identifier

-	 * @since 2.0

-	 */

-	public void setApplication(String application) {

-		assertIsWriteable();

-		this.application = application;

-	}

-

-	/**

-	 * Sets the identifier of the Feature this feature should be

-	 * installed with.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param affinity the identifier of the Feature

-	 * @since 2.0

-	 */

-	public void setAffinityFeature(String affinity) {

-		assertIsWriteable();

-		this.affinity = affinity;

-	}

-

-	/**

-	 * Sets the custom install handler for the feature.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param installHandler install handler entry

-	 * @since 2.0

-	 */

-	public void setInstallHandlerModel(InstallHandlerEntryModel installHandler) {

-		assertIsWriteable();

-		this.installHandler = installHandler;

-	}

-

-	/**

-	 * Sets the feature description information.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param description feature description information

-	 * @since 2.0

-	 */

-	public void setDescriptionModel(URLEntryModel description) {

-		assertIsWriteable();

-		this.description = description;

-	}

-

-	/**

-	 * Sets the feature copyright information.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param copyright feature copyright information

-	 * @since 2.0

-	 */

-	public void setCopyrightModel(URLEntryModel copyright) {

-		assertIsWriteable();

-		this.copyright = copyright;

-	}

-

-	/**

-	 * Sets the feature license information.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param license feature license information

-	 * @since 2.0

-	 */

-	public void setLicenseModel(URLEntryModel license) {

-		assertIsWriteable();

-		this.license = license;

-	}

-

-	/**

-	 * Sets the feature update site reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param updateSiteInfo feature update site reference

-	 * @since 2.0

-	 */

-	public void setUpdateSiteEntryModel(URLEntryModel updateSiteInfo) {

-		assertIsWriteable();

-		this.updateSiteInfo = updateSiteInfo;

-	}

-

-	/**

-	 * Sets additional update site references.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param discoverySiteInfo additional update site references

-	 * @since 2.0

-	 */

-	public void setDiscoverySiteEntryModels(URLEntryModel[] discoverySiteInfo) {

-		assertIsWriteable();

-		if (discoverySiteInfo == null)

-			this.discoverySiteInfo = null;

-		else

-			this.discoverySiteInfo = new ArrayList(Arrays.asList(discoverySiteInfo));

-	}

-

-	/**

-	 * Sets the feature plug-in dependency information.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param imports feature plug-in dependency information

-	 * @since 2.0

-	 */

-	public void setImportModels(ImportModel[] imports) {

-		assertIsWriteable();

-		if (imports == null)

-			this.imports = null;

-		else

-			this.imports = new ArrayList(Arrays.asList(imports));

-	}

-

-	/**

-	 * Sets the feature plug-in references.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param pluginEntries feature plug-in references

-	 * @since 2.0

-	 */

-	public void setPluginEntryModels(PluginEntryModel[] pluginEntries) {

-		assertIsWriteable();

-		if (pluginEntries == null)

-			this.pluginEntries = null;

-		else

-			this.pluginEntries = new ArrayList(Arrays.asList(pluginEntries));

-	}

-

-	/**

-	 * Sets the feature non-plug-in data references.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param nonPluginEntries feature non-plug-in data references

-	 * @since 2.0

-	 */

-	public void setNonPluginEntryModels(NonPluginEntryModel[] nonPluginEntries) {

-		assertIsWriteable();

-		if (nonPluginEntries == null)

-			this.nonPluginEntries = null;

-		else

-			this.nonPluginEntries = new ArrayList(Arrays.asList(nonPluginEntries));

-	}

-

-	/**

-	 * Adds an additional update site reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param discoverySiteInfo update site reference

-	 * @since 2.0

-	 */

-	public void addDiscoverySiteEntryModel(URLEntryModel discoverySiteInfo) {

-		assertIsWriteable();

-		if (this.discoverySiteInfo == null)

-			this.discoverySiteInfo = new ArrayList();

-		if (!this.discoverySiteInfo.contains(discoverySiteInfo))

-			this.discoverySiteInfo.add(discoverySiteInfo);

-	}

-

-	/**

-	 * Adds a plug-in dependency entry.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param importEntry plug-in dependency entry

-	 * @since 2.0

-	 */

-	public void addImportModel(ImportModel importEntry) {

-		assertIsWriteable();

-		if (this.imports == null)

-			this.imports = new ArrayList();

-		if (!this.imports.contains(importEntry))

-			this.imports.add(importEntry);

-	}

-

-	/**

-	 * Adds a plug-in reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param pluginEntry plug-in reference

-	 * @since 2.0

-	 */

-	public void addPluginEntryModel(PluginEntryModel pluginEntry) {

-		assertIsWriteable();

-		if (this.pluginEntries == null)

-			this.pluginEntries = new ArrayList();

-		//PERF: no ListContains()

-		//if (!this.pluginEntries.contains(pluginEntry))

-		this.pluginEntries.add(pluginEntry);

-	}

-

-	/**

-	 * Adds a feature identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * @param include the included feature

-	 * @since 2.1

-	 */

-	public void addIncludedFeatureReferenceModel(IncludedFeatureReferenceModel include) {

-		assertIsWriteable();

-		if (this.featureIncludes == null)

-			this.featureIncludes = new ArrayList();

-		//PERF: no ListContains()

-		//if (!this.featureIncludes.contains(include))

-		this.featureIncludes.add(include);

-	}

-

-	/**

-	 * Adds a non-plug-in data reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param nonPluginEntry non-plug-in data reference

-	 * @since 2.0

-	 */

-	public void addNonPluginEntryModel(NonPluginEntryModel nonPluginEntry) {

-		assertIsWriteable();

-		if (this.nonPluginEntries == null)

-			this.nonPluginEntries = new ArrayList();

-		//PERF: no ListContains()

-		//if (!this.nonPluginEntries.contains(nonPluginEntry))

-		this.nonPluginEntries.add(nonPluginEntry);

-	}

-

-	/**

-	 * Removes an update site reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param discoverySiteInfo update site reference

-	 * @since 2.0

-	 */

-	public void removeDiscoverySiteEntryModel(URLEntryModel discoverySiteInfo) {

-		assertIsWriteable();

-		if (this.discoverySiteInfo != null)

-			this.discoverySiteInfo.remove(discoverySiteInfo);

-	}

-

-	/**

-	 * Removes a plug-in dependency entry.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param importEntry plug-in dependency entry

-	 * @since 2.0

-	 */

-	public void removeImportModel(ImportModel importEntry) {

-		assertIsWriteable();

-		if (this.imports != null)

-			this.imports.remove(importEntry);

-	}

-

-	/**

-	 * Removes a plug-in reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param pluginEntry plug-in reference

-	 * @since 2.0

-	 */

-	public void removePluginEntryModel(PluginEntryModel pluginEntry) {

-		assertIsWriteable();

-		if (this.pluginEntries != null)

-			this.pluginEntries.remove(pluginEntry);

-	}

-

-	/**

-	 * Removes a non-plug-in data reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param nonPluginEntry non-plug-in data reference

-	 * @since 2.0

-	 */

-	public void removeNonPluginEntryModel(NonPluginEntryModel nonPluginEntry) {

-		assertIsWriteable();

-		if (this.nonPluginEntries != null)

-			this.nonPluginEntries.remove(nonPluginEntry);

-	}

-

-	/**

-	 * Marks the model object as read-only.

-	 * 

-	 * @since 2.0

-	 */

-	public void markReadOnly() {

-		super.markReadOnly();

-		markReferenceReadOnly(getDescriptionModel());

-		markReferenceReadOnly(getCopyrightModel());

-		markReferenceReadOnly(getLicenseModel());

-		markReferenceReadOnly(getUpdateSiteEntryModel());

-		markListReferenceReadOnly(getDiscoverySiteEntryModels());

-		markListReferenceReadOnly(getImportModels());

-		markListReferenceReadOnly(getPluginEntryModels());

-		markListReferenceReadOnly(getNonPluginEntryModels());

-	}

-

-	/**

-	 * Resolve the model object.

-	 * Any URL strings in the model are resolved relative to the 

-	 * base URL argument. Any translatable strings in the model that are

-	 * specified as translation keys are localized using the supplied 

-	 * resource bundle.

-	 * 

-	 * @param base URL

-	 * @param bundleURL resource bundle url

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	public void resolve(URL base,URL bundleURL) throws MalformedURLException {

-		this.bundleURL = bundleURL;

-		this.base = base;

-

-		// plugin entry and nonpluginentry are optimized too

-		resolveListReference(getPluginEntryModels(), base, bundleURL);

-		resolveListReference(getNonPluginEntryModels(), base, bundleURL);

-		

-		//URLSiteModel are optimized

-		resolveReference(getDescriptionModel(),base, bundleURL);

-		resolveReference(getCopyrightModel(),base, bundleURL);

-		resolveReference(getLicenseModel(),base, bundleURL);

-		resolveReference(getUpdateSiteEntryModel(),base, bundleURL);

-		resolveListReference(getDiscoverySiteEntryModels(),base, bundleURL);

-		

-		// Import Models are optimized

-		resolveListReference(getImportModels(),base, bundleURL);

-	}

-

-	private void delayedResolve() {

-

-		// PERF: delay resolution

-		if (resolved)

-			return;

-

-		resolved = true;

-		// resolve local elements

-		localizedLabel = resolveNLString(bundleURL, label);

-		localizedProvider = resolveNLString(bundleURL, provider);

-		try {

-			imageURL = resolveURL(base,bundleURL, imageURLString);

-		} catch (MalformedURLException e){

-			UpdateCore.warn("",e); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * Method setPrimaryPlugin.

-	 * @param plugin

-	 */

-	public void setPrimaryPluginID(String plugin) {

-		if (primary && primaryPluginID == null) {

-			primaryPluginID = featureId;

-		}

-		primaryPluginID = plugin;

-	}

-	/**

-	 * Returns the primaryPluginID.

-	 * @return String

-	 */

-	public String getPrimaryPluginID() {

-		return primaryPluginID;

-	}

-

-	/**

-	 * Returns <code>true</code> if this feature is patching another feature,

-	 * <code>false</code> otherwise

-	 * @return boolean

-	 */

-	public boolean isPatch() {

-		ImportModel[] imports = getImportModels();

-

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

-			if (imports[i].isPatch())

-				return true;

-		}

-		return false;

-	}

-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
deleted file mode 100644
index 1608a21..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-import java.io.*;

-

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

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

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

-import org.xml.sax.*;

-

-/**

- * Default feature model factory.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead subclass the provided base implementation 

- * of this factory.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.BaseFeatureFactory

- * @since 2.0

- */

-

-public class FeatureModelFactory {

-

-

-	private static DefaultFeatureParser parser = new DefaultFeatureParser();

-

-	/**

-	 * Creates a default model factory.

-	 * 

-	 * @since 2.0

-	 */

-	public FeatureModelFactory() {

-		super();

-	}

-

-	/**

-	 * Creates and populates a default feature from stream.

-	 * The parser assumes the stream contains a default feature manifest

-	 * (feature.xml) as documented by the platform.

-	 * 

-	 * @param stream feature stream

-	 * @return populated feature model

-	 * @exception CoreException

-	 * @exception SAXException

-	 * @since 2.0

-	 */

-	public FeatureModel parseFeature(InputStream stream)

-		throws CoreException, SAXException {

-		parser.init(this);

-		FeatureModel featureModel = null;

-		try {

-			featureModel = parser.parse(stream);

-			if (parser.getStatus()!=null) {

-				// some internalError were detected

-				IStatus status = parser.getStatus();

-				throw new CoreException(status);

-			}

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("FeatureModelFactory.ErrorAccesingFeatureStream"), e); //$NON-NLS-1$

-		}

-		return featureModel;

-	}

-

-	/**

-	 * Create a default feature model.

-	 * 

-	 * @see FeatureModel

-	 * @return feature model

-	 * @since 2.0

-	 */

-	public FeatureModel createFeatureModel() {

-		return new FeatureModel();

-	}

-

-	/**

-	 * Create a default included feature reference model.

-	 * 

-	 * @see IncludedFeatureReferenceModel

-	 * @return feature model

-	 * @since 2.1

-	 */

-	public IncludedFeatureReferenceModel createIncludedFeatureReferenceModel() {

-		return new IncludedFeatureReferenceModel();

-	}

-

-

-	/**

-	 * Create a default install handler model.

-	 * 

-	 * @see InstallHandlerEntryModel

-	 * @return install handler entry model

-	 * @since 2.0

-	 */

-	public InstallHandlerEntryModel createInstallHandlerEntryModel() {

-		return new InstallHandlerEntryModel();

-	}

-

-	/**

-	 * Create a default import dependency model.

-	 * 

-	 * @see ImportModel

-	 * @return import dependency model

-	 * @since 2.0

-	 */

-	public ImportModel createImportModel() {

-		return new ImportModel();

-	}

-

-	/**

-	 * Create a default plug-in entry model.

-	 * 

-	 * @see PluginEntryModel

-	 * @return plug-in entry model

-	 * @since 2.0

-	 */

-	public PluginEntryModel createPluginEntryModel() {

-		return new PluginEntryModel();

-	}

-

-	/**

-	 * Create a default non-plug-in entry model.

-	 * 

-	 * @see NonPluginEntryModel

-	 * @return non-plug-in entry model

-	 * @since 2.0

-	 */

-	public NonPluginEntryModel createNonPluginEntryModel() {

-		return new NonPluginEntryModel();

-	}

-

-	/**

-	 * Create a default annotated URL model.

-	 * 

-	 * @see URLEntryModel

-	 * @return annotated URL model

-	 * @since 2.0

-	 */

-	public URLEntryModel createURLEntryModel() {

-		return new URLEntryModel();

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
deleted file mode 100644
index 6df2258..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
+++ /dev/null

@@ -1,422 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-import java.net.*;

-

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

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

-

-/**

- * Feature reference model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.FeatureReference

- * @since 2.0

- */

-public class FeatureReferenceModel extends ModelObject {

-

-	private String type;

-	private URL url;

-	private String urlString;

-	private String featureId;

-	private String featureVersion;

-	private SiteModel site;

-	private String label;

-	private String localizedLabel;

-

-	// performance

-	private URL bundleURL;

-	private URL base;

-	private boolean resolved = false;

-	private String os;

-	private String ws;

-	private String nl;

-	private String arch;

-	private String patch;	

-

-	/**

-	 * Creates an uninitialized feature reference model object.

-	 * 

-	 * @since 2.0

-	 */

-	public FeatureReferenceModel() {

-		super();

-	}

-

-	/**

-	 * Constructor FeatureReferenceModel.

-	 * @param ref

-	 */

-	public FeatureReferenceModel(FeatureReferenceModel ref) {

-		setFeatureIdentifier(ref.getFeatureIdentifier());

-		setFeatureVersion(ref.getFeatureVersion());

-		setType(ref.getType());

-		setSiteModel(ref.getSiteModel());

-		setLabel(ref.getLabel());

-		setWS(ref.getWS());

-		setOS(ref.getOS());

-		setArch(ref.getOSArch());

-		setNL(ref.getNL());

-	}

-

-	/**

-	 * Compares 2 feature reference models for equality

-	 *  

-	 * @param object feature reference model to compare with

-	 * @return <code>true</code> if the two models are equal, 

-	 * <code>false</code> otherwise

-	 * @since 2.0 

-	 */

-	public boolean equals(Object object) {

-

-		if (object == null)

-			return false;

-		if (getURL() == null)

-			return false;

-

-		if (!(object instanceof FeatureReferenceModel))

-			return false;

-

-		FeatureReferenceModel f = (FeatureReferenceModel) object;

-

-		return UpdateManagerUtils.sameURL(getURL(), f.getURL());

-	}

-

-	/**

-	 * Returns the referenced feature type.

-	 * 

-	 * @return feature type, or <code>null</code> representing the default

-	 * feature type for the site

-	 * @since 2.0

-	 */

-	public String getType() {

-		return type;

-	}

-

-	/**

-	 * Returns the site model for the reference.

-	 * 

-	 * @return site model

-	 * @since 2.0

-	 */

-	public SiteModel getSiteModel() {

-		return site;

-	}

-

-	/**

-	 * Returns the unresolved URL string for the reference.

-	 *

-	 * @return url string

-	 * @since 2.0

-	 */

-	public String getURLString() {

-		return urlString;

-	}

-

-	/**

-	 * Returns the resolved URL for the feature reference.

-	 * 

-	 * @return url string

-	 * @since 2.0

-	 */

-	public URL getURL() {

-		delayedResolve();

-		return url;

-	}

-

-	/**

-	 * Returns the feature identifier as a string

-	 * 

-	 * @see org.eclipse.update.core.IFeatureReference#getVersionedIdentifier()

-	 * @return feature identifier

-	 * @since 2.0

-	 */

-	public String getFeatureIdentifier() {

-		return featureId;

-	}

-

-	/**

-	 * Returns the feature version as a string

-	 * 

-	 * @see org.eclipse.update.core.IFeatureReference#getVersionedIdentifier()

-	 * @return feature version 

-	 * @since 2.0

-	 */

-	public String getFeatureVersion() {

-		return featureVersion;

-	}

-

-	/**

-	 * Sets the referenced feature type.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param type referenced feature type

-	 * @since 2.0

-	 */

-	public void setType(String type) {

-		assertIsWriteable();

-		this.type = type;

-	}

-

-	/**

-	 * Sets the site for the referenced.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param site site for the reference

-	 * @since 2.0

-	 */

-	public void setSiteModel(SiteModel site) {

-		assertIsWriteable();

-		this.site = site;

-	}

-

-	/**

-	 * Sets the unresolved URL for the feature reference.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param urlString unresolved URL string

-	 * @since 2.0

-	 */

-	public void setURLString(String urlString) {

-		assertIsWriteable();

-		this.urlString = urlString;

-		this.url = null;

-	}

-

-	/**

-	 * Sets the feature identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param featureId feature identifier

-	 * @since 2.0

-	 */

-	public void setFeatureIdentifier(String featureId) {

-		assertIsWriteable();

-		this.featureId = featureId;

-	}

-

-	/**

-	 * Sets the feature version.

-	 * Throws a runtime exception if this object is marked read-only.

-	 * 

-	 * @param featureVersion feature version

-	 * @since 2.0

-	 */

-	public void setFeatureVersion(String featureVersion) {

-		assertIsWriteable();

-		this.featureVersion = featureVersion;

-	}

-

-	/**

-	 * Resolve the model object.

-	 * Any URL strings in the model are resolved relative to the 

-	 * base URL argument. Any translatable strings in the model that are

-	 * specified as translation keys are localized using the supplied 

-	 * resource bundle.

-	 * 

-	 * @param base URL

-	 * @param bundleURL resource bundle URL

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	public void resolve(URL base,URL bundleURL) throws MalformedURLException {

-		this.base = base;

-		this.bundleURL = bundleURL;

-	}

-

-	private void delayedResolve() {

-

-		// PERF: delay resolution

-		if (resolved)

-			return;

-

-		resolved = true;

-		// resolve local elements

-		localizedLabel = resolveNLString(bundleURL, label);

-		try {

-			url = resolveURL(base, bundleURL, urlString);

-		} catch (MalformedURLException e){

-			UpdateCore.warn("",e); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * @see Object#toString()

-	 */

-	public String toString() {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(getClass().toString() + " :"); //$NON-NLS-1$

-		buffer.append(" at "); //$NON-NLS-1$

-		if (url != null)

-			buffer.append(url.toExternalForm());

-		return buffer.toString();

-	}

-

-	/**

-	 * @see org.eclipse.update.core.model.ModelObject#getPropertyName()

-	 */

-	protected String getPropertyName() {

-		return Site.SITE_FILE;

-	}

-	

-	/**

-	 * Retrieve the displayable label for the feature reference. If the model

-	 * object has been resolved, the label is localized.

-	 *

-	 * @return displayable label, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getLabel() {

-		delayedResolve();

-		if (localizedLabel != null)

-			return localizedLabel;

-		else

-			return label;

-	}

-

-	/**

-	 * Retrieve the non-localized displayable label for the feature reference.

-	 *

-	 * @return non-localized displayable label, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getLabelNonLocalized() {

-		return label;

-	}

-

-	/**

-	 * Sets the label.

-	 * @param label The label to set

-	 */

-	public void setLabel(String label) {

-		this.label = label;

-	}

-

-	/**

-	 * Get optional operating system specification as a comma-separated string.

-	 *

-	 * @return the operating system specification string, or <code>null</code>.

-	 * @since 2.1

-	 */

-	public String getOS() {

-		return os;

-	}

-

-

-	/**

-	 * Get optional windowing system specification as a comma-separated string.

-	 *

-	 * @return the windowing system specification string, or <code>null</code>.

-	 * @since 2.1

-	 */

-	public String getWS() {

-		return ws;

-	}

-

-

-	/**

-	 * Get optional system architecture specification as a comma-separated string.

-	 *

-	 * @return the system architecture specification string, or <code>null</code>.

-	 * @since 2.1

-	 */

-	public String getOSArch() {

-		return arch;

-	}

-

-

-	/**

-	 * Get optional locale specification as a comma-separated string.

-	 *

-	 * @return the locale specification string, or <code>null</code>.

-	 * @since 2.1

-	 */

-	public String getNL() {

-		return nl;

-	}

-

-	/**

-	 * Sets the operating system specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param os operating system specification as a comma-separated list

-	 * @since 2.1

-	 */

-	public void setOS(String os) {

-		assertIsWriteable();

-		this.os = os;

-	}

-

-

-	/**

-	 * Sets the windowing system specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param ws windowing system specification as a comma-separated list

-	 * @since 2.1

-	 */

-	public void setWS(String ws) {

-		assertIsWriteable();

-		this.ws = ws;

-	}

-

-

-	/**

-	 * Sets the locale specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param nl locale specification as a comma-separated list

-	 * @since 2.1

-	 */

-	public void setNL(String nl) {

-		assertIsWriteable();

-		this.nl = nl;

-	}

-

-

-	/**

-	 * Sets the system architecture specification.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param arch system architecture specification as a comma-separated list

-	 * @since 2.1

-	 */

-	public void setArch(String arch) {

-		assertIsWriteable();

-		this.arch = arch;

-	}

-

-	/**

-	 * Returns the patch mode.

-	 */

-	public String getPatch() {

-		return patch;

-	}

-

-

-	/**

-	 * Sets the patch mode.

-	 */

-	public void setPatch(String patch) {

-		this.patch = patch;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
deleted file mode 100644
index 2c1ce49..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
+++ /dev/null

@@ -1,278 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-/**

- * Plug-in dependency model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.Import

- * @since 2.0

- */

-public class ImportModel extends ModelObject {

-

-	private String id;

-	private String version;

-	private String matchingIdRuleName;

-	private String matchingRuleName;

-	private boolean featureImport;

-	private boolean patch;

-	private String osArch;

-	private String ws;

-	private String os;

-	private String nl;

-

-	/**

-	 * Creates a uninitialized plug-in dependency model object.

-	 * 

-	 * @since 2.0

-	 */

-	public ImportModel() {

-		super();

-	}

-

-	/**

-	 * Returns the dependent plug-in identifier.

-	 *

-	 * @deprecated use getIdentifier() instead

-	 * @return plug-in identifier, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getPluginIdentifier() {

-		return id;

-	}

-

-	/**

-	 * Returns the dependent identifier.

-	 *

-	 * @return  identifier, or <code>null</code>.

-	 * @since 2.0.2

-	 */

-	public String getIdentifier() {

-		return id;

-	}

-

-	/**

-	 * Returns the dependent plug-in version.

-	 *

-	 * @deprecated use getVersion() instead

-	 * @return plug-in version, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getPluginVersion() {

-		return version;

-	}

-

-	/**

-	 * Returns the dependent version.

-	 *

-	 * @return version, or <code>null</code>.

-	 * @since 2.0.2

-	 */

-	public String getVersion() {

-		return version;

-	}

-	

-	/**

-	 * Returns the dependent version matching rule name.

-	 *

-	 * @return matching rule name, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getMatchingRuleName() {

-		return matchingRuleName;

-	}

-	

-	/**

-	 * Returns the dependent id matching rule name.

-	 *

-	 * @return matching rule name, or <code>null</code>.

-	 * @since 2.1

-	 */

-	public String getMatchingIdRuleName() {

-		return matchingIdRuleName;

-	}

-

-	/**

-	 * Sets the dependent plug-in identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @deprecated use setIdentifier()

-	 * @param pluginId dependent plug-in identifier

-	 * @since 2.0

-	 */

-	public void setPluginIdentifier(String pluginId) {

-		assertIsWriteable();

-		this.id = pluginId;

-	}

-

-	/**

-	 * Sets the dependent plug-in version.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @deprecated use setVersion()

-	 * @param pluginVersion dependent plug-in version

-	 * @since 2.0

-	 */

-	public void setPluginVersion(String pluginVersion) {

-		assertIsWriteable();

-		this.version = pluginVersion;

-	}

-

-	/**

-	 * Sets the dependent identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param id dependent identifier

-	 * @since 2.0.2

-	 */

-	public void setIdentifier(String id) {

-		assertIsWriteable();

-		this.id = id;

-	}

-

-	/**

-	 * Sets the dependent version.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param version dependent version

-	 * @since 2.0.2

-	 */

-	public void setVersion(String version) {

-		assertIsWriteable();

-		this.version = version;

-	}

-	

-	/**

-	 * Sets the dependent version matching rule name. 

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param matchingRuleName dependent version matching rule.

-	 * @since 2.0

-	 */

-	public void setMatchingRuleName(String matchingRuleName) {

-		assertIsWriteable();

-		this.matchingRuleName = matchingRuleName;

-	}

-	/**

-	 * Sets the dependent id matching rule name. 

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param matchingIdRuleName dependent id matching rule.

-	 * @since 2.1

-	 */

-	public void setMatchingIdRuleName(String matchingIdRuleName) {

-		assertIsWriteable();

-		this.matchingIdRuleName = matchingIdRuleName;

-	}

-	/**

-	 * Returns the isFeatureImport.

-	 * @return boolean

-	 */

-	public boolean isFeatureImport() {

-		return featureImport;

-	}

-	

-	/**

-	 * Sets the featureImport.

-	 * @param featureImport The featureImport to set

-	 */

-	public void setFeatureImport(boolean featureImport) {

-		this.featureImport = featureImport;

-	}

-	

-	/**

-	 * Returns the patch mode.

-	 */

-	public boolean isPatch() {

-		return patch;

-	}

-	

-	/**

-	 * Sets the patch mode.

-	 */

-	public void setPatch(boolean patch) {

-		this.patch = patch;

-	}

-	/**

-	 * Returns the os.

-	 * @return String

-	 */

-	public String getOS() {

-		return os;

-	}

-

-	/**

-	 * Returns the osArch.

-	 * @return String

-	 */

-	public String getOSArch() {

-		return osArch;

-	}

-

-	/**

-	 * Returns the ws.

-	 * @return String

-	 */

-	public String getWS() {

-		return ws;

-	}

-

-	/**

-	 * Sets the os.

-	 * @param os The os to set

-	 */

-	public void setOS(String os) {

-		this.os = os;

-	}

-

-	/**

-	 * Sets the osArch.

-	 * @param osArch The osArch to set

-	 */

-	public void setOSArch(String osArch) {

-		this.osArch = osArch;

-	}

-

-	/**

-	 * Sets the ws.

-	 * @param ws The ws to set

-	 */

-	public void setWS(String ws) {

-		this.ws = ws;

-	}

-

-	/**

-	 * Returns the nl.

-	 * @return String

-	 */

-	public String getNL() {

-		return nl;

-	}

-

-	/**

-	 * Sets the nl.

-	 * @param nl The nl to set

-	 */

-	public void setNL(String nl) {

-		this.nl = nl;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
deleted file mode 100644
index b0348d4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
+++ /dev/null

@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core.model;
-
-import org.eclipse.update.core.*;
-
-
-/**
- * Included Feature reference model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most 
- * cases clients should instead instantiate or subclass the provided 
- * concrete implementation of this model.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.IncludedFeatureReference
- * @since 2.1
- */
-public class IncludedFeatureReferenceModel extends FeatureReference {
-
-	// since 2.0.2
-	private boolean isOptional;
-	private int searchLocation;
-	
-	// since 2.1
-	private String os;
-	private String ws;
-	private String arch;
-	private String nl;
-	
-	/**
-	 * Construct a included feature reference
-	 * 
-	 * @since 2.1
-	 */
-	public IncludedFeatureReferenceModel() {
-		super();
-		isOptional(false);
-		setSearchLocation(IUpdateConstants.SEARCH_ROOT);
-	}
-	
-	
-	
-	/**
-	 * Construct a included feature reference model
-	 * 
-	 * @param includedFeatureRef the included reference model to copy
-	 * @since 2.1
-	 */
-	public IncludedFeatureReferenceModel(IncludedFeatureReferenceModel includedFeatureRef) {
-		super((FeatureReferenceModel)includedFeatureRef);
-		isOptional(includedFeatureRef.isOptional());
-		setLabel(includedFeatureRef.getLabel());
-		setSearchLocation(includedFeatureRef.getSearchLocation());
-		setArch(includedFeatureRef.getOSArch());
-		setWS(includedFeatureRef.getWS());
-		setOS(includedFeatureRef.getOS());
-	}
-
-	/**
-	 * Constructor IncludedFeatureReferenceModel.
-	 * @param featureReference
-	 */
-	public IncludedFeatureReferenceModel(IFeatureReference featureReference) {
-		super((FeatureReferenceModel)featureReference);
-		isOptional(false);
-		setSearchLocation(IUpdateConstants.SEARCH_ROOT);
-		setLabel(getLabel());		
-	}
-
-	/**
-	 * Returns the matching rule for this included feature.
-	 * The rule will determine the ability of the included feature to move version 
-	 * without causing the overall feature to appear broken.
-	 * 
-	 * The default is <code>MATCH_PERFECT</code>
-	 * 
-	 * @see IImport#RULE_PERFECT
-	 * @see IImport#RULE_EQUIVALENT
-	 * @see IImport#RULE_COMPATIBLE
-	 * @see IImport#RULE_GREATER_OR_EQUAL
-	 * @return int representation of feature matching rule.
-	 * @since 2.0.2
-	 * @deprecated since 3.0 included feature version is exactly specified
-	 */
-	public int getMatch(){
-		return Import.RULE_PERFECT;
-	}
-
-	/**
-	 * Returns the search location for this included feature.
-	 * The location will be used to search updates for this feature.
-	 * 
-	 * The default is <code>SEARCH_ROOT</code>
-	 * 
-	 * @see IUpdateConstants#SEARCH_ROOT
-	 * @see IUpdateConstants#SEARCH_SELF
-	 * @return int representation of feature searching rule.
-	 * @since 2.0.2
-	 */
-
-	public int getSearchLocation(){
-		return searchLocation;
-	}
-	
-
-
-	/**
-	 * Returns the isOptional
-	 * 
-	 * @return isOptional
-	 * @since 2.0.1
-	 */
-	public boolean isOptional() {
-		return isOptional;
-	}
-
-
-	
-
-	/**
-	 * Sets the isOptional.
-	 * @param isOptional The isOptional to set
-	 */
-	public void isOptional(boolean isOptional) {
-		this.isOptional = isOptional;
-	}
-
-	/**
-	 * Sets the matchingRule.
-	 * @param matchingRule The matchingRule to set
-	 * @deprecated since 3.0 included feature version is exactly specified
-	 */
-	public void setMatchingRule(int matchingRule) {
-	}
-
-	/**
-	 * Sets the searchLocation.
-	 * @param searchLocation The searchLocation to set
-	 */
-	public void setSearchLocation(int searchLocation) {
-		this.searchLocation = searchLocation;
-	}
-
-	/**
-	 * Returns the arch.
-	 * @return String
-	 */
-	public String getOSArch() {
-		return arch;
-	}
-
-	/**
-	 * Returns the os.
-	 * @return String
-	 */
-	public String getOS() {
-		return os;
-	}
-
-	/**
-	 * Returns the ws.
-	 * @return String
-	 */
-	public String getWS() {
-		return ws;
-	}
-
-	/**
-	 * Sets the arch.
-	 * @param arch The arch to set
-	 */
-	public void setArch(String arch) {
-		this.arch = arch;
-	}
-
-	/**
-	 * Sets the os.
-	 * @param os The os to set
-	 */
-	public void setOS(String os) {
-		this.os = os;
-	}
-
-	/**
-	 * Sets the ws.
-	 * @param ws The ws to set
-	 */
-	public void setWS(String ws) {
-		this.ws = ws;
-	}
-
-	/**
-	 * Returns the nl.
-	 * @return String
-	 */
-	public String getNL() {
-		return nl;
-	}
-
-	/**
-	 * Sets the nl.
-	 * @param nl The nl to set
-	 */
-	public void setNL(String nl) {
-		this.nl = nl;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
deleted file mode 100644
index de0d1a9..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.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.core.model;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Exception thrown when the user cancelled an installation.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public class InstallAbortedException extends CoreException {
-
-	/**
-	 * Construct the exception indicating enclosing CoreException
-	 * 
-	 * @since 2.0
-	 */
-	public InstallAbortedException(String msg,Exception e) {
-		super(new Status(IStatus.INFO,"org.eclipse.update.core",IStatus.OK,msg,e)); //$NON-NLS-1$
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
deleted file mode 100644
index 02dd088..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core.model;
-
-import java.net.*;
-
-/**
- * Install handler entry model object.
- * An object which represents the definition of a custom install handler
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most 
- * cases clients should instead instantiate or subclass the provided 
- * concrete implementation of this model.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.InstallHandlerEntry
- * @since 2.0
- */
-public class InstallHandlerEntryModel extends ModelObject {
-
-	private String urlString;
-	private URL url;
-	private String library;
-	private String name;
-
-	/**
-	 * Creates a uninitialized install handler entry model object.
-	 * 
-	 * @since 2.0
-	 */
-	public InstallHandlerEntryModel() {
-		super();
-	}
-
-	/**
-	 * Returns the URL string used for browser-triggered installation handling.
-	 *
-	 * @return url string or <code>null</code>
-	 * @since 2.0
-	 */
-	public String getURLString() {
-		return urlString;
-	}
-
-	/**
-	 * Returns the resolved URL used for browser-triggered installation handling.
-	 * 
-	 * @return url, or <code>null</code>
-	 * @since 2.0
-	 */
-	public URL getURL() {
-		return url;
-	}
-
-	/**
-	 * Returns the name of the custom installer library.
-	 *
-	 * @return library path, or <code>null</code>
-	 * @since 2.0
-	 */
-	public String getLibrary() {
-		return library;
-	}
-
-	/**
-	 * Returns the name of the custom installer.
-	 *
-	 * @return handler name, or <code>null</code>
-	 * @since 2.0
-	 */
-	public String getHandlerName() {
-		return name;
-	}
-
-	/**
-	 * Sets URL string used for browser-triggered installation handling.
-	 * Throws a runtime exception if this object is marked read-only.
-	 *
-	 * @param urlString trigget page URL string, may be <code>null</code>.
-	 * @since 2.0
-	 */
-	public void setURLString(String urlString) {
-		assertIsWriteable();
-		this.urlString = urlString;
-		this.url = null;
-	}
-
-	/**
-	 * Sets the custom install handler library name.
-	 * Throws a runtime exception if this object is marked read-only.
-	 *
-	 * @param library name, may be <code>null</code>.
-	 * @since 2.0
-	 */
-	public void setLibrary(String library) {
-		assertIsWriteable();
-		this.library = library;
-	}
-
-	/**
-	 * Sets the name of the custom install handler.
-	 * Throws a runtime exception if this object is marked read-only.
-	 *
-	 * @param name name of the install handler, may be <code>null</code>.
-	 * @since 2.0
-	 */
-	public void setHandlerName(String name) {
-		assertIsWriteable();
-		this.name = name;
-	}
-
-	/**
-	 * Resolve the model object.
-	 * Any URL strings in the model are resolved relative to the 
-	 * base URL argument. Any translatable strings in the model that are
-	 * specified as translation keys are localized using the supplied 
-	 * resource bundle.
-	 * 
-	 * @param base URL
-	 * @param bundleURL resource bundle URL
-	 * @exception MalformedURLException
-	 * @since 2.0
-	 */
-	public void resolve(URL base,URL bundleURL)
-		throws MalformedURLException {
-		// resolve local elements
-		url = resolveURL(base,bundleURL, urlString);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
deleted file mode 100644
index 10fded3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.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.update.core.model;

-

-/**

- * Exception thrown when the type of the site discovered in the site manifest

- * does not correspond to the type expected by the concrete site factory.

- * 

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.model.SiteModelFactory#canParseSiteType(String)

- * @since 2.0

- */

-

-public class InvalidSiteTypeException extends Exception {

-

-	private String newSiteType;

-

-	/**

-	 * Construct the exception indicating the detected site type

-	 * 

-	 * @since 2.0

-	 */

-	public InvalidSiteTypeException(String newType) {

-		super();

-		newSiteType = newType;

-	}

-

-	/**

-	 * Returns the site type detected in the parsed site manifest

-	 * 

-	 * @return site type

-	 * @since 2.0

-	 */

-	public String getNewType() {

-		return newSiteType;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
deleted file mode 100644
index 6a62c1c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
+++ /dev/null

@@ -1,382 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-import java.lang.reflect.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

-

-/**

- * Root model object. Extended by all model objects.

- * <p>

- * This class cannot be instantiated and must be subclassed.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- */

-public abstract class ModelObject extends PlatformObject {

-

-	private boolean readOnly = false;

-

-	private static final String KEY_PREFIX = "%"; //$NON-NLS-1$

-	private static final String KEY_DOUBLE_PREFIX = KEY_PREFIX + KEY_PREFIX;

-

-	private static Map bundles;

-

-	/**

-	 * Creates a base model object.

-	 * 

-	 * @since 2.0

-	 */

-	protected ModelObject() {

-	}

-

-	/**

-	 * Checks that this model object is writeable.  A runtime exception

-	 * is thrown if it is not.

-	 * 

-	 * @since 2.0

-	 */

-	protected final void assertIsWriteable() {

-		Assert.isTrue(!isReadOnly(), Policy.bind("ModelObject.ModelReadOnly"));	//$NON-NLS-1$

-	}

-

-	/**

-	 * Sets this model object and all of its descendents to be read-only.

-	 * Subclasses may extend this implementation.

-	 * 

-	 * @see #isReadOnly

-	 * @since 2.0

-	 */

-	public void markReadOnly() {

-		readOnly = true;

-	}

-

-	/**

-	 * Returns whether or not this model object is read-only.

-	 * 

-	 * @return <code>true</code> if this model object is read-only,

-	 *		<code>false</code> otherwise

-	 * @see #markReadOnly

-	 * @since 2.0

-	 */

-	public boolean isReadOnly() {

-		return readOnly;

-	}

-

-	/**

-	 * Delegate setting of read-only

-	 *

-	 * @param o object to delegate to. Must be of type ModelObject.

-	 * @see #isReadOnly

-	 * @since 2.0

-	 */

-	protected void markReferenceReadOnly(ModelObject o) {

-		if (o == null)

-			return;

-		o.markReadOnly();

-	}

-

-	/**

-	 * Delegate setting of read-only

-	 *

-	 * @param o object array to delegate to. Each element must be of type ModelObject.

-	 * @see #isReadOnly

-	 * @since 2.0

-	 */

-	protected void markListReferenceReadOnly(ModelObject[] o) {

-		if (o == null)

-			return;

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

-			o[i].markReadOnly();

-		}

-	}

-

-	/**

-	 * Resolve the model element. This method allows any relative URL strings

-	 * to be resolved to actual URL. It also allows any translatable strings

-	 * to be localized.

-	 * 

-	 * Subclasses need to override this method to perform the actual resolution.

-	 * @param base base URL.

-	 * @param bundleURL resource bundle URL.

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	public void resolve(URL base, URL bundleURL) throws MalformedURLException {

-		return;

-	}

-

-	/**

-	 * Delegate resolution to referenced model

-	 *

-	 * @param o object to delegate to. Must be of type ModelObject.

-	 * @param url base URL.

-	 * @param bundleURL resource bundle URL.

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	protected void resolveReference(ModelObject o, URL url, URL bundleURL) throws MalformedURLException {

-		if (o == null)

-			return;

-		o.resolve(url, bundleURL);

-	}

-

-	/**

-	 * Delegate resolution to list of referenced models

-	 *

-	 * @param o object array to delegate to. Each element must be of type ModelObject.

-	 * @param url base URL.

-	 * @param bundleURL resource bundle URL.

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	protected void resolveListReference(ModelObject[] o, URL url, URL bundleURL) throws MalformedURLException {

-		if (o == null)

-			return;

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

-			o[i].resolve(url, bundleURL);

-		}

-	}

-

-	/**

-	 * Resolve a URL based on context

-	 *

-	 * @param context base URL.

-	 * @param bundleURL resource bundle URL.

-	 * @param urlString url string from model.

-	 * @return URL, or <code>null</code>.

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	protected URL resolveURL(URL context, URL bundleURL, String urlString) throws MalformedURLException {

-

-		// URL string was not specified

-		if (urlString == null || urlString.trim().equals("")) //$NON-NLS-1$

-			return null;

-

-		// check to see if we have NL-sensitive URL

-		String resolvedUrlString = resolveNLString(bundleURL, urlString);

-

-		resolvedUrlString = resolvePlatfromConfiguration(resolvedUrlString);

-

-		// if we don't have a base url, use only the supplied string

-		if (context == null)

-			return new URL(resolvedUrlString);

-

-		// otherwise return new URL in context of base URL

-		return new URL(context, resolvedUrlString);

-	}

-	/**

-	 * Resolves the URL based on platfrom Configuration

-	 * $os$\$ws$\license.txt will become

-	 * win32\win32\license.txt on a system where os=win32 and ws=win32

-	 * 

-	 * @param resolvedUrlString

-	 * @return String

-	 */

-	private String resolvePlatfromConfiguration(String resolvedUrlString) {

-		int osIndex = resolvedUrlString.indexOf("$os$"); //$NON-NLS-1$

-		if (osIndex != -1)

-			return getExtendedString(resolvedUrlString);

-

-		int wsIndex = resolvedUrlString.indexOf("$ws$"); //$NON-NLS-1$

-		if (wsIndex != -1)

-			return getExtendedString(resolvedUrlString);

-

-		int nlIndex = resolvedUrlString.indexOf("$nl$"); //$NON-NLS-1$

-		if (nlIndex != -1)

-			return getExtendedString(resolvedUrlString);

-

-		int archIndex = resolvedUrlString.indexOf("$arch$"); //$NON-NLS-1$

-		if (archIndex != -1)

-			return getExtendedString(resolvedUrlString);

-

-		return resolvedUrlString;

-	}

-

-	private String getExtendedString(String resolvedUrlString) {

-		IPath path = new Path(resolvedUrlString);

-		path = getExpandedPath(path);

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS) {

-			UpdateCore.warn("Resolved :" + resolvedUrlString + " as:" + path.toOSString()); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-

-		return path.toOSString();

-	}

-

-	private IPath getExpandedPath(IPath path) {

-		String first = path.segment(0);

-		if (first != null) {

-			IPath rest = getExpandedPath(path.removeFirstSegments(1));

-			if (first.equals("$ws$")) { //$NON-NLS-1$

-				path = new Path(SiteManager.getWS()).append(rest);

-			} else if (first.equals("$os$")) { //$NON-NLS-1$

-				path = new Path(SiteManager.getOS()).append(rest);

-			} else if (first.equals("$nl$")) { //$NON-NLS-1$

-				path = new Path(SiteManager.getNL()).append(rest);

-			} else if (first.equals("$arch$")) { //$NON-NLS-1$

-				path = new Path(SiteManager.getOSArch()).append(rest);

-			}

-		}

-		return path;

-	}

-

-	/**

-	 * Returns a resource string corresponding to the given argument 

-	 * value and bundle.

-	 * If the argument value specifies a resource key, the string

-	 * is looked up in the given resource bundle. If the argument does not

-	 * specify a valid key, the argument itself is returned as the

-	 * resource string. The key lookup is performed against the

-	 * specified resource bundle. If a resource string 

-	 * corresponding to the key is not found in the resource bundle

-	 * the key value, or any default text following the key in the

-	 * argument value is returned as the resource string.

-	 * A key is identified as a string begining with the "%" character.

-	 * Note that the "%" character is stripped off prior to lookup

-	 * in the resource bundle.

-	 * <p>

-	 * For example, assume resource bundle plugin.properties contains

-	 * name = Project Name

-	 * <pre>

-	 *     resolveNLString(b,"Hello World") returns "Hello World"</li>

-	 *     resolveNLString(b,"%name") returns "Project Name"</li>

-	 *     resolveNLString(b,"%name Hello World") returns "Project Name"</li>

-	 *     resolveNLString(b,"%abcd Hello World") returns "Hello World"</li>

-	 *     resolveNLString(b,"%abcd") returns "%abcd"</li>

-	 *     resolveNLString(b,"%%name") returns "%name"</li>

-	 * </pre>

-	 * </p>

-	 * 

-	 * @param bundleURL resource bundle url.

-	 * @param string translatable string from model

-	 * @return string, or <code>null</code>

-	 * @since 2.0

-	 */

-	protected String resolveNLString(URL bundleURL, String string) {

-

-		if (string == null)

-			return null;

-

-		String s = string.trim();

-

-		if (s.equals("")) //$NON-NLS-1$

-			return string;

-

-		if (!s.startsWith(KEY_PREFIX))

-			return string;

-

-		if (s.startsWith(KEY_DOUBLE_PREFIX))

-			return s.substring(1);

-

-		int ix = s.indexOf(" "); //$NON-NLS-1$

-		String key = ix == -1 ? s : s.substring(0, ix);

-		String dflt = ix == -1 ? s : s.substring(ix + 1);

-

-		ResourceBundle b = getResourceBundle(bundleURL);

-

-		if (b == null)

-			return dflt;

-

-		try {

-			return b.getString(key.substring(1));

-		} catch (MissingResourceException e) {

-			return dflt;

-		}

-	}

-

-	/**

-	 * Returns a concrete array type for the elements of the specified

-	 * list. The method assumes all the elements of the list are the same

-	 * concrete type as the first element in the list.

-	 * 

-	 * @param l list

-	 * @return concrete array type, or <code>null</code> if the array type

-	 * could not be determined (the list is <code>null</code> or empty)

-	 * @since 2.0

-	 */

-	protected Object[] arrayTypeFor(List l) {

-		if (l == null || l.size() == 0)

-			return null;

-		return (Object[]) Array.newInstance(l.get(0).getClass(), 0);

-	}

-

-	/**

-	 * Returns a concrete array type for the elements of the specified

-	 * set. The method assumes all the elements of the set are the same

-	 * concrete type as the first element in the set.

-	 * 

-	 * @param s set

-	 * @return concrete array type, or <code>null</code> if the array type

-	 * could not be determined (the set is <code>null</code> or empty)

-	 * @since 2.0

-	 */

-	protected Object[] arrayTypeFor(Set s) {

-		if (s == null || s.size() == 0)

-			return null;

-		Iterator i = s.iterator();

-		return (Object[]) Array.newInstance(i.next().getClass(), 0);

-	}

-

-	/**

-		* Helper method to access resouce bundle for feature. The default 

-		* implementation attempts to load the appropriately localized 

-		* feature.properties file.

-		* 

-		* @param url base URL used to load the resource bundle.

-		* @return resource bundle, or <code>null</code>.

-		* @since 2.0

-		*/

-	protected ResourceBundle getResourceBundle(URL url) {

-

-		if (url == null)

-			return null;

-

-		if (bundles == null) {

-			bundles = new HashMap();

-		} else {

-			ResourceBundle bundle = (ResourceBundle) bundles.get(url.toExternalForm());

-			if (bundle != null)

-				return bundle;

-		}

-

-		ResourceBundle bundle = null;

-		try {

-			url = UpdateManagerUtils.asDirectoryURL(url);

-			ClassLoader l = new URLClassLoader(new URL[] { url }, null);

-			bundle = ResourceBundle.getBundle(getPropertyName(), Locale.getDefault(), l);

-			bundles.put(url.toExternalForm(), bundle);

-		} catch (MissingResourceException e) {

-			UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$

-		} catch (MalformedURLException e) {

-			UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$

-		}

-		return bundle;

-	}

-

-	/**

-	 * Method getPropertyName.

-	 * @return String

-	 */

-	protected String getPropertyName() {

-		return Feature.FEATURE_FILE;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
deleted file mode 100644
index 68c56ae..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.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.core.model;

-

-/**

- * Non-plug-in entry model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.NonPluginEntry

- * @since 2.0

- */

-public class NonPluginEntryModel extends ContentEntryModel {

-

-	private String id = null;

-

-	/**

-	 * Creates a uninitialized non-plug-in entry model object.

-	 * 

-	 * @since 2.0

-	 */

-	public NonPluginEntryModel() {

-		super();

-	}

-

-	/**

-	 * Returns the entry identifier.

-	 *

-	 * @return entry identifier, or <code>null</code>

-	 * @since 2.0

-	 */

-	public String getIdentifier() {

-		return id;

-	}

-

-	/**

-	 * Sets the entry identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param id entry identifier.

-	 * @since 2.0

-	 */

-	public void setIdentifier(String id) {

-		assertIsWriteable();

-		this.id = id;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
deleted file mode 100644
index 59154d0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-

-/**

- * Plug-in entry model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.PluginEntry

- * @since 2.0

- */

-public class PluginEntryModel extends ContentEntryModel {

-

-	private String pluginId;

-	private String pluginVersion;

-	private boolean isFragment = false;

-	private boolean unpack = true;

-	

-	/**

-	 * Creates a uninitialized plug-in entry model object.

-	 * 

-	 * @since 2.0

-	 */

-	public PluginEntryModel() {

-		super();

-	}

-

-	/**

-	 * Compares two plug-in models for equality

-	 * 

-	 * @param obj other model to compare to

-	 * @return <code>true</code> if the models are equal, <code>false</code> otherwise

-	 * @since 2.0

-	 */

-	public boolean equals(Object obj) {

-		if (!(obj instanceof PluginEntryModel))

-			return false;

-		PluginEntryModel model = (PluginEntryModel) obj;

-		

-		return (

-			(getPluginIdentifier().equals(model.getPluginIdentifier()))

-				&& (getPluginVersion().equals(model.getPluginVersion()))

-				&& (isFragment() == model.isFragment()));

-	}

-

-	/**

-	 * Returns the plug-in identifier for this entry.

-	 * 

-	 * @return the plug-in identifier, or <code>null</code>

-	 * @since 2.0 

-	 */

-	public String getPluginIdentifier() {

-		return pluginId;

-	}

-

-	/**

-	 * Returns the plug-in version for this entry.

-	 * 

-	 * @return the plug-in version, or <code>null</code>

-	 * @since 2.0 

-	 */

-	public String getPluginVersion() {

-		return pluginVersion;

-	}

-

-	/**

-	 * Indicates whether the entry describes a full plug-in, or 

-	 * a plug-in fragment.

-	 * 

-	 * @return <code>true</code> if the entry is a plug-in fragment, 

-	 * <code>false</code> if the entry is a plug-in

-	 * @since 2.0 

-	 */

-	public boolean isFragment() {

-		return isFragment;

-	}

-

-	/**

-	 * Sets the entry plug-in identifier.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param pluginId the entry identifier.

-	 * @since 2.0

-	 */

-	public void setPluginIdentifier(String pluginId) {

-		assertIsWriteable();

-		this.pluginId = pluginId;

-	}

-

-	/**

-	 * Sets the entry plug-in version.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param pluginVersion the entry version.

-	 * @since 2.0

-	 */

-	public void setPluginVersion(String pluginVersion) {

-		assertIsWriteable();

-		this.pluginVersion = pluginVersion;

-	}

-

-	/**

-	 * Indicates whether this entry represents a fragment or plug-in.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param isFragment fragment setting

-	 * @since 2.0

-	 */

-	public void isFragment(boolean isFragment) {

-		assertIsWriteable();

-		this.isFragment = isFragment;

-	}

-

-	/**

-	 * @return Indicates whether plugin should be unpacked during installation

-	 * or can run from a jar

-	 * @since 3.0

-	 */

-	public boolean isUnpack() {

-		// TODO this is a candidate for IPluginEntry API

-		return unpack;

-	}

-	/**

-	 * @param unpack Sets whether plugin should be unpacked during installation

-	 * or can run from a jar

-	 * @since 3.0

-	 *

-	 */

-	public void setUnpack(boolean unpack) {

-		// TODO this is a candidate for IPluginEntry API

-		assertIsWriteable();

-		this.unpack = unpack;

-	}

-

-	/**

-	 * @see Object#toString()

-	 */

-	public String toString() {

-		String msg = (getPluginIdentifier()!=null)?getPluginIdentifier().toString():""; //$NON-NLS-1$

-		msg += getPluginVersion()!=null?" "+getPluginVersion().toString():""; //$NON-NLS-1$ //$NON-NLS-2$

-		msg += isFragment()?" fragment":" plugin"; //$NON-NLS-1$ //$NON-NLS-2$

-		return msg;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
deleted file mode 100644
index da1ad07..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
+++ /dev/null

@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core.model;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.model.*;
-
-/**
- * Site model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most 
- * cases clients should instead instantiate or subclass the provided 
- * concrete implementation of this model.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.core.Site
- * @since 2.0
- */
-public class SiteModel extends ModelObject {
-
-	private String type;
-	private URLEntryModel description;
-	private List /*of FeatureReferenceModel*/
-	featureReferences;
-	private List /*of ArchiveReferenceModel*/
-	archiveReferences;
-	private Set /*of CategoryModel*/
-	categories;
-	private String locationURLString;
-	private URL locationURL;
-	private ConfiguredSiteModel configuredSiteModel;
-
-	/**
-	 * Creates an uninitialized site model object.
-	 * 
-	 * @since 2.0
-	 */
-	public SiteModel() {
-		super();
-	}
-
-	/** 
-	 * Returns the site type.
-	 * 
-	 * @return site type, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * Returns the site description.
-	 * 
-	 * @return site description, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public URLEntryModel getDescriptionModel() {
-		return description;
-	}
-
-	/**
-	 * Returns an array of feature reference models on this site.
-	 * 
-	 * @return an array of feature reference models, or an empty array.
-	 * @since 2.0
-	 */
-	public SiteFeatureReferenceModel[] getFeatureReferenceModels() {
-		if (featureReferences == null)
-			return new SiteFeatureReferenceModel[0];
-
-		return (SiteFeatureReferenceModel[]) featureReferences.toArray(arrayTypeFor(featureReferences));
-	}
-
-	/**
-	 * Returns an array of plug-in and non-plug-in archive reference models
-	 * on this site
-	 * 
-	 * @return an array of archive reference models, or an empty array if there are
-	 * no archives known to this site.
-	 * @since 2.0
-	 */
-	public ArchiveReferenceModel[] getArchiveReferenceModels() {
-		if (archiveReferences == null)
-			return new ArchiveReferenceModel[0];
-
-		return (ArchiveReferenceModel[]) archiveReferences.toArray(arrayTypeFor(archiveReferences));
-	}
-
-	/**
-	 * Returns an array of category models for this site.
-	 * 
-	 * @return array of site category models, or an empty array.
-	 * @since 2.0
-	 */
-	public CategoryModel[] getCategoryModels() {
-		if (categories == null || categories.size()==0)
-			return new CategoryModel[0];
-
-		return (CategoryModel[]) categories.toArray(arrayTypeFor(categories));
-	}
-
-	/**
-	 * Returns the unresolved URL string for the site.
-	 *
-	 * @return url string, or <code>null</code>
-	 * @since 2.0
-	 */
-	public String getLocationURLString() {
-		return locationURLString;
-	}
-
-	/**
-	 * Returns the resolved URL for the site.
-	 * 
-	 * @return url, or <code>null</code>
-	 * @since 2.0
-	 */
-	public URL getLocationURL() {
-		return locationURL;
-	}
-
-	/**
-	 * Sets the site type.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param type site type
-	 * @since 2.0
-	 */
-	public void setType(String type) {
-		assertIsWriteable();
-		this.type = type;
-	}
-
-	/**
-	 * Sets the site description.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param description site description
-	 * @since 2.0
-	 */
-	public void setDescriptionModel(URLEntryModel description) {
-		assertIsWriteable();
-		this.description = description;
-	}
-
-	/**
-	 * Sets the feature references for this site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param featureReferences an array of feature reference models
-	 * @since 2.0
-	 */
-	public void setFeatureReferenceModels(FeatureReferenceModel[] featureReferences) {
-		assertIsWriteable();
-		if (featureReferences == null)
-			this.featureReferences = null;
-		else
-			this.featureReferences = new ArrayList(Arrays.asList(featureReferences));
-	}
-
-	/**
-	 * Sets the archive references for this site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param archiveReferences an array of archive reference models
-	 * @since 2.0
-	 */
-	public void setArchiveReferenceModels(ArchiveReferenceModel[] archiveReferences) {
-		assertIsWriteable();
-		if (archiveReferences == null)
-			this.archiveReferences = null;
-		else
-			this.archiveReferences = new ArrayList(Arrays.asList(archiveReferences));
-	}
-
-	/**
-	 * Sets the site categories.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param categories an array of category models
-	 * @since 2.0
-	 */
-	public void setCategoryModels(CategoryModel[] categories) {
-		assertIsWriteable();
-		if (categories == null)
-			this.categories = null;
-		else {
-			this.categories = new TreeSet(CategoryModel.getComparator());
-			this.categories.addAll(Arrays.asList(categories));
-		}
-	}
-
-	/**
-	 * Sets the unresolved URL for the site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param locationURLString url for the site (as a string)
-	 * @since 2.0
-	 */
-	public void setLocationURLString(String locationURLString) {
-		assertIsWriteable();
-		this.locationURLString = locationURLString;
-	}
-
-	/**
-	 * Adds a feature reference model to site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param featureReference feature reference model
-	 * @since 2.0
-	 */
-	public void addFeatureReferenceModel(SiteFeatureReferenceModel featureReference) {
-		assertIsWriteable();
-		if (this.featureReferences == null)
-			this.featureReferences = new ArrayList();
-		// PERF: do not check if already present 
-		//if (!this.featureReferences.contains(featureReference))
-			this.featureReferences.add(featureReference);
-	}
-
-	/**
-	 * Adds an archive reference model to site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param archiveReference archive reference model
-	 * @since 2.0
-	 */
-	public void addArchiveReferenceModel(ArchiveReferenceModel archiveReference) {
-		assertIsWriteable();
-		if (this.archiveReferences == null)
-			this.archiveReferences = new ArrayList();
-		if (!this.archiveReferences.contains(archiveReference))
-			this.archiveReferences.add(archiveReference);
-	}
-
-	/**
-	 * Adds a category model to site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param category category model
-	 * @since 2.0
-	 */
-	public void addCategoryModel(CategoryModel category) {
-		assertIsWriteable();
-		if (this.categories == null)
-			this.categories = new TreeSet(CategoryModel.getComparator());
-		if (!this.categories.contains(category))
-			this.categories.add(category);
-	}
-
-	/**
-	 * Removes a feature reference model from site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param featureReference feature reference model
-	 * @since 2.0
-	 */
-	public void removeFeatureReferenceModel(FeatureReferenceModel featureReference) {
-		assertIsWriteable();
-		if (this.featureReferences != null)
-			this.featureReferences.remove(featureReference);
-	}
-
-	/**
-	 * Removes an archive reference model from site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param archiveReference archive reference model
-	 * @since 2.0
-	 */
-	public void removeArchiveReferenceModel(ArchiveReferenceModel archiveReference) {
-		assertIsWriteable();
-		if (this.archiveReferences != null)
-			this.archiveReferences.remove(archiveReference);
-	}
-
-	/**
-	 * Removes a category model from site.
-	 * Throws a runtime exception if this object is marked read-only.
-	 * 
-	 * @param category category model
-	 * @since 2.0
-	 */
-	public void removeCategoryModel(CategoryModel category) {
-		assertIsWriteable();
-		if (this.categories != null)
-			this.categories.remove(category);
-	}
-
-	/**
-	 * Marks the model object as read-only.
-	 * 
-	 * @since 2.0
-	 */
-	public void markReadOnly() {
-		super.markReadOnly();
-		markReferenceReadOnly(getDescriptionModel());
-		markListReferenceReadOnly(getFeatureReferenceModels());
-		markListReferenceReadOnly(getArchiveReferenceModels());
-		markListReferenceReadOnly(getCategoryModels());
-	}
-
-	/**
-	 * Resolve the model object.
-	 * Any URL strings in the model are resolved relative to the 
-	 * base URL argument. Any translatable strings in the model that are
-	 * specified as translation keys are localized using the supplied 
-	 * resource bundle.
-	 * 
-	 * @param base URL
-	 * @param bundleURL resource bundle URL
-	 * @exception MalformedURLException
-	 * @since 2.0
-	 */
-	public void resolve(URL base, URL bundleURL) throws MalformedURLException {
-
-		// Archives and feature are relative to location URL
-		// if the Site element has a URL tag: see spec	
-		locationURL = resolveURL(base, bundleURL, getLocationURLString());
-		if (locationURL == null)
-			locationURL = base;
-		resolveListReference(getFeatureReferenceModels(), locationURL, bundleURL);
-		resolveListReference(getArchiveReferenceModels(), locationURL, bundleURL);
-
-		resolveReference(getDescriptionModel(), base, bundleURL);
-		resolveListReference(getCategoryModels(), base, bundleURL);
-	}
-
-	/**
-	 * 
-	 */
-	public ConfiguredSiteModel getConfiguredSiteModel() {
-		return this.configuredSiteModel;
-	}
-
-	/**
-	 * 
-	 */
-	public void setConfiguredSiteModel(ConfiguredSiteModel configuredSiteModel) {
-		this.configuredSiteModel = configuredSiteModel;
-	}
-
-	/**
-	 * @see org.eclipse.update.core.model.ModelObject#getPropertyName()
-	 */
-	protected String getPropertyName() {
-		return Site.SITE_FILE;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
deleted file mode 100644
index 78d5745..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-import java.io.*;

-

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

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

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

-import org.xml.sax.*;

-

-/**

- * Default site model factory.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead subclass the provided base implementation 

- * of this factory.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.BaseSiteFactory

- * @since 2.0

- */

-public class SiteModelFactory {

-	

-	private static DefaultSiteParser parser = new DefaultSiteParser();

-

-	/**

-	 * Creates a default site factory.

-	 * 

-	 * @since 2.0

-	 */

-	public SiteModelFactory() {

-		super();

-	}

-

-	/**

-	 * Indicates whether this factory can handle the specified site type. This

-	 * method is intended to be overridden by subclasses.

-	 * 

-	 * @param type site type identifier

-	 * @return <code>true</code> if the type can be handled, otherwise <code>false</code>

-	 * @since 2.0

-	 */

-	public boolean canParseSiteType(String type) {

-		// return true if type was not specified (ie. is null or empty string)

-		return (type == null || type.trim().equals("")); //$NON-NLS-1$

-	}

-

-	/**

-	 * Creates and populates a default site from stream.

-	 * The parser assumes the stream contains a default site manifest

-	 * (site.xml) as documented by the platform.

-	 * 

-	 * @param stream site stream

-	 * @return populated site model

-	 * @exception CoreException

-	 * @exception InvalidSiteTypeException

-	 * @since 2.0

-	 */

-	public SiteModel parseSite(InputStream stream)

-		throws CoreException, InvalidSiteTypeException {

-		SiteModel result = null;

-		try {

-			parser.init(this);

-			result = parser.parse(stream);

-			if (parser.getStatus()!=null) {

-				// some internalError were detected

-				IStatus status = parser.getStatus();

-				throw new CoreException(status);

-			}

-		} catch (SAXException e) {

-			// invalid Site type

-			if (e.getException() instanceof InvalidSiteTypeException) {

-				throw (InvalidSiteTypeException) e.getException();

-			}

-

-			throw Utilities.newCoreException(Policy.bind("SiteModelObject.ErrorParsingSiteStream"),e); //$NON-NLS-1$

-		} catch (IOException e){

-			throw Utilities.newCoreException(Policy.bind("SiteModelObject.ErrorAccessingSiteStream"),e); //$NON-NLS-1$

-		}

-		return result;

-	}

-

-	/**

-	 * Create a default site model.

-	 * 

-	 * @see SiteModel

-	 * @return site model

-	 * @since 2.0

-	 */

-	public SiteModel createSiteMapModel() {

-		return new SiteModel();

-	}

-

-	/**

-	 * Create a default site feature reference model.

-	 * 

-	 * @see SiteFeatureReferenceModel

-	 * @return site feature reference model

-	 * @since 2.0

-	 */

-	public SiteFeatureReferenceModel createFeatureReferenceModel() {

-		return new SiteFeatureReferenceModel();

-	}

-

-	/**

-	 * Create a default archive reference model.

-	 * 

-	 * @see ArchiveReferenceModel

-	 * @return archive reference model

-	 * @since 2.0

-	 */

-	public ArchiveReferenceModel createArchiveReferenceModel() {

-		return new ArchiveReferenceModel();

-	}

-

-	/**

-	 * Create a default annotated URL model.

-	 * 

-	 * @see URLEntryModel

-	 * @return annotated URL model

-	 * @since 2.0

-	 */

-	public URLEntryModel createURLEntryModel() {

-		return new URLEntryModel();

-	}

-

-	/**

-	 * Create a default category model.

-	 * 

-	 * @see CategoryModel

-	 * @return category model

-	 * @since 2.0

-	 */

-	public CategoryModel createSiteCategoryModel() {

-		return new CategoryModel();

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
deleted file mode 100644
index 7f81e6c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core.model;

-

-import java.net.*;

-

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

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

-

-/**

- * Annotated URL model object.

- * <p>

- * This class may be instantiated or subclassed by clients. However, in most 

- * cases clients should instead instantiate or subclass the provided 

- * concrete implementation of this model.

- * </p>

- * <p>

- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to

- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback

- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken

- * (repeatedly) as the API evolves.

- * </p>

- * @see org.eclipse.update.core.URLEntry

- * @since 2.0

- */

-

-public class URLEntryModel extends ModelObject {

-	

-	private String annotation;

-	private String localizedAnnotation;

-	private String urlString;

-	private URL url;

-	

-	private int type = IURLEntry.UPDATE_SITE;

-	

-	//performance

-	private URL bundleURL;

-	private URL base;

-	private boolean resolved=false;

-	

-	/**

-	 * Creates a uninitialized annotated URL model object.

-	 * 

-	 * @since 2.0

-	 */

-	public URLEntryModel() {

-		super();

-	}

-		

-	/**

-	 * Returns the url annotation. If the model object has been resolved, 

-	 * the annotation is localized.

-	 * 

-	 * @return url annotation, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getAnnotation() {

-		delayedResolve();

-		if (localizedAnnotation != null)

-			return localizedAnnotation;

-		else

-			return annotation;

-	}

-		

-	/**

-	 * returns the non-localized url annotation.

-	 * 

-	 * @return non-localized url annotation, or <code>null</code>.

-	 * @since 2.0

-	 */

-	public String getAnnotationNonLocalized() {

-		return annotation;

-	}

-

-	/**

-	 * Returns the unresolved url string.

-	 *

-	 * @return url string, or <code>null</code>

-	 * @since 2.0

-	 */

-	public String getURLString() {

-		delayedResolve();

-		return urlString;

-	}

-	

-	/**

-	 * Returns the resolved URL.

-	 * 

-	 * @return url, or <code>null</code>

-	 * @since 2.0

-	 */

-	public URL getURL() {

-		delayedResolve();

-		return url;

-	}

-	

-	/**

-	 * Sets the annotation.

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param annotation annotation

-	 * @since 2.0

-	 */	

-	public void setAnnotation(String annotation) {

-		assertIsWriteable();

-		this.annotation = annotation;

-		this.localizedAnnotation = null;

-	}

-	

-	/**

-	 * Sets the url string

-	 * Throws a runtime exception if this object is marked read-only.

-	 *

-	 * @param urlString url string

-	 * @since 2.0

-	 */	

-	public void setURLString(String urlString) {

-		assertIsWriteable();

-		this.urlString = urlString;

-		this.url = null;

-	}

-	

-	/**

-	 * Resolve the model object.

-	 * Any URL strings in the model are resolved relative to the 

-	 * base URL argument. Any translatable strings in the model that are

-	 * specified as translation keys are localized using the supplied 

-	 * resource bundle.

-	 * 

-	 * @param base URL

-	 * @param bundleURL  resource bundle url

-	 * @exception MalformedURLException

-	 * @since 2.0

-	 */

-	public void resolve(URL base, URL bundleURL) throws MalformedURLException {

-		this.base = base;

-		this.bundleURL = bundleURL;

-	}

-

-

-	private void delayedResolve() {

-		

-		//PERF: delay resolution

-		if (resolved)return;

-		

-		resolved= true;

-		// resolve local elements

-		localizedAnnotation = resolveNLString(bundleURL, annotation);

-		try {

-			url = resolveURL(base,bundleURL, urlString);

-		} catch (MalformedURLException e){

-			UpdateCore.warn("",e); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * Returns the specified type.

-	 * 

-	 * @since 2.1

-	 */

-	public int getType() {

-		return type;

-	}

-

-	/**

-	 * Method setType.

-	 * @param i

-	 */

-	public void setType(int i) {

-		type = i;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
deleted file mode 100644
index c8a665d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
+++ /dev/null

@@ -1,23 +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.72 [en] (Windows NT 5.0; U) [Netscape]">

-   <title>Package-level Javadoc</title>

-</head>

-<body>

-Provides model support for extending the base installation

-and update services.

-<h2>

-Package Specification</h2>

-This package provides a convenience implementation of the default model

-objects and parsers used for writing pluggable support of alternate feature

-packaging schemes and update site access mechanisms. In general, most developers

-do not need to directly use the classes defined in this package. Instead,

-they can use the corresponding derived implementation classes contained

-in package <b>org.eclipse.update.core</b>.

-<p>Classes in this package would typically only be used directly when writing

-and alternate set of model objects for a feature and type implementation.

-</body>

-</html>


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
deleted file mode 100644
index 6c41140..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
+++ /dev/null

@@ -1,25 +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.72 [en] (Windows NT 5.0; U) [Netscape]">

-   <title>Package-level Javadoc</title>

-</head>

-<body>

-Provides support for extending the base installation

-and update services.

-<h2>

-Package Specification</h2>

-This package specifies the API required for writing pluggable support of

-alternate feature packaging schemes and update site access mechanisms.

-For the most part, the classes and interfaces in this package implement

-a code pattern <tt>class Foo extends FooModel implements IFoo</tt>. The

-interface (<tt>IFoo</tt> in the pattern) defines the actual API. The convenience

-classes (<tt>Foo</tt> in the pattern) provide a reference implementation

-of the API based on a model (<tt>IFooModel</tt> in the pattern) contained

-in package <b>org.eclipse.update.core.model</b>. In general, developers

-should extend the convenience classes rather than completely reimplementing

-the specified interfaces.

-</body>

-</html>


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
deleted file mode 100644
index 8bc804c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.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.internal.core;

- 

-/**

- * <code>Assert</code> is useful for for embedding runtime sanity checks

- * in code. The static predicate methods all test a condition and throw some

- * type of unchecked exception if the condition does not hold.

- * <p>

- * Assertion failure exceptions, like most runtime exceptions, are

- * thrown when something is misbehaving. Assertion failures are invariably

- * unspecified behavior; consequently, clients should never rely on

- * these being thrown (or not thrown). <b>If you find yourself in the

- * position where you need to catch an assertion failure, you have most 

- * certainly written your program incorrectly.</b>

- * </p>

- */

-public final class Assert {

-	

-	/**

-	 * <code>AssertionFailedException</code> is a runtime exception thrown

-	 * by some of the methods in <code>Assert</code>.

-	 * <p>

-	 * This class is not declared public to prevent some misuses; programs that catch 

-	 * or otherwise depend on assertion failures are susceptible to unexpected

-	 * breakage when assertions in the code are added or removed.

-	 * </p>

-	 */

-	private static class AssertionFailedException extends RuntimeException {

-

-		/**

-		 * Constructs a new exception.

-		 */

-		public AssertionFailedException() {

-		}

-		

-		/**

-		 * Constructs a new exception with the given message.

-		 */

-		public AssertionFailedException(String detail) {

-		    super(detail);

-		}

-	}

-/* This class is not intended to be instantiated. */

-private Assert() {

-}

-/**

- * Asserts that an argument is legal. If the given boolean is

- * not <code>true</code>, an <code>IllegalArgumentException</code>

- * is thrown.

- *

- * @param expression the outcome of the check

- * @return <code>true</code> if the check passes (does not return

- *    if the check fails)

- * @exception IllegalArgumentException if the legality test failed

- */

-public static boolean isLegal(boolean expression) {

-	// succeed as quickly as possible

-	if (expression) {

-		return true;

-	}

-	return isLegal(expression, "");//$NON-NLS-1$

-}

-/**

- * Asserts that an argument is legal. If the given boolean is

- * not <code>true</code>, an <code>IllegalArgumentException</code>

- * is thrown.

- * The given message is included in that exception, to aid debugging.

- *

- * @param expression the outcome of the check

- * @param message the message to include in the exception

- * @return <code>true</code> if the check passes (does not return

- *    if the check fails)

- * @exception IllegalArgumentException if the legality test failed

- */

-public static boolean isLegal(boolean expression, String message) {

-	if (!expression)

-		throw new IllegalArgumentException(message);

-	return expression;

-}

-/**

- * Asserts that the given object is not <code>null</code>. If this

- * is not the case, some kind of unchecked exception is thrown.

- * <p>

- * As a general rule, parameters passed to API methods must not be

- * <code>null</code> unless <b>explicitly</b> allowed in the method's

- * specification. Similarly, results returned from API methods are never

- * <code>null</code> unless <b>explicitly</b> allowed in the method's

- * specification. Implementations are encouraged to make regular use of 

- * <code>Assert.isNotNull</code> to ensure that <code>null</code> 

- * parameters are detected as early as possible.

- * </p>

- * Method throws an unspecified unchecked exception if the object

- *   is <code>null</code>

- * @param object the value to test

- */

-public static void isNotNull(Object object) {

-	// succeed as quickly as possible

-	if (object != null) {

-		return;

-	}

-	isNotNull(object, "");//$NON-NLS-1$

-}

-/**

- * Asserts that the given object is not <code>null</code>. If this

- * is not the case, some kind of unchecked exception is thrown.

- * The given message is included in that exception, to aid debugging.

- * <p>

- * As a general rule, parameters passed to API methods must not be

- * <code>null</code> unless <b>explicitly</b> allowed in the method's

- * specification. Similarly, results returned from API methods are never

- * <code>null</code> unless <b>explicitly</b> allowed in the method's

- * specification. Implementations are encouraged to make regular use of 

- * <code>Assert.isNotNull</code> to ensure that <code>null</code> 

- * parameters are detected as early as possible.

- * </p>

- * An unspecified unchecked exception is thrown if the object

- *   is <code>null</code>

- * @param object the value to test

- * @param message the message to include in the exception

- */

-public static void isNotNull(Object object, String message) {

-	if (object == null)

-		throw new AssertionFailedException("null argument;" + message);//$NON-NLS-1$

-}

-/**

- * Asserts that the given boolean is <code>true</code>. If this

- * is not the case, some kind of unchecked exception is thrown.

- *

- * @param expression the outcome of the check

- * @return <code>true</code> if the check passes (does not return

- *    if the check fails)

- */

-public static boolean isTrue(boolean expression) {

-	// succeed as quickly as possible

-	if (expression) {

-		return true;

-	}

-	return isTrue(expression, "");//$NON-NLS-1$

-}

-/**

- * Asserts that the given boolean is <code>true</code>. If this

- * is not the case, some kind of unchecked exception is thrown.

- * The given message is included in that exception, to aid debugging.

- *

- * @param expression the outcome of the check

- * @param message the message to include in the exception

- * @return <code>true</code> if the check passes (does not return

- *    if the check fails)

- */

-public static boolean isTrue(boolean expression, String message) {

-	if (!expression)

-		throw new AssertionFailedException("assertion failed; "+message);//$NON-NLS-1$

-	return expression;

-}

-}

-

-


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
deleted file mode 100644
index 3cd8498..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.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.update.internal.core;

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

-import org.eclipse.update.internal.model.*;

-/**

- * 

- */

-public class BaseSiteLocalFactory {

-	/*

-	 * 

-	 */

-	public InstallConfigurationModel createInstallConfigurationModel() {

-		return new InstallConfiguration();

-	}

-	/*

-	 * 

-	 */

-	public ConfigurationActivityModel createConfigurationActivityModel() {

-		return new ConfigurationActivity();

-	}

-	/*

-	 * 

-	 */

-	public ConfiguredSiteModel createConfigurationSiteModel() {

-		return new ConfiguredSite();

-	}

-	/*

-	 * 

-	 */

-	public ConfigurationPolicyModel createConfigurationPolicyModel() {

-		return new ConfigurationPolicy();

-	}

-	/**

-	 * 

-	 */

-	public ConfiguredSiteModel createConfigurationSiteModel(SiteModel site, int policy) {

-		//create config site

-		ConfiguredSiteModel configSite = this.createConfigurationSiteModel();

-		configSite.setSiteModel(site);

-		ConfigurationPolicyModel policyModel = this.createConfigurationPolicyModel();

-		policyModel.setPolicy(policy);

-		configSite.setConfigurationPolicyModel(policyModel);

-		((ConfigurationPolicy) policyModel).setConfiguredSiteModel(configSite);

-		return configSite;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
deleted file mode 100644
index 2e353a1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-

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

-import org.eclipse.update.internal.model.*;

-public class ConfigurationActivity

-	extends ConfigurationActivityModel

-	implements IActivity, IWritable {

-		

-	/**

-	 * Default constructor

-	 */		

-	public ConfigurationActivity() {

-	}

-	

-	/**

-	 * Constructor with action

-	 */

-	public ConfigurationActivity(int action) {

-		super();

-		setAction(action);

-		setStatus(STATUS_NOK);

-	}

-	

-	/*

-	 * @see IWritable#write(int, PrintWriter)

-	 */

-	public void write(int indent, PrintWriter w) {

-//		String gap= ""; //$NON-NLS-1$

-//		for (int i= 0; i < indent; i++)

-//			gap += " "; //$NON-NLS-1$

-//		String increment= ""; //$NON-NLS-1$

-//		for (int i= 0; i < IWritable.INDENT; i++)

-//			increment += " "; //$NON-NLS-1$

-//			

-//		// ACTIVITY	

-//		w.print(gap + "<" + InstallConfigurationParser.ACTIVITY + " ");

-//		//$NON-NLS-1$ //$NON-NLS-2$

-//		w.println("action=\"" + getAction() + "\" "); //$NON-NLS-1$ //$NON-NLS-2$

-//		if (getLabel() != null) {

-//			w.println(gap + increment+ "label=\"" + UpdateManagerUtils.Writer.xmlSafe(getLabel()) + "\" ");

-//			//$NON-NLS-1$ //$NON-NLS-2$

-//		}

-//		w.println(gap + increment+"date=\"" + getDate().getTime() + "\" ");

-//		//$NON-NLS-1$ //$NON-NLS-2$

-//		w.println(gap + increment+"status=\"" + getStatus() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$

-//

-//		// end

-//		w.println(gap + "</" + InstallConfigurationParser.ACTIVITY + ">");

-//		//$NON-NLS-1$ //$NON-NLS-2$

-//		w.println(""); //$NON-NLS-1$		

-	}

-	

-	/*

-	 * @see IActivity#getInstallConfiguration()

-	 */

-	public IInstallConfiguration getInstallConfiguration() {

-		return (IInstallConfiguration) getInstallConfigurationModel();

-	}

-	

-	public boolean equals(Object other) {

-		if (!(other instanceof ConfigurationActivity))

-			return false;

-		if (this == other)

-			return true;

-		

-		ConfigurationActivity activity = (ConfigurationActivity) other;

-		return getAction() == activity.getAction()

-				&& getLabel().equals(activity.getLabel())

-				&& getStatus() == activity.getStatus();

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
deleted file mode 100644
index 5e14307..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
+++ /dev/null

@@ -1,512 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

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

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

-import org.eclipse.update.internal.model.*;

-

-/**

- * 

- */

-public class ConfigurationPolicy extends ConfigurationPolicyModel {

-

-	/**

-	 * Constructor for ConfigurationPolicyModel.

-	 */

-	public ConfigurationPolicy() {

-	}

-

-	/**

-	 * Copy Constructor for ConfigurationPolicyModel.

-	 */

-	public ConfigurationPolicy(ConfigurationPolicy configPolicy) {

-		super();

-		setPolicy(configPolicy.getPolicy());

-		setConfiguredFeatureReferences(configPolicy.getConfiguredFeatures());

-		setUnconfiguredFeatureReferences(configPolicy.getUnconfiguredFeatures());

-		setConfiguredSiteModel(configPolicy.getConfiguredSiteModel());

-	}

-

-	/**

-	 * @since 2.0

-	 */

-	private boolean isUnconfigured(IFeatureReference featureReference) {

-

-		if (featureReference == null)

-			return false;

-

-		// returns true if the feature is part of the configured list

-		IFeatureReference[] refs = getUnconfiguredFeatures();

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

-			if (featureReference.equals(refs[i])) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @since 2.0

-	 */

-	public boolean isConfigured(IFeatureReference featureReference) {

-

-		if (featureReference == null)

-			return false;

-

-		// returns true if the feature is part of the configured list

-		IFeatureReference[] refs = getConfiguredFeatures();

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

-			if (featureReference.equals(refs[i])) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * adds the feature to the list of features if the policy is USER_INCLUDE

-	 */

-	public void configure(IFeatureReference featureReference, boolean callInstallHandler, boolean createActivity) throws CoreException {

-

-		if (isConfigured(featureReference)) // already configured

-			return;

-

-		if (featureReference == null) {

-			UpdateCore.warn("The feature reference to configure is null"); //$NON-NLS-1$

-			return;

-		}

-

-		IFeature feature = null;

-		try {

-			feature = featureReference.getFeature(null);

-		} catch (CoreException e) {

-			if (!UpdateManagerUtils.isOptional(featureReference)) {

-				URL url = featureReference.getURL();

-				String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>"; //$NON-NLS-1$

-				UpdateCore.warn("Error retrieving feature:" + urlString, e); //$NON-NLS-1$

-				return;

-			}

-		}

-		if (feature == null) {

-			URL url = featureReference.getURL();

-			String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>"; //$NON-NLS-1$

-			UpdateCore.warn("The feature to unconfigure is null: feature reference is:" + urlString); //$NON-NLS-1$

-		}

-

-		// Setup optional install handler

-		InstallHandlerProxy handler = null;

-		if (callInstallHandler && feature.getInstallHandlerEntry() != null)

-			handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_CONFIGURE, feature, feature.getInstallHandlerEntry(), null);

-		boolean success = false;

-		Throwable originalException = null;

-

-		// do the configure action

-		try {

-			if (handler != null)

-				handler.configureInitiated();

-

-			ConfigurationActivity activity = null;

-			if (createActivity) {

-				activity = new ConfigurationActivity(IActivity.ACTION_CONFIGURE);

-				activity.setLabel(feature.getVersionedIdentifier().toString());

-				activity.setDate(new Date());

-			}

-

-			addConfiguredFeatureReference((FeatureReferenceModel) featureReference);

-

-			// everything done ok

-			if (activity != null) {

-				InstallConfiguration installConfig = (InstallConfiguration) SiteManager.getLocalSite().getCurrentConfiguration();

-				activity.setStatus(IActivity.STATUS_OK);

-				installConfig.addActivity(activity);

-			}

-

-			if (handler != null)

-				handler.completeConfigure();

-

-			success = true;

-		} catch (Throwable t) {

-			originalException = t;

-		} finally {

-			Throwable newException = null;

-			try {

-				if (handler != null)

-					handler.configureCompleted(success);

-			} catch (Throwable t) {

-				newException = t;

-			}

-			if (originalException != null) // original exception wins

-				throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), originalException); //$NON-NLS-1$

-			if (newException != null)

-				throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), newException); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * check if the plugins to unconfigure are required by other configured feature and

-	 * adds the feature to the list of unconfigured features 

-	 */

-	public boolean unconfigure(IFeatureReference featureReference, boolean callInstallHandler, boolean createActivity) throws CoreException {

-

-		if (isUnconfigured(featureReference)) {

-			UpdateCore.warn("Feature already unconfigured"); //$NON-NLS-1$

-			return true;

-		}

-

-		if (featureReference == null) {

-			UpdateCore.warn("The feature reference to unconfigure is null"); //$NON-NLS-1$

-			return false;

-		}

-

-		IFeature feature = null;

-		try {

-			feature = featureReference.getFeature(null);

-		} catch (CoreException e) {

-			if (!UpdateManagerUtils.isOptional(featureReference)) {

-				URL url = featureReference.getURL();

-				String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>"; //$NON-NLS-1$

-				UpdateCore.warn("Error retrieving feature:" + urlString, e); //$NON-NLS-1$

-				return false;

-			}

-		}

-

-		if (feature == null) {

-			URL url = featureReference.getURL();

-			String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>"; //$NON-NLS-1$

-			UpdateCore.warn("The feature to unconfigure is null: feature reference is:" + urlString); //$NON-NLS-1$

-			return false;

-		}

-

-		// Setup optional install handler

-		InstallHandlerProxy handler = null;

-		if (callInstallHandler && feature.getInstallHandlerEntry() != null) {

-			handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_UNCONFIGURE, feature, feature.getInstallHandlerEntry(), null);

-		}

-

-		boolean success = false;

-		Throwable originalException = null;

-

-		// do the unconfigure action

-		try {

-

-			ConfigurationActivity activity = null;

-			if (createActivity) {

-				activity = new ConfigurationActivity(IActivity.ACTION_UNCONFIGURE);

-				activity.setLabel(feature.getVersionedIdentifier().toString());

-				activity.setDate(new Date());

-			}

-

-			InstallConfiguration installConfig = null;

-

-			// only ask for install config is activity created.

-			// prevents loops during reconciliation

-			if (activity != null)

-				installConfig = ((InstallConfiguration) SiteManager.getLocalSite().getCurrentConfiguration());

-

-			// Allow unconfigure if the feature is optional from all the parents

-			// or if the feature is mandatory and non of its parent are configured

-			// removed, not a core issue (so deep down)

-			//if (validateNoConfiguredParents(feature)) {

-			if (handler != null)

-				handler.unconfigureInitiated();

-			addUnconfiguredFeatureReference((FeatureReferenceModel) featureReference);

-			if (handler != null)

-				handler.completeUnconfigure();

-

-			// everything done ok

-			if (activity != null) {

-				activity.setStatus(IActivity.STATUS_OK);

-				installConfig.addActivity(activity);

-			}

-			success = true;

-			//} else {

-			//	if (activity != null) {

-			//		activity.setStatus(IActivity.STATUS_NOK);

-			//		installConfig.addActivityModel((ConfigurationActivityModel) activity);

-			//	}

-			//}

-		} catch (Throwable t) {

-			originalException = t;

-		} finally {

-			Throwable newException = null;

-			try {

-				if (handler != null)

-					handler.unconfigureCompleted(success);

-			} catch (Throwable t) {

-				newException = t;

-			}

-			if (originalException != null) // original exception wins

-				throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), originalException); //$NON-NLS-1$

-			if (newException != null)

-				throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), newException); //$NON-NLS-1$

-		}

-

-		if (!success) {

-			URL url = featureReference.getURL();

-			String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>"; //$NON-NLS-1$

-			UpdateCore.warn("Unable to unconfigure:" + urlString); //$NON-NLS-1$

-		}

-		return success;

-	}

-

-	/**

-	 * Calculates the plugin list for the policy. For "INCLUDE" policy, this

-	 * corresponds to the plugins for configured features. For "EXCLUDE"

-	 * policy, this corresponds to the plugins for unconfigured features that

-	 * are not referenced by any configured features.

-	 */

-	public String[] getPluginPath(ISite site) throws CoreException {

-		String[] pluginPaths;

-		// Note: Since 3.0M7 we leave patched features configured,

-		// and take this into account when computing configured plugins

-		// all unconfigured features. Note that patched features are still

-		// configured

-		IFeatureReference[] unconfiguredFeatures = getUnconfiguredFeatures();

-		// all configured features, including patches and patched features

-		IFeatureReference[] configuredFeatures = getConfiguredFeatures();

-		if (!isEnabled()) {

-			if (getPolicy() == IPlatformConfiguration.ISitePolicy.USER_INCLUDE) {

-				// disabled site, INCLUDE policy

-				pluginPaths = new String[0];

-			} else {

-				// disabled site, EXCLUDE policy

-				pluginPaths = getAllKnownPluginStrings(site,

-						configuredFeatures, unconfiguredFeatures);

-			}

-		} else {

-			// PatchedFeatures (may have no patches) with corresponding patches

-			PatchedFeature[] patchedFeatures = buildPatchedFeatures(configuredFeatures);

-			if (getPolicy() == IPlatformConfiguration.ISitePolicy.USER_INCLUDE) {

-				// enabled site, INCLUDE policy

-				pluginPaths = getConfiguredPluginStrings(site, patchedFeatures);

-			} else {

-				// enabled site, EXCLUDE policy - the usual scenario for local

-				// site.

-				// return all known MINUS configured plugins

-				pluginPaths = subtract(getAllKnownPluginStrings(site,

-						configuredFeatures, unconfiguredFeatures),

-						getConfiguredPluginStrings(site, patchedFeatures));

-			}

-		}

-		//TRACE

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {

-			UpdateCore

-					.debug("GetPluginPath for: " //$NON-NLS-1$

-							+ ((site == null) ? "<No site>" : site.getURL() //$NON-NLS-1$

-									.toString()));

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

-				UpdateCore.debug("To write:" + pluginPaths[i]); //$NON-NLS-1$

-			}

-		}

-		return pluginPaths;

-	}

-	

-	/**

-	 * Obtains PatchedFeatures - non patch features with corresponding patches if any

-	 * 

-	 * @param features

-	 *            array of features to operate with

-	 * @return Patches

-	 */

-	private PatchedFeature[] buildPatchedFeatures(IFeatureReference[] features) {

-		// PatchedFeatures by VersionedIdentifier

-		Map map = new HashMap();

-		// Create a map of features (not patches)

-		for (int f = 0; f < features.length; f++) {

-			IFeatureReference featureRef = features[f];

-			try {

-				if(featureRef.isPatch()){

-					continue;

-				}

-				VersionedIdentifier vi = featureRef.getVersionedIdentifier();

-				map.put(vi, new PatchedFeature(features[f]));

-			} catch (CoreException e) {

-				UpdateCore.warn(null, e);

-			}

-		}

-		// attach patches to features

-		for (int f = 0; f < features.length; f++) {

-			IFeatureReference patchCandidate = features[f];

-			try {

-				IFeature feature = patchCandidate.getFeature(null);

-				IImport[] imports = feature.getImports();

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

-					IImport oneImport = imports[i];

-					if (!oneImport.isPatch())

-						continue;

-					// it is a patch for

-					VersionedIdentifier patchedIdentifier =

-						oneImport.getVersionedIdentifier();

-					PatchedFeature pf=(PatchedFeature) map.get(patchedIdentifier);

-					if (pf!=null) {

-						pf.addPatch(patchCandidate);

-					} else {

-						// patched feature not enabled

-					}

-				}

-			} catch (CoreException e) {

-				UpdateCore.warn(null, e);

-			}

-		}

-		Collection patchedFeatures=map.values();

-		return (PatchedFeature[])patchedFeatures.toArray(new PatchedFeature[patchedFeatures.size()]);

-	}

-	

-	/**

-	 * @since 2.0

-	 */

-	public IFeatureReference[] getConfiguredFeatures() {

-		FeatureReferenceModel[] result = getConfiguredFeaturesModel();

-		if (result.length == 0)

-			return new IFeatureReference[0];

-		else

-			return (IFeatureReference[]) result;

-	}

-

-	/**

-	 * @since 2.0

-	 */

-	public IFeatureReference[] getUnconfiguredFeatures() {

-		FeatureReferenceModel[] result = getUnconfiguredFeaturesModel();

-		if (result.length == 0)

-			return new IFeatureReference[0];

-		else

-			return (IFeatureReference[]) result;

-	}

-

-	/**

-	 * Gets the configuredSite.

-	 * @return Returns a IConfiguredSite

-	 */

-	public IConfiguredSite getConfiguredSite() {

-		return (IConfiguredSite) getConfiguredSiteModel();

-	}

-

-	/**

-	 * removes a feature reference

-	 */

-	public void removeFeatureReference(IFeatureReference featureRef) {

-		if (featureRef instanceof FeatureReferenceModel) {

-			removeFeatureReference((FeatureReferenceModel) featureRef);

-		}

-	}

-

-	/**

-	 * @return an array of plugin path for the array of feature reference. For

-	 *         features that have patches, plugin path will

-	 *         point to plugin with the same ID provided by the patch if it

-	 *         exists. Each plugin path only appears once [bug 21750]

-	 */

-	private String[] getConfiguredPluginStrings(ISite site, PatchedFeature[] features) throws CoreException {

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION){

-			UpdateCore.warn("CONFIGURED PLUGINS"); //$NON-NLS-1$

-		}

-	

-		// Use set to eliminate plugins with same ID and version.

-		// Different versions of plugins with same ID are allowed if coming from different features

-		Set featurePlugins = new HashSet();

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

-			FeaturePlugin[] plugins = features[i].getPlugins();

-			featurePlugins.addAll(Arrays.asList(plugins));

-		}

-		Set pluginStrings = getPluginStrings(site, (FeaturePlugin[]) featurePlugins.toArray(new FeaturePlugin[featurePlugins.size()]));

-		return (String[]) pluginStrings.toArray(new String[pluginStrings.size()]);

-	}

-	/**

-	 * @return an array of plugin path for every plugin in known features

-	 */

-	private String[] getAllKnownPluginStrings(ISite site, IFeatureReference[] configured,IFeatureReference[] unconfigured) throws CoreException {

-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION){

-			UpdateCore.warn("ALL PLUGINS"); //$NON-NLS-1$

-		}

-		// Add features, patched features, or patches

-		IFeatureReference[] all=new IFeatureReference[configured.length+unconfigured.length];

-		System.arraycopy(configured, 0, all, 0, configured.length);

-		System.arraycopy(unconfigured, 0, all, configured.length, unconfigured.length);

-		//

-		Set patchedPlugins = new HashSet();

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

-			try {

-				IFeature feature = all[i].getFeature(null);

-				if (feature == null) {

-					UpdateCore.warn("Null Feature", new Exception()); //$NON-NLS-1$

-					continue;

-				}

-

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

-				// add every plugin to the map

-				for (int entr = 0; entr < entries.length; entr++) {

-					patchedPlugins.add(new FeaturePlugin(entries[entr], feature));

-				}

-

-			} catch (CoreException e) {

-				UpdateCore.warn(null, e);

-			}

-		}

-		Set pluginStrings = getPluginStrings(site,  (FeaturePlugin[])patchedPlugins.toArray(new FeaturePlugin[patchedPlugins.size()]));

-		return (String[]) pluginStrings.toArray(new String[pluginStrings.size()]);

-	}

-	/**

-	 * @param site

-	 * @param plugins[]

-	 * @return valid string pointing to plugins in given features

-	 * @throws CoreException

-	 */

-	private Set getPluginStrings(ISite site, FeaturePlugin[] plugins) throws CoreException {

-		Set pluginStrings=new HashSet();

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

-			IPluginEntry entry = plugins[i].getEntry();

-			IFeature feature=plugins[i].getFeature();

-

-			// obtain the path of the plugin directories on the site

-			ContentReference[] featureContentReference = null;

-			try {

-				featureContentReference = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(entry, null /*IProgressMonitor*/

-				);

-			} catch (CoreException e) {

-				UpdateCore.warn(null, e);

-			}

-

-			// transform into a valid String

-			if (featureContentReference != null) {

-				for (int j = 0; j < featureContentReference.length; j++) {

-					URL url = site.getSiteContentProvider().getArchiveReference(featureContentReference[j].getIdentifier());

-					if (url != null) {

-						// make it relative to the site

-						String path = UpdateManagerUtils.getURLAsString(site.getURL(), url);

-						// add end "/"

-						path += (path.endsWith(File.separator) || path.endsWith("/")) ? "" : "/"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						pluginStrings.add(path);

-						if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)

-							UpdateCore.warn("Add plugin: " + path + " to the list"); //$NON-NLS-1$ //$NON-NLS-2$

-					}

-				}

-			}

-		}

-		return pluginStrings;

-	}

-

-	/**

-	 *	 Obtains strings existing in the allStrings array, but not in the stringsToRemove

-	 */

-	private String[] subtract(String[] allStrings, String[] stringsToRemove) {

-		HashSet resultList = new HashSet(Arrays.asList(allStrings));

-		resultList.removeAll(Arrays.asList(stringsToRemove));

-		return (String[])resultList.toArray(new String[resultList.size()]);

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
deleted file mode 100644
index c468de4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
+++ /dev/null

@@ -1,1104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.model.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.configurator.*;
-
-/**
- * A Configured site manages the Configured and unconfigured features of a Site
- */
-public class ConfiguredSite extends ConfiguredSiteModel implements IConfiguredSite {
-
-	private static final String PRODUCT_SITE_MARKER = ".eclipseproduct";
-	private static final String EXTENSION_SITE_MARKER = ".eclipseextension";
-
-	// listeners	
-	private ListenersList listeners = new ListenersList();
-
-	// verification status
-	private IStatus verifyStatus;
-
-	// transient: true if the site was just created so we can remove it
-	private transient boolean justCreated = false;
-
-	/*
-	 * Default Constructor
-	 */
-	public ConfiguredSite() {
-	}
-
-	/*
-	 * Copy Constructor
-	 * As of now, configSite can only be of type ConfiguredSite
-	 */
-	public ConfiguredSite(IConfiguredSite configSite) {
-		ConfiguredSite cSite = (ConfiguredSite) configSite;
-		setSiteModel(cSite.getSiteModel());
-		setConfigurationPolicyModel(new ConfigurationPolicy(cSite.getConfigurationPolicy()));
-		setUpdatable(cSite.isUpdatable());
-		setEnabled(cSite.isEnabled());
-		setPreviousPluginPath(cSite.getPreviousPluginPath());
-		setPlatformURLString(cSite.getPlatformURLString());
-	}
-
-	/*
-	 *  Adds a listener
-	 */
-	public void addConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener) {
-		synchronized (listeners) {
-			listeners.add(listener);
-		}
-	}
-
-	/*
-	 * Removes a listener
-	 */
-	public void removeConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener) {
-		synchronized (listeners) {
-			listeners.remove(listener);
-		}
-	}
-
-	/*
-	 * @see IConfiguredSite#install(IFeature,IVerificationListener, IProgressMonitor)
-	 */
-	public IFeatureReference install(IFeature feature, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException {
-		return install(feature, null, verificationListener, monitor);
-	}
-
-	/*
-	 * @see IConfiguredSite#install(IFeature, IFeatureReference, IVerificationListener, IProgressMonitor)
-	 */
-	public IFeatureReference install(IFeature feature, IFeatureReference[] optionalFeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException {
-
-		// change the status if justCreated
-		if (justCreated) justCreated=false;
-
-		// ConfigSite is read only 
-		if (!isUpdatable()) {
-			String errorMessage = Policy.bind("ConfiguredSite.NonInstallableSite", getSite().getURL().toExternalForm()); //$NON-NLS-1$
-			IStatus status = verifyUpdatableStatus();
-			if (status != null)
-				errorMessage += " " + status.getMessage(); //$NON-NLS-1$
-			throw Utilities.newCoreException(errorMessage, null);
-		}
-
-		// feature is null
-		if (feature == null) {
-			String errorMessage = Policy.bind("ConfiguredSite.NullFeatureToInstall"); //$NON-NLS-1$
-			throw Utilities.newCoreException(errorMessage, null);
-		}
-
-		// feature reference to return
-		IFeatureReference installedFeatureRef;
-		IFeature installedFeature = null;
-
-		// create the Activity (INSTALL)
-		ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_FEATURE_INSTALL);
-		activity.setLabel(feature.getVersionedIdentifier().toString());
-		activity.setDate(new Date());
-
-		try {
-			installedFeatureRef = getSite().install(feature, optionalFeatures, verificationListener, monitor);
-
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL) {
-				UpdateCore.debug("Sucessfully installed: " + installedFeatureRef.getURL().toExternalForm());
-			}
-
-			if (installedFeatureRef != null) {
-				try {
-					installedFeature = installedFeatureRef.getFeature(null);
-				} catch (CoreException e) {
-					UpdateCore.warn(null, e);
-				}
-			}
-
-			// everything done ok
-			activity.setStatus(IActivity.STATUS_OK);
-
-			// notify listeners
-			Object[] siteListeners = listeners.getListeners();
-			for (int i = 0; i < siteListeners.length; i++) {
-				if (installedFeature != null) {
-					IConfiguredSiteChangedListener listener = ((IConfiguredSiteChangedListener) siteListeners[i]);
-					listener.featureInstalled(installedFeature);
-				}
-			}
-		} catch (CoreException e) {
-			// not ok, set Activity status
-			activity.setStatus(IActivity.STATUS_NOK);
-			throw e;
-		} finally {
-			IInstallConfiguration current = SiteManager.getLocalSite().getCurrentConfiguration();
-			((InstallConfiguration) current).addActivity(activity);
-		}
-		// call the configure task	
-		if (installedFeature != null)
-			configure(installedFeature, optionalFeatures, false);
-		/*callInstallHandler*/
-
-		return installedFeatureRef;
-	}
-
-	/*
-	 * @see IConfiguredSite#remove(IFeature, IProgressMonitor)
-	 */
-	public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException {
-
-		// ConfigSite is read only
-		if (!isUpdatable()) {
-			String errorMessage = Policy.bind("ConfiguredSite.NonUninstallableSite", getSite().getURL().toExternalForm()); //$NON-NLS-1$
-			throw Utilities.newCoreException(errorMessage, null);
-		}
-
-		// create the Activity
-		ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_FEATURE_REMOVE);
-		activity.setLabel(feature.getVersionedIdentifier().toString());
-		activity.setDate(new Date());
-
-		try {
-			IFeatureReference referenceToRemove = null;
-			ISiteFeatureReference[] featureRef = getSite().getFeatureReferences();
-			ISiteFeatureReference ref = getSite().getFeatureReference(feature);
-			for (int i = 0; i < featureRef.length; i++) {
-				if (featureRef[i].equals(ref)) {
-					referenceToRemove = featureRef[i];
-					break;
-				}
-			}
-
-			// we found a feature reference on the site matching the feature			
-			if (referenceToRemove != null) {
-				// Check if feature is unconfigured before we remove it
-				// our UI will check.
-				// For non-UI application, throw error is feature is configured
-				if (getConfigurationPolicy().isConfigured(referenceToRemove)) {
-					IFeature featureToRemove = ((IFeatureReference) referenceToRemove).getFeature(null);
-					String featureLabel = (featureToRemove == null) ? null : featureToRemove.getLabel();
-					throw Utilities.newCoreException(Policy.bind("ConfiguredSite.UnableToRemoveConfiguredFeature" //$NON-NLS-1$
-					, featureLabel), null);
-				}
-			} else {
-				throw Utilities.newCoreException(Policy.bind("ConfiguredSite.UnableToFindFeature", feature.getURL().toString()), //$NON-NLS-1$
-				null);
-			}
-
-			// remove the feature
-			getSite().remove(feature, monitor);
-			getConfigurationPolicy().removeFeatureReference(referenceToRemove);
-			// everything done ok
-			activity.setStatus(IActivity.STATUS_OK);
-			// notify listeners
-			Object[] siteListeners = listeners.getListeners();
-			for (int i = 0; i < siteListeners.length; i++) {
-				((IConfiguredSiteChangedListener) siteListeners[i]).featureRemoved(feature);
-			}
-		} catch (CoreException e) {
-			activity.setStatus(IActivity.STATUS_NOK);
-			throw e;
-		} finally {
-			IInstallConfiguration current = SiteManager.getLocalSite().getCurrentConfiguration();
-			((InstallConfiguration) current).addActivity(activity);
-		}
-	}
-
-	/*
-	 * @see IConfiguredSite#configure(IFeature) 
-	 */
-	public void configure(IFeature feature) throws CoreException {
-		configure(feature, null, true /*callInstallHandler*/
-		);
-	}
-
-	/*
-	 * 
-	 */
-	private void configure(IFeature feature, IFeatureReference[] optionalFeatures, boolean callInstallHandler) throws CoreException {
-
-		if (feature == null) {
-			UpdateCore.warn("Attempting to configure a null feature in site:" + getSite().getURL().toExternalForm());
-			return;
-		}
-
-		ConfigurationPolicy configPolicy = getConfigurationPolicy();
-		if (configPolicy == null)
-			return;
-
-		// bottom up approach, same configuredSite
-		IIncludedFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();
-		if (optionalFeatures != null) {
-			childrenRef = childrenToConfigure(childrenRef, optionalFeatures);
-		}
-
-		for (int i = 0; i < childrenRef.length; i++) {
-			try {
-				IFeature child = childrenRef[i].getFeature(null);
-				configure(child, optionalFeatures, callInstallHandler);
-			} catch (CoreException e) {
-				// will skip any bad children
-				if (!childrenRef[i].isOptional())
-					UpdateCore.warn("Unable to configure child feature: " + childrenRef[i] + " " + e);
-			}
-		}
-
-		// configure root feature 	
-		IFeatureReference featureReference = getSite().getFeatureReference(feature);
-		configPolicy.configure(featureReference, callInstallHandler, true);
-
-		// notify listeners
-		Object[] siteListeners = listeners.getListeners();
-		for (int i = 0; i < siteListeners.length; i++) {
-			((IConfiguredSiteChangedListener) siteListeners[i]).featureConfigured(feature);
-		}
-	}
-
-	/*
-	 * Return the optional children to configure
-	 * 
-	 * @param children all the nested features
-	 * @param optionalfeatures optional features to install
-	 * @return IFeatureReference[]
-	 */
-	private IIncludedFeatureReference[] childrenToConfigure(IIncludedFeatureReference[] children, IFeatureReference[] optionalfeatures) {
-
-		List childrenToInstall = new ArrayList();
-		for (int i = 0; i < children.length; i++) {
-			IIncludedFeatureReference optionalFeatureToConfigure = children[i];
-			if (!optionalFeatureToConfigure.isOptional()) {
-				childrenToInstall.add(optionalFeatureToConfigure);
-			} else {
-				for (int j = 0; j < optionalfeatures.length; j++) {
-					// must compare feature as optionalFeatures are from the install site
-					// where children are on the local site
-					try {
-						IFeature installedChildren = optionalfeatures[j].getFeature(null);
-						if (installedChildren.equals(optionalFeatureToConfigure.getFeature(null))) {
-							childrenToInstall.add(optionalFeatureToConfigure);
-							break;
-						}
-					} catch (CoreException e) {
-						UpdateCore.warn("", e);
-					}
-				}
-			}
-		}
-
-		IIncludedFeatureReference[] result = new IIncludedFeatureReference[childrenToInstall.size()];
-		if (childrenToInstall.size() > 0) {
-			childrenToInstall.toArray(result);
-		}
-
-		return result;
-	}
-
-	/*
-	 * @see IConfiguredSite#unconfigure(IFeature)
-	 */
-	public boolean unconfigure(IFeature feature) throws CoreException {
-		// the first call sould disable without checking for enable parent
-		return unconfigure(feature, true, false);
-	}
-
-	private boolean unconfigure(IFeature feature, boolean includePatches, boolean verifyEnableParent) throws CoreException {
-		IFeatureReference featureReference = getSite().getFeatureReference(feature);
-
-		if (featureReference == null) {
-			UpdateCore.warn("Unable to retrieve Feature Reference for feature" + feature);
-			return false;
-		}
-
-		ConfigurationPolicy configPolicy = getConfigurationPolicy();
-		if (configPolicy == null)
-			return false;
-
-		// verify no enable parent
-		if (verifyEnableParent && !validateNoConfiguredParents(feature)) {
-			UpdateCore.warn("The feature " + feature.getVersionedIdentifier() + " to disable is needed by another enable feature");
-			return false;
-		}
-
-		boolean sucessfullyUnconfigured = false;
-		try {
-			sucessfullyUnconfigured = configPolicy.unconfigure(featureReference, true, true);
-		} catch (CoreException e) {
-			URL url = featureReference.getURL();
-			String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
-			UpdateCore.warn("Unable to unconfigure" + urlString, e);
-			throw e;
-		}
-		if (sucessfullyUnconfigured) {
-			// 2.0.2: unconfigure patches that reference this feature.
-			// A patch is a feature that contains an import
-			// statement with patch="true" and an id/version
-			// that matches an already installed and configured
-			// feature. When patched feature is unconfigured,
-			// all the patches that reference it must be 
-			// unconfigured as well
-			// (in contrast, patched features can be
-			// configured without the patches).
-			if (includePatches)
-				unconfigurePatches(feature);
-
-			// top down approach, same configuredSite
-			IIncludedFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();
-			for (int i = 0; i < childrenRef.length; i++) {
-				try {
-					IFeature child = childrenRef[i].getFeature(null); // disable the exact feature
-					unconfigure(child, includePatches, true); // check for parent as we should be the only parent.
-				} catch (CoreException e) {
-					// skip any bad children
-					UpdateCore.warn("Unable to unconfigure child feature: " + childrenRef[i] + " " + e);
-				}
-			}
-
-			// notify listeners
-			Object[] siteListeners = listeners.getListeners();
-			for (int i = 0; i < siteListeners.length; i++) {
-				IConfiguredSiteChangedListener listener = ((IConfiguredSiteChangedListener) siteListeners[i]);
-				listener.featureUnconfigured(feature);
-			}
-
-			return true;
-		} else {
-			URL url = featureReference.getURL();
-			String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
-			UpdateCore.warn("Unable to unconfigure:" + urlString);
-			return false;
-		}
-	}
-
-	/*
-	 * Look for features that have an import reference
-	 * that points to this feature and where patch=true.
-	 * Unconfigure all the matching patches, but
-	 * do not do the same lookup for them
-	 * because patches cannot have patches themselves.
-	 */
-
-	private void unconfigurePatches(IFeature feature) {
-		IFeatureReference[] frefs = getConfiguredFeatures();
-		for (int i = 0; i < frefs.length; i++) {
-			IFeatureReference fref = frefs[i];
-			try {
-				IFeature candidate = fref.getFeature(null);
-				if (candidate.equals(feature))
-					continue;
-
-				if (UpdateUtils.isPatch(feature, candidate))
-					unconfigure(candidate, false, false);
-			} catch (CoreException e) {
-				UpdateCore.warn("", e);
-			}
-		}
-	}
-
-	/*
-	 * @see IConfiguredSite#getConfiguredFeatures()
-	 */
-	public IFeatureReference[] getConfiguredFeatures() {
-		if (isEnabled())
-			return getRawConfiguredFeatures();
-		else
-			return new ISiteFeatureReference[0];
-	}
-
-	/*
-	 * @see IConfiguredSite#getConfiguredFeatures()
-	 */
-	private IFeatureReference[] getRawConfiguredFeatures() {
-		ConfigurationPolicy configPolicy = getConfigurationPolicy();
-		if (configPolicy == null)
-			return new ISiteFeatureReference[0];
-
-		return configPolicy.getConfiguredFeatures();
-	}
-
-	/*
-	 * adds configured and unconfigured feature references
-	 */
-	public IFeatureReference[] getFeatureReferences() {
-
-		ConfigurationPolicy configPolicy = getConfigurationPolicy();
-		if (configPolicy == null)
-			return new ISiteFeatureReference[0];
-
-		IFeatureReference[] configuredFeatures = getConfiguredFeatures();
-		int confLen = configuredFeatures.length;
-		IFeatureReference[] unconfiguredFeatures = configPolicy.getUnconfiguredFeatures();
-		int unconfLen = unconfiguredFeatures.length;
-
-		IFeatureReference[] result = new IFeatureReference[confLen + unconfLen];
-		if (confLen > 0) {
-			System.arraycopy(configuredFeatures, 0, result, 0, confLen);
-		}
-		if (unconfLen > 0) {
-			System.arraycopy(unconfiguredFeatures, 0, result, confLen, unconfLen);
-		}
-
-		return result;
-	}
-
-	/*
-	 * Configure and unconfigure appropriate feature to
-	 * become 'like' currentConfiguration which is the configuration
-	 * the user wants to revert to.
-	 * 
-	 * All features from currentConfiguration should be configured
-	 */
-	public void revertTo(IConfiguredSite oldConfiguration, IProgressMonitor monitor, IProblemHandler handler) throws CoreException, InterruptedException {
-
-		ConfiguredSite oldConfiguredSite = (ConfiguredSite) oldConfiguration;
-
-		// retrieve the feature that were configured
-		IFeatureReference[] configuredFeatures = oldConfiguredSite.validConfiguredFeatures(handler);
-
-		for (int i = 0; i < configuredFeatures.length; i++) {
-			getConfigurationPolicy().configure(configuredFeatures[i], true, true);
-		}
-
-		// calculate all the features we have to unconfigure from the current state to this state
-		// in the history. 				
-		List featureToUnconfigure = oldConfiguredSite.calculateUnconfiguredFeatures(configuredFeatures);
-
-		// for each unconfigured feature check if it still exists
-		// if so add as unconfigured
-		Iterator iter = featureToUnconfigure.iterator();
-		while (iter.hasNext()) {
-			IFeatureReference element = (IFeatureReference) iter.next();
-			try {
-				// do not log activity
-				getConfigurationPolicy().unconfigure(element, true, true);
-			} catch (CoreException e) {
-				// log no feature to unconfigure
-				String url = element.getURL().toString();
-				ISite site = element.getSite();
-				String siteString = (site != null) ? site.getURL().toExternalForm() : Policy.bind("ConfiguredSite.NoSite"); //$NON-NLS-1$
-				UpdateCore.warn(Policy.bind("ConfiguredSite.CannotFindFeatureToUnconfigure", url, siteString), e); //$NON-NLS-1$ 
-			}
-		}
-		//} // end USER_EXCLUDE
-	}
-
-	/*
-	 * We have to keep our configured feature
-	 * check if they are all valid
-	 * Return the valid configured features
-	 */
-	private IFeatureReference[] validConfiguredFeatures(IProblemHandler handler) throws InterruptedException {
-
-		IFeatureReference[] configuredFeatures = getConfiguredFeatures();
-		if (configuredFeatures != null) {
-			for (int i = 0; i < configuredFeatures.length; i++) {
-				IFeature feature = null;
-
-				// attempt to access the feature
-				try {
-					feature = configuredFeatures[i].getFeature(null);
-				} catch (CoreException e) {
-					// notify we cannot find the feature
-					UpdateCore.warn(null, e);
-					String featureString = configuredFeatures[i].getURL().toExternalForm();
-					if (!handler.reportProblem(Policy.bind("ConfiguredSite.CannotFindFeatureToConfigure", featureString))) { //$NON-NLS-1$
-						throw new InterruptedException();
-					}
-				}
-
-				// verify all the plugins still exist
-				if (feature != null) {
-					// get plugin identifier
-					List sitePluginIdentifiers = new ArrayList();
-					ISite site = feature.getSite();
-					IPluginEntry[] sitePluginEntries = null;
-
-					if (site != null) {
-						sitePluginEntries = site.getPluginEntries();
-						for (int index = 0; index < sitePluginEntries.length; index++) {
-							IPluginEntry entry = sitePluginEntries[index];
-							sitePluginIdentifiers.add(entry.getVersionedIdentifier());
-						}
-					}
-
-					if (sitePluginEntries.length > 0) {
-						IPluginEntry[] featurePluginEntries = feature.getPluginEntries();
-						for (int index = 0; index < featurePluginEntries.length; index++) {
-							IPluginEntry currentFeaturePluginEntry = featurePluginEntries[index];
-							if (!contains(currentFeaturePluginEntry.getVersionedIdentifier(), sitePluginIdentifiers)) {
-								// the plugin defined by the feature
-								// doesn't seem to exist on the site
-								String msg = "Error verifying existence of plugin:" + currentFeaturePluginEntry.getVersionedIdentifier().toString(); //$NON-NLS-1$
-								UpdateCore.log(msg, new Exception());
-
-								String siteString = (site != null) ? site.getURL().toExternalForm() : Policy.bind("ConfiguredSite.NoSite");	//$NON-NLS-1$
-								String errorLabel = Policy.bind("ConfiguredSite.CannotFindPluginEntry", currentFeaturePluginEntry.getVersionedIdentifier().toString(), siteString);	//$NON-NLS-1$ //$NON-NLS-2$
-								if (handler == null) {
-									throw new InterruptedException(errorLabel);
-								}
-								if (!handler.reportProblem(Policy.bind(errorLabel))) {
-									throw new InterruptedException();
-								}
-							} // end if not found in site
-						} // end for
-					}
-				}
-			} // end for configured feature
-		}
-		return configuredFeatures;
-	}
-
-	/*
-	 * We are in the process of calculating the delta between what was configured in the current
-	 * configuration that is not configured now
-	 * 
-	 * we have to figure out what feature have been unconfigured for the whole
-	 * history between current and us... 
-	 * 
-	 * is it as simple as  get all configured, and unconfigured,
-	 * the do the delta with what should be configured
-	 * 
-	 */
-	private List calculateUnconfiguredFeatures(IFeatureReference[] configuredFeatures) throws CoreException {
-
-		Set featureToUnconfigureSet = new HashSet();
-
-		// loop for all history
-		// try to see if the configured site existed
-		// if it does, get the unconfigured features 
-		// and the configured one
-		IInstallConfiguration[] history = SiteManager.getLocalSite().getConfigurationHistory();
-
-		for (int i = 0; i < history.length; i++) {
-			IInstallConfiguration element = history[i];
-			IConfiguredSite[] configSites = element.getConfiguredSites();
-			for (int j = 0; j < configSites.length; j++) {
-				ConfiguredSite configSite = (ConfiguredSite) configSites[j];
-				if (configSite.getSite().equals(getSite())) {
-					featureToUnconfigureSet.addAll(Arrays.asList(configSite.getConfigurationPolicy().getUnconfiguredFeatures()));
-					featureToUnconfigureSet.addAll(Arrays.asList(configSite.getConfigurationPolicy().getConfiguredFeatures()));
-				}
-			}
-		}
-
-		// remove the unconfigured feature we found that are now to be configured 
-		// (they may have been unconfigured in the past, but the revert makes them configured)
-		List featureToUnconfigureList = remove(configuredFeatures, featureToUnconfigureSet);
-
-		return featureToUnconfigureList;
-	}
-
-	/*
-	 * Utilities: Remove an array of feature references
-	 * from a list
-	 */
-	private List remove(IFeatureReference[] featureRefs, Set set) {
-		List result = new ArrayList();
-
-		if (set == null)
-			return result;
-
-		// if an element of the list is NOT found in the array,
-		// add it to the result list			
-		Iterator iter = set.iterator();
-		while (iter.hasNext()) {
-			IFeatureReference element = (IFeatureReference) iter.next();
-			boolean found = false;
-			for (int i = 0; i < featureRefs.length; i++) {
-				if (element.equals(featureRefs[i])) {
-					found = true;
-				}
-			}
-
-			if (!found)
-				result.add(element);
-		}
-		return result;
-	}
-
-	/*
-	 * I have issues when running list.contain(versionedIdentifier)
-	 * The code runs the Object.equals instead of the VersionedIdentifier.equals
-	 */
-	private boolean contains(VersionedIdentifier id, List list) {
-		boolean found = false;
-		if (list != null && !list.isEmpty()) {
-			Iterator iter = list.iterator();
-			while (iter.hasNext() && !found) {
-				VersionedIdentifier element = (VersionedIdentifier) iter.next();
-				if (element.equals(id)) {
-					found = true;
-				}
-			}
-		}
-		return found;
-	}
-
-	/*
-	 * 
-	 */
-	public ConfigurationPolicy getConfigurationPolicy() {
-		return (ConfigurationPolicy) getConfigurationPolicyModel();
-	}
-
-	/*
-	 * 
-	 */
-	public ISite getSite() {
-		return (ISite) getSiteModel();
-	}
-
-	/*
-	 * 
-	 */
-	public IInstallConfiguration getInstallConfiguration() {
-		return (IInstallConfiguration) getInstallConfigurationModel();
-	}
-
-	/*
-	 * 
-	 */
-	public IStatus getBrokenStatus(IFeature feature) {
-
-		IStatus featureStatus = createStatus(IStatus.OK, IFeature.STATUS_HAPPY, "", null);
-
-		// check the Plugins of all the features
-		// every plugin of the feature must be on the site
-		IPluginEntry[] siteEntries = getSite().getPluginEntries();
-		IPluginEntry[] featuresEntries = feature.getPluginEntries();
-		IPluginEntry[] result = UpdateManagerUtils.diff(featuresEntries, siteEntries);
-		if (result != null && (result.length != 0)) {
-			String msg = Policy.bind("SiteLocal.FeatureUnHappy");
-			MultiStatus multi = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_UNHAPPY, msg, null);
-
-			for (int k = 0; k < result.length; k++) {
-				VersionedIdentifier id = result[k].getVersionedIdentifier();
-				Object[] values = new String[] { "", "" };
-				if (id != null) {
-					values = new Object[] { id.getIdentifier(), id.getVersion()};
-				}
-				String msg1 = Policy.bind("ConfiguredSite.MissingPluginsBrokenFeature", values); //$NON-NLS-1$
-				UpdateCore.warn(msg1);
-				IStatus status = createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg1, null);
-				multi.add(status);
-			}
-			return multi;
-		}
-
-		// check os, arch, and ws
-
-		String msg = Policy.bind("SiteLocal.FeatureHappy");
-		return createStatus(IStatus.OK, IFeature.STATUS_HAPPY, msg, null);
-	}
-
-	/*
-	 * 
-	 */
-	public boolean isConfigured(IFeature feature) {
-		if (!isEnabled())
-			return false;
-
-		if (getConfigurationPolicy() == null)
-			return false;
-		IFeatureReference featureReference = getSite().getFeatureReference(feature);
-		if (featureReference == null) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS)
-				UpdateCore.warn("Unable to retrieve featureReference for feature:" + feature);
-			return false;
-		}
-		return getConfigurationPolicy().isConfigured(featureReference);
-	}
-
-	/**
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		if (getSite() == null)
-			return "No Site";
-		if (getSite().getURL() == null)
-			return "No URL";
-		return getSite().getURL().toExternalForm();
-	}
-
-	/**
-	 * @see IConfiguredSite#verifyUpdatableStatus()
-	 */
-	public IStatus verifyUpdatableStatus() {
-
-		if (verifyStatus != null)
-			return verifyStatus;
-
-		URL siteURL = getSite().getURL();
-		if (siteURL == null) {
-			verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.SiteURLNull"), null); //$NON-NLS-1$
-			return verifyStatus;
-		}
-
-		if (!"file".equalsIgnoreCase(siteURL.getProtocol())) {
-			verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.NonLocalSite"), null); //$NON-NLS-1$
-			return verifyStatus;
-		}
-
-		String siteLocation = siteURL.getFile();
-		File file = new File(siteLocation);
-
-		// get the product name of the private marker
-		// if there is no private marker, check if the site is contained in another site
-		// if there is a marker and this is a different product, return false
-		// otherwise don't check if we are contained in another site
-		String productName = getProductName(file);
-		if (productName != null) {
-			if (!productName.equals(getProductIdentifier("id", getProductFile()))) {
-				verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.NotSameProductId", productName), null); //$NON-NLS-1$
-				return verifyStatus;
-			}
-		} else {
-			File container = getSiteContaining(file);
-			if (container != null) {
-				verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.ContainedInAnotherSite", container.getAbsolutePath()), null); //$NON-NLS-1$
-				return verifyStatus;
-			}
-		}
-
-		if (!canWrite(file)) {
-			verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.ReadOnlySite"), null); //$NON-NLS-1$
-			return verifyStatus;
-		}
-
-		verifyStatus = createStatus(IStatus.OK, "", null);
-		setUpdatable(true);
-		return verifyStatus;
-	}
-
-	/*
-	 * Verify we can write on the file system
-	 */
-	private static boolean canWrite(File file) {
-		if (!file.isDirectory() && file.getParentFile() != null) {
-			file = file.getParentFile();
-		}
-
-		File tryFile = null;
-		FileOutputStream out = null;
-		try {
-			tryFile = new File(file, "toDelete");
-			out = new FileOutputStream(tryFile);
-			out.write(0);
-		} catch (IOException e) {
-			return false;
-		} finally {
-			try {
-				if (out != null)
-					out.close();
-			} catch (IOException e) {
-			}
-			if (tryFile != null)
-				tryFile.delete();
-		}
-		return true;
-	}
-
-	/*
-	 * Check if the directory contains a marker
-	 * if not ask all directory children to check
-	 * if one validates the condition, returns the marker
-	 */
-	private static File getSiteContaining(File file) {
-
-		if (file == null)
-			return null;
-
-		UpdateCore.warn("IsContained: Checking for markers at:" + file);
-		if (file.exists() && file.isDirectory()) {
-			File productFile = new File(file, PRODUCT_SITE_MARKER);
-			File extensionFile = new File(file, EXTENSION_SITE_MARKER);
-			if (productFile.exists() || extensionFile.exists())
-				return file;
-//			// do not check if a marker exists in the current but start from the parent
-//			// the current is analyze by getProductname()
-//			if (file.getParentFile() != null) {
-//				File privateFile = new File(file.getParentFile(), PRIVATE_SITE_MARKER);
-//				if (privateFile.exists())
-//					return file.getParentFile();
-//			}
-		}
-		return getSiteContaining(file.getParentFile());
-	}
-
-	/*
-	 * Returns the name of the product if the identifier of the private Site markup is not
-	 * the same as the identifier of the product the workbench was started with.
-	 * If the product is the same, return null.
-	 */
-	private static String getProductName(File file) {
-
-		if (file == null)
-			return null;
-
-		File markerFile = new File(file, EXTENSION_SITE_MARKER );
-		if (!markerFile.exists()) {
-			return null;
-		}
-
-		File productFile = getProductFile();
-		String productId = null;
-		String privateId = null;
-		if (productFile != null) {
-			productId = getProductIdentifier("id", productFile);
-			privateId = getProductIdentifier("id", markerFile);
-			if (productId == null) {
-				UpdateCore.warn("Product ID is null at:" + productFile);
-				return null;
-			}
-			if (!productId.equalsIgnoreCase(privateId)) {
-				UpdateCore.warn("Product id at" + productFile + " Different than:" + markerFile);
-				String name = getProductIdentifier("name", markerFile);
-				String version = getProductIdentifier("version", markerFile);
-				String markerID = (name == null) ? version : name + ":" + version;
-				if (markerID == null)
-					markerID = "";
-				return markerID;
-			} else {
-				return privateId;
-			}
-		} else {
-			UpdateCore.warn("Product Marker doesn't exist:" + productFile);
-		}
-
-		return null;
-	}
-
-	/*
-	 * Returns the identifier of the product from the property file
-	 */
-	private static String getProductIdentifier(String identifier, File propertyFile) {
-		String result = null;
-		if (identifier == null)
-			return result;
-		InputStream in = null;
-		try {
-			in = new FileInputStream(propertyFile);
-			PropertyResourceBundle bundle = new PropertyResourceBundle(in);
-			result = bundle.getString(identifier);
-		} catch (IOException e) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
-				UpdateCore.debug("Exception reading property file:" + propertyFile);
-		} catch (MissingResourceException e) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
-				UpdateCore.debug("Exception reading '" + identifier + "' from property file:" + propertyFile);
-		} finally {
-			if (in == null)
-				try {
-					in.close();
-				} catch (IOException e1) {
-				}
-		}
-		return result;
-	}
-
-	/*
-	 * Returns the identifier of the product from the property file
-	 */
-	private static File getProductFile() {
-
-		String productInstallDirectory = ConfiguratorUtils.getInstallURL().getFile();
-		if (productInstallDirectory != null) {
-			File productFile = new File(productInstallDirectory, PRODUCT_SITE_MARKER);
-			if (productFile.exists()) {
-				return productFile;
-			} else {
-				UpdateCore.warn("Product marker doesn't exist:" + productFile);
-			}
-		} else {
-			UpdateCore.warn("Cannot retrieve install URL from BootLoader");
-		}
-		return null;
-	}
-
-	/*
-	 * 
-	 */
-	/*package*/
-	boolean createPrivateSiteMarker() {
-		URL siteURL = getSite().getURL();
-		if (siteURL == null) {
-			UpdateCore.warn("Unable to create marker. The Site url is null.");
-			return false;
-		}
-
-		if (!"file".equalsIgnoreCase(siteURL.getProtocol())) {
-			UpdateCore.warn("Unable to create private marker. The Site is not on the local file system.");
-			return false;
-		}
-
-		String siteLocation = siteURL.getFile();
-		File productFile = getProductFile();
-		boolean success = false;
-		if (productFile != null) {
-			String productId = getProductIdentifier("id", productFile);
-			String productName = getProductIdentifier("name", productFile);
-			String productVer = getProductIdentifier("version", productFile);
-			if (productId != null) {
-				File file = new File(siteLocation, EXTENSION_SITE_MARKER);
-				if (!file.exists()) {
-					OutputStream out = null;
-					OutputStreamWriter outWriter = null;
-					try {
-						out = new FileOutputStream(file);
-						outWriter = new OutputStreamWriter(out, "UTF8"); //$NON-NLS-1$
-						outWriter.write("id=" + productId+"\n");
-						if (productName != null)
-							outWriter.write("name=" + productName+"\n");
-						if (productVer != null)
-							outWriter.write("version=" + productVer+"\n");
-						success = true;
-						justCreated = true;
-					} catch (Exception e) {
-						UpdateCore.warn("Unable to create private Marker at:" + file, e);
-					} finally {
-						try {
-							if (outWriter != null)
-								outWriter.close();
-						} catch (IOException e1) {
-						}
-						try {
-							if (out != null)
-								out.close();
-						} catch (IOException e2) {
-						}
-					}
-				}
-			}
-		}
-		return success;
-	}
-
-
-	/*
-	 * Returns true if the directory of the Site contains
-	 * .eclipseextension
-	 */
-	public boolean isExtensionSite() {
-		return containsMarker(EXTENSION_SITE_MARKER);
-	}
-
-	/*
-	 * Returns true if the directory of the Site contains
-	 * .eclipseextension
-	 */
-	public boolean isProductSite() {
-		return containsMarker(PRODUCT_SITE_MARKER);
-	}
-
-	/*
-	 * Returns true if the directory of the Site contains
-	 * .eclipseextension
-	 */
-	public boolean isPrivateSite() {
-		return isExtensionSite();
-	}
-
-	/*
-	 * 
-	 */
-	private boolean containsMarker(String marker) {
-		ISite site = getSite();
-		if (site == null) {
-			UpdateCore.warn("Contains Markers:The site is null");
-			return false;
-		}
-
-		URL url = site.getURL();
-		if (url == null) {
-			UpdateCore.warn("Contains Markers:Site URL is null");
-			return false;
-		}
-		if (!"file".equalsIgnoreCase(url.getProtocol())) {
-			UpdateCore.warn("Contains Markers:Non file protocol");
-			return false;
-		}
-		File file = new File(url.getFile());
-		if (!file.exists()) {
-			UpdateCore.warn("Contains Markers:The site doesn't exist:" + file);
-			return false;
-		}
-		File extension = new File(file, marker);
-		if (!extension.exists()) {
-			UpdateCore.warn("Contains Markers:The extensionfile does not exist:" + extension);
-			return false;
-		}
-		return true;
-	}
-
-	/*
-	 * Returns true if the Site is already natively linked
-	 */
-	public boolean isNativelyLinked() throws CoreException {
-		String platformString = getPlatformURLString();
-		if (platformString == null) {
-			UpdateCore.warn("Unable to retrieve platformString");
-			return false;
-		}
-
-		URL siteURL = null;
-		try {
-			// check if the site exists and is updatable
-			// update configSite
-			URL urlToCheck = new URL(platformString);
-			IPlatformConfiguration runtimeConfig = ConfiguratorUtils.getCurrentPlatformConfiguration();
-			IPlatformConfiguration.ISiteEntry entry = runtimeConfig.findConfiguredSite(urlToCheck);
-			if (entry != null) {
-				return entry.isNativelyLinked();
-			} else {
-				UpdateCore.warn("Unable to retrieve site:" + platformString + " from platform.");
-			}
-
-			// check by comparing URLs
-			IPlatformConfiguration.ISiteEntry[] sites = runtimeConfig.getConfiguredSites();
-			for (int i = 0; i < sites.length; i++) {
-				siteURL = sites[i].getURL();
-				URL resolvedURL = Platform.resolve(siteURL);
-				if (UpdateManagerUtils.sameURL(resolvedURL, urlToCheck))
-					return true;
-			}
-		} catch (MalformedURLException e) {
-			String msg = Policy.bind("ConfiguredSite.UnableResolveURL", platformString);
-			throw Utilities.newCoreException(msg, e);
-		} catch (IOException e) {
-			String msg = Policy.bind("ConfiguredSite.UnableToAccessSite", new Object[] { siteURL });
-			throw Utilities.newCoreException(msg, e);
-		}
-
-		return false;
-	}
-
-	/*
-	* we have to check that no configured/enable parent include this feature
-	*/
-	private boolean validateNoConfiguredParents(IFeature feature) throws CoreException {
-		if (feature == null) {
-			UpdateCore.warn("ConfigurationPolicy: validate Feature is null");
-			return true;
-		}
-
-		IFeatureReference[] parents = UpdateManagerUtils.getParentFeatures(feature, getConfiguredFeatures(), false);
-		return (parents.length == 0);
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java
deleted file mode 100644
index f1481bf..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * This class manages threads that are dispatched to 
- * obtained a valid input stream from an HTTP connection.
- * Since obtaining an input stream is an I/O operation
- * that may block for a long time, it is performed
- * on a separate thread to keep the UI responsive.
- * <p>
- * In case that a connection blocks and does not
- * terminate with an IOException after a timeout, 
- * active threads may accumulate. The manager will
- * refuse to create more than MAX_COUNT threads and
- * instead will throw a CoreException with a child
- * status object for each connection that is still pending.
- * <p>
- * If the connection is responsive but slow, the user
- * may cancel it. In that case, the manager will
- * close the stream to avoid resource leak.
- */
-public class ConnectionThreadManager {
-	// set connection timeout to 1 minute
-	private static final String CONNECT_TIMEOUT = "60000"; //$NON-NLS-1$
-	// set read timeout to 1 minute
-	private static final String READ_TIMEOUT = "60000"; //$NON-NLS-1$
-	// max number of active threads
-	private static final int MAX_COUNT = 9;
-	private Vector threads;
-
-	public static class StreamRunnable implements Runnable {
-		private HttpURLConnection urlConnection;
-		private Exception exception;
-		private InputStream is;
-		private boolean disconnected;
-
-		public StreamRunnable(HttpURLConnection urlConnection) {
-			this.urlConnection = urlConnection;
-		}
-
-		public InputStream getInputStream() {
-			return is;
-		}
-
-		public URL getURL() {
-			return urlConnection.getURL();
-		}
-
-		public Exception getException() {
-			return exception;
-		}
-
-		public void disconnect() {
-			urlConnection.disconnect();
-			disconnected = true;
-		}
-
-		public void run() {
-			try {
-				is = urlConnection.getInputStream();
-				if (disconnected) {
-					// The connection was slow, but returned
-					// a valid input stream. However,
-					// the user canceled the connection
-					// so we must close to avoid 
-					// resource leak.
-					if (is != null) {
-						try {
-							is.close();
-						} catch (IOException ex) {
-							// at this point, we don't care
-						} finally {
-							is = null;
-						}
-					}
-				}
-			} catch (Exception e) {
-				exception = e;
-			}
-		}
-	}
-
-	class ConnectionThread extends Thread {
-		private StreamRunnable runnable;
-		public ConnectionThread(StreamRunnable runnable) {
-			super(runnable, "update-connection"); //$NON-NLS-1$
-			this.runnable = runnable;
-		}
-
-		public StreamRunnable getRunnable() {
-			return runnable;
-		}
-	}
-
-	public ConnectionThreadManager() {
-		// In case we are running Sun's code.
-		setIfNotDefaultProperty("sun.net.client.defaultConnectTimeout", CONNECT_TIMEOUT); //$NON-NLS-1$
-		setIfNotDefaultProperty("sun.net.client.defaultReadTimeout", READ_TIMEOUT);  //$NON-NLS-1$
-	}
-	
-	private void setIfNotDefaultProperty(String key, String value) {
-		String oldValue = System.getProperty(key);
-		if (oldValue==null || oldValue.equals("-1")) //$NON-NLS-1$
-			System.setProperty(key, value);
-	}
-
-	public Thread createThread(StreamRunnable runnable) throws CoreException {
-		validateExistingThreads();
-		if (threads == null)
-			threads = new Vector();
-		Thread t = new ConnectionThread(runnable);
-		t.setDaemon(true);
-		threads.add(t);
-		return t;
-	}
-
-	/*
-	 * Removes threads that are not alive any more from the 
-	 * list and ensures that there are at most MAX_COUNT threads
-	 * still working.
-	 */
-	private void validateExistingThreads() throws CoreException {
-		if (threads == null)
-			return;
-			
-		int aliveCount = purgeTerminatedThreads();
-
-		if (aliveCount > MAX_COUNT) {
-			ArrayList children = new ArrayList();
-			String pluginId =
-				UpdateCore.getPlugin().getBundle().getSymbolicName();
-			for (int i = 0; i < threads.size(); i++) {
-				ConnectionThread t = (ConnectionThread) threads.get(i);
-				String url = t.getRunnable().getURL().toString();
-				IStatus status =
-					new Status(
-						IStatus.ERROR,
-						pluginId,
-						IStatus.OK,
-						Policy.bind(
-							"ConnectionThreadManager.unresponsiveURL", //$NON-NLS-1$
-							url),
-						null);
-				children.add(status);
-			}
-			MultiStatus parentStatus =
-				new MultiStatus(
-					pluginId,
-					IStatus.OK,
-					(IStatus[]) children.toArray(new IStatus[children.size()]),
-					Policy.bind("ConnectionThreadManager.tooManyConnections"), //$NON-NLS-1$
-					null);
-			throw new CoreException(parentStatus);
-		}
-	}
-	
-	/*
-	 * Removes terminated threads from the list and returns
-	 * the number of those still active.
-	 */
-	
-	private int purgeTerminatedThreads() {
-		int aliveCount = 0;
-
-		Object[] array = threads.toArray();
-		for (int i = 0; i < array.length; i++) {
-			Thread t = (Thread) array[i];
-			if (!t.isAlive())
-				threads.remove(t);
-			else
-				aliveCount++;
-		}
-		return aliveCount;
-	}
-
-	public void shutdown() {
-		// We might want to kill the active threads but
-		// this is not really necessary since they are all
-		// daemons and will not prevent JVM to terminate.
-		threads.clear();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
deleted file mode 100644
index 2d71936..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.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.internal.core;
-
-
-import org.eclipse.update.core.*;
-
-/**
- * A default implementation for IFeatureContentConsumer
- * </p>
- * @since 2.0
- */
-
-public abstract class ContentConsumer implements IContentConsumer {
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
deleted file mode 100644
index e0fcd8d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.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.internal.core;
-
-
-import java.io.*;
-import java.util.jar.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.JarContentReference.*;
-import org.eclipse.update.core.model.*;
-
-/**
- * Default Implementation of InstallHandler
- */
-public class DefaultInstallHandler extends BaseInstallHandler {
-
-	/*
-	 * @see IInstallHandler#nonPluginDataDownloaded(INonPluginEntry[], IVerificationListener)
-	 */
-	public void nonPluginDataDownloaded(
-		INonPluginEntry[] nonPluginData,
-		IVerificationListener listener)
-		throws CoreException {
-
-		// verify non-plugin archives. The DefaultInstallHandler assumes
-		// the verifier associated with the feature is able to verify the
-		// data archives.
-		if (nonPluginData == null || nonPluginData.length == 0)
-			return;
-
-		this.nonPluginEntries = nonPluginData;
-		IFeatureContentProvider provider = this.feature.getFeatureContentProvider();
-		IVerifier verifier = provider.getVerifier();
-		if (verifier == null)
-			return;
-
-		for (int i = 0; i < this.nonPluginEntries.length; i++) {
-			ContentReference[] archives =
-				provider.getNonPluginEntryArchiveReferences(nonPluginEntries[i], this.monitor);
-			IVerificationResult result;
-			for (int j = 0; j < archives.length; j++) {
-
-				// see if the data entry is a jar
-				ContentReference archive = archives[j];
-				if (!(archives[j] instanceof JarContentReference)
-					&& archives[j].getIdentifier().endsWith(".jar")) { //$NON-NLS-1$
-					try {
-						archive =
-							new JarContentReference(archives[j].getIdentifier(), archives[j].asFile());
-					} catch (IOException e) {
-					}
-				}
-
-				result = verifier.verify(this.feature, archive, false, this.monitor);
-				if (result != null)
-					promptForVerification(result, listener);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#completeInstall(IFeatureContentConsumer)
-	 */
-	public void completeInstall(IFeatureContentConsumer consumer)
-		throws CoreException {
-
-		// plugins have been installed. Check to see if we have any
-		// non-plugin entries that need to be handled.
-		if (this.nonPluginEntries == null || this.nonPluginEntries.length == 0)
-			return;
-
-		// install non-plugin archives
-		IFeatureContentProvider provider = this.feature.getFeatureContentProvider();
-		for (int i = 0; i < this.nonPluginEntries.length; i++) {
-			ContentReference[] archive =
-				provider.getNonPluginEntryArchiveReferences(nonPluginEntries[i], this.monitor);
-			IContentConsumer nonPluginConsumer = consumer.open(nonPluginEntries[i]);
-			for (int j = 0; j < archive.length; j++) {
-				String id = archive[j].getIdentifier();
-				if (id.endsWith(".jar")) { //$NON-NLS-1$
-					// the non-plugin archive is a jar. Unpack it into
-					// a directory constructed using the archive id
-					try {
-						final String prefix = id.substring(0, id.length() - 4) + "/"; //$NON-NLS-1$
-						JarContentReference jarRef = new JarContentReference("", archive[j].asFile()); //$NON-NLS-1$
-						ContentSelector selector = new ContentSelector() {
-							public String defineIdentifier(JarEntry entry) {
-								if (entry == null)
-									return null;
-								else
-									return prefix + entry.getName();
-							}
-						};
-						ContentReference[] entries = jarRef.peek(selector, this.monitor);
-						for (int k = 0; k < entries.length; k++) {
-							nonPluginConsumer.store(entries[k], this.monitor);
-						}
-					} catch (IOException e) {
-						throw Utilities
-							.newCoreException(Policy.bind("JarVerificationService.CancelInstall", id),	//$NON-NLS-1$
-						e);
-					}
-
-				} else {
-					// the non-plugin archive is not a jar. Install it asis.
-					nonPluginConsumer.store(archive[j], this.monitor);
-				}
-			}
-			nonPluginConsumer.close();
-		}
-	}
-
-	/*
-	 * 
-	 */
-	private void promptForVerification(
-		IVerificationResult verificationResult,
-		IVerificationListener listener)
-		throws CoreException {
-
-		if (listener == null)
-			return;
-		int result = listener.prompt(verificationResult);
-
-		if (result == IVerificationListener.CHOICE_ABORT) {
-			Exception e = verificationResult.getVerificationException();
-			throw new InstallAbortedException(Policy.bind("JarVerificationService.CancelInstall"),e); //$NON-NLS-1$
-		}
-		if (result == IVerificationListener.CHOICE_ERROR) {
-			throw Utilities
-				.newCoreException(Policy.bind("JarVerificationService.UnsucessfulVerification"), //$NON-NLS-1$
-			verificationResult.getVerificationException());
-		}
-
-		return;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DeltaInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DeltaInstallHandler.java
deleted file mode 100644
index 3c1848e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DeltaInstallHandler.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-
-/**
- * Install handler for partial plugin delivery: copy delta content from old plugin into the new one.
- * The new plugin should only contain files that have changed.
- */
-public class DeltaInstallHandler extends BaseInstallHandler {
-	private final static String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
-	private final static String FRAGMENT_XML = "fragment.xml"; //$NON-NLS-1$
-	private final static String META_MANIFEST = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
-
-	protected IFeature oldFeature;
-	protected ISiteContentConsumer contentConsumer;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.core.IInstallHandler#completeInstall(org.eclipse.update.core.IFeatureContentConsumer)
-	 */
-	public void completeInstall(IFeatureContentConsumer consumer)
-		throws CoreException {
-
-		try {
-			if (pluginEntries == null)
-				return;
-
-			// Get the old feature
-			IFeature[] oldFeatures = UpdateUtils.getInstalledFeatures(feature);
-			if (oldFeatures.length == 0)
-				return;
-
-			oldFeature = oldFeatures[0];
-			IPluginEntry[] oldPlugins = oldFeature.getPluginEntries();
-
-			for (int i = 0; i < pluginEntries.length; i++) {
-				IPluginEntry newPlugin = pluginEntries[i];
-				IPluginEntry oldPlugin =
-					getPluginEntry(
-						oldPlugins,
-						newPlugin.getVersionedIdentifier().getIdentifier());
-				if (oldPlugin == null)
-					continue;
-				try {
-					overlayPlugin(oldPlugin, newPlugin);
-				} catch (IOException e) {
-					throw new CoreException(
-						new Status(
-							Status.ERROR,
-							UpdateUtils.getPluginId(),
-							1,
-							"", //$NON-NLS-1$
-							e));
-				}
-			}
-		} finally {
-			//if (contentConsumer != null)
-			//	contentConsumer.close();
-		}
-	}
-
-	protected IPluginEntry getPluginEntry(IPluginEntry[] plugins, String id) {
-		for (int i = 0; i < plugins.length; i++)
-			if (plugins[i].getVersionedIdentifier().getIdentifier().equals(id))
-				return plugins[i];
-		return null;
-	}
-
-	protected boolean referenceExists(
-		ContentReference[] references,
-		ContentReference ref) {
-		String id = ref.getIdentifier();
-		if (id == null)
-			return false;
-
-		for (int i = 0; i < references.length; i++)
-			if (id.equals(references[i].getIdentifier()))
-				return true;
-		return false;
-	}
-
-	protected void overlayPlugin(
-		IPluginEntry oldPlugin,
-		IPluginEntry newPlugin)
-		throws CoreException, IOException {
-		if(newPlugin instanceof PluginEntry && !((PluginEntry)newPlugin).isUnpack()){
-			// partial plug-ins (in patches) must always be unpacked
-			return;
-		}
-		
-		// copy the content of the old plugin over the new one, but only
-		// those files that do not exist on the target
-		ContentReference[] oldReferences =
-			oldFeature
-				.getFeatureContentProvider()
-				.getPluginEntryContentReferences(
-				oldPlugin,
-				null);
-		ContentReference[] newReferences =
-			feature
-				.getFeatureContentProvider()
-				.getPluginEntryContentReferences(
-				newPlugin,
-				null);
-
-		URL newURL =
-			new URL(
-				oldFeature.getSite().getURL(),
-				Site.DEFAULT_PLUGIN_PATH
-					+ newPlugin.getVersionedIdentifier().toString());
-		String pluginPath = newURL.getFile();
-		for (int i = 0; i < oldReferences.length; i++) {
-			if (isPluginManifest(oldReferences[i])
-				|| referenceExists(newReferences, oldReferences[i]))
-				continue;
-
-			InputStream input = null;
-			try {
-				input = oldReferences[i].getInputStream();
-				File targetFile =
-					new File(pluginPath, oldReferences[i].getIdentifier());
-				UpdateManagerUtils.copyToLocal(
-					input,
-					targetFile.getAbsolutePath(),
-					null);
-				UpdateManagerUtils.checkPermissions(
-					oldReferences[i],
-					pluginPath);
-				// 20305
-			} catch (IOException e) {
-				continue;
-			} finally {
-				if(input != null){
-					try{
-						input.close();
-					} catch (IOException ioe) {
-					}
-				}
-			}
-		}
-	}
-
-	protected boolean isPluginManifest(ContentReference ref) {
-		String id = ref.getIdentifier();
-		return PLUGIN_XML.equals(id) || FRAGMENT_XML.equals(id) || META_MANIFEST.equals(id);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
deleted file mode 100644
index 4d4117f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
+++ /dev/null

@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configurator.*;
-
-
-/**
- * singleton pattern.
- * manages the error/recover log file
- */
-public class ErrorRecoveryLog {
-
-	public static final boolean RECOVERY_ON = false;
-
-	private static final String ERROR_RECOVERY_LOG = "error_recovery.log";
-	private static final String LOG_ENTRY_KEY = "LogEntry.";
-	private static final String RETURN_CARRIAGE = "\r\n";
-	private static final String END_OF_FILE = "eof=eof";
-
-	//
-	public static final String START_INSTALL_LOG = 	"START_INSTALL_LOG";
-	public static final String PLUGIN_ENTRY = 		"PLUGIN";
-	public static final String FRAGMENT_ENTRY = 		"FRAGMENT";	
-	public static final String BUNDLE_MANIFEST_ENTRY = 		"BUNDLE_MANIFEST";	
-	public static final String BUNDLE_JAR_ENTRY = 			"BUNDLE";	
-	public static final String FEATURE_ENTRY = 		"FEATURE";
-	public static final String ALL_INSTALLED = 		"ALL_FEATURES_INSTALLED";
-	public static final String RENAME_ENTRY = 		"RENAME";
-	public static final String END_INSTALL_LOG = 	"END_INSTALL_LOG";
-	public static final String START_REMOVE_LOG = 	"REMOVE_LOG";
-	public static final String END_ABOUT_REMOVE =	"END_ABOUT_TO_REMOVE";
-	public static final String DELETE_ENTRY = 		"DELETE";
-	public static final String END_REMOVE_LOG = 		"END_REMOVE_LOG";
-
-	public static boolean forceRemove = false;
-
-	private static ErrorRecoveryLog inst;
-	private FileWriter out;
-	private int index;
-	private List paths;
-	
-	private boolean open = false;
-	private int nbOfOpen = 0;
-	
-
-	/**
-	 * Constructor for ErrorRecoveryLog.
-	 */
-	private ErrorRecoveryLog() {
-		super();
-	}
-
-	/**
-	 * Singleton
-	 */
-	public static ErrorRecoveryLog getLog() {
-		if (inst == null){
-			inst = new ErrorRecoveryLog();
-		}
-		return inst;
-	}
-
-	/**
-	 * get a unique identifer for the file, ensure uniqueness up to now
-	 */
-	public static String getLocalRandomIdentifier(String path) {
-		
-		if (path==null) return null;
-		
-		// verify if it will be a directory without creating the file
-		// as it doesn't exist yet
-		if (path.endsWith(File.separator) || path.endsWith("/"))
-			return path;
-		File file = new File(path);
-		String newName =
-			UpdateManagerUtils.getLocalRandomIdentifier(file.getName(), new Date());
-		while (new File(newName).exists()) {
-			newName =
-				UpdateManagerUtils.getLocalRandomIdentifier(file.getName(), new Date());
-		}
-		File newFile = new File(file.getParentFile(),newName);
-		return newFile.getAbsolutePath();
-	}
-
-	/**
-	 * returns the log file 
-	 * We do not check if the file exists
-	 */
-	public File getRecoveryLogFile() {
-		IPlatformConfiguration configuration =
-			ConfiguratorUtils.getCurrentPlatformConfiguration();
-		URL location = configuration.getConfigurationLocation();
-		String locationString = location.getFile();
-		File platformConfiguration = new File(locationString);
-		if (!platformConfiguration.isDirectory()) platformConfiguration = platformConfiguration.getParentFile();
-		return new File(platformConfiguration, ERROR_RECOVERY_LOG);
-	}
-
-
-	/**
-	 * Open the log
-	 */
-	public void open(String logEntry) throws CoreException {
-		if (open) {
-			nbOfOpen++;			
-			UpdateCore.warn("Open nested Error/Recovery log #"+nbOfOpen+":"+logEntry);				
-			return;
-		}
-		
-		File logFile = null;		
-		try {
-			logFile = getRecoveryLogFile();
-			out = new FileWriter(logFile);
-			index = 0;
-			paths=null;
-			open=true;
-			nbOfOpen=0;
-			UpdateCore.warn("Start new Error/Recovery log #"+nbOfOpen+":"+logEntry);							
-		} catch (IOException e) {
-			throw Utilities.newCoreException(
-				Policy.bind("UpdateManagerUtils.UnableToLog", new Object[] { logFile }),
-				e);
-		}
-		
-		append(logEntry);
-	}
-
-	/**
-	 * Append the string to the log and flush
-	 */
-	public void append(String logEntry) throws CoreException {
-		File logFile = null;
-		try {
-			if (!open) {
-				UpdateCore.warn("Internal Error: The Error/Recovery log is not open:"+logEntry);				
-				return;
-			}
-
-			StringBuffer buffer = new StringBuffer(LOG_ENTRY_KEY);
-			buffer.append(index);
-			buffer.append("=");
-			buffer.append(logEntry);
-			buffer.append(RETURN_CARRIAGE);
-
-			out.write(buffer.toString());
-			out.flush();
-			index++;
-		} catch (IOException e) {
-			throw Utilities.newCoreException(
-				Policy.bind("UpdateManagerUtils.UnableToLog", new Object[] { logFile }),
-				e);
-		}
-	}
-
-	/**
-	 * Append the string to the log and flush
-	 */
-	public void appendPath(String logEntry, String path) throws CoreException {
-		if (path == null)
-			return;
-		StringBuffer buffer = new StringBuffer(logEntry);
-		buffer.append(" ");
-		buffer.append(path);
-		append(buffer.toString());
-		
-		addPath(path);
-	}
-
-	/**
-	 * Close any open recovery log
-	 */
-	public void close(String logEntry) throws CoreException {
-		
-		if (nbOfOpen>0){
-			UpdateCore.warn("Close nested Error/Recovery log #"+nbOfOpen+":"+logEntry);			
-			nbOfOpen--;			
-			return;
-		}			
-		
-		UpdateCore.warn("Close Error/Recovery log #"+nbOfOpen+":"+logEntry);
-		append(logEntry);
-		if (out != null) {
-			try {
-				out.write(END_OF_FILE);
-				out.flush();
-				out.close();
-			} catch (IOException e) { //eat the exception
-			} finally {
-				out = null;
-				open=false;
-			}
-		}
-	}
-
-	/**
-	 * Delete the file from the file system
-	 */
-	public void delete() {
-		//File logFile = getRecoveryLogFile();
-		getRecoveryLogFile();
-		//if (logFile.exists())
-			//logFile.delete();	
-	}
-
-	/**
-	 * 
-	 */
-	private void addPath(String path){
-		if (paths==null) paths = new ArrayList();
-		paths.add(path);
-	}
-	
-	/** 
-	 * recover an install or remove that didn't finish
-	 * Delete file for an unfinished delete
-	 * Delete file for an unfinshed install if not all the files were installed
-	 * Rename XML files for an install if all the files were installed but not renamed
-	 */
-	public IStatus recover(){
-		
-		IStatus mainStatus = createStatus(IStatus.OK,"Recovering status",null);
-		MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),mainStatus.getMessage(),null);
-
-		//check if recovery is on
-		if (!RECOVERY_ON){
-			UpdateCore.warn("Recovering is turned off. Abort recovery");
-			return multi;
-		}
-		
-		File logFile = getRecoveryLogFile();
-		if (!logFile.exists()){
-			multi.add(createStatus(IStatus.ERROR,"Unable to find log file:"+logFile,null));
-			return multi;
-		}
-		
-		InputStream in = null;
-		Properties prop = null;
-		try {
-			in = new FileInputStream(logFile);
-			prop = new Properties();
-			prop.load(in);
-		} catch (IOException e){
-			UpdateCore.warn("Unable to read:"+logFile,e);
-			multi.add(createStatus(IStatus.ERROR,"Unable to access property file:"+logFile,e));
-			return multi;
-		} finally {
-			if (in != null)
-				try {
-					in.close();
-				} catch (IOException e1) {
-				}
-		}
-		
-		String eof = prop.getProperty("eof");
-		if(eof!=null && eof.equals("eof")){
-			// all is good
-			delete();
-			UpdateCore.warn("Found log file. Log file contains end-of-file. No need to process");
-			multi.add(createStatus(IStatus.OK,null,null));
-			return multi;
-		}
-		
-		String recovery = prop.getProperty(LOG_ENTRY_KEY+"0");
-		if (recovery==null){
-			multi.add(createStatus(IStatus.ERROR,"Unable to read log file. File doesn't contain the log entry:"+logFile,null));
-			return multi;			
-		}
-	
-		if(recovery.equalsIgnoreCase(START_INSTALL_LOG)){
-			multi.addAll(processRecoverInstall(prop));
-			return multi;
-		}
-		
-		if(recovery.equalsIgnoreCase(START_REMOVE_LOG)){
-			multi.addAll(processRecoverRemove(prop));
-			return multi;
-		}
-
-		multi.add(createStatus(IStatus.ERROR,"Unable to read log file. Unable to determine recovery to execute based on the first line of :"+logFile,null));
-		return multi;	
-	}
-	
-	/*
-	 * creates a Status
-	 */
-	private IStatus createStatus(int statusSeverity, String msg, Exception e){
-		String id =
-			UpdateCore.getPlugin().getBundle().getSymbolicName();
-	
-		StringBuffer completeString = new StringBuffer("");
-		if (msg!=null)
-			completeString.append(msg);
-		if (e!=null){
-			completeString.append("\r\n[");
-			completeString.append(e.toString());
-			completeString.append("]\r\n");
-		}
-		return new Status(statusSeverity, id, IStatus.OK, completeString.toString(), e);
-	}	
-	
-	/*
-	 * 
-	 */
-	 private IStatus processRecoverInstall(Properties prop){
-	 	
-		IStatus mainStatus = createStatus(IStatus.OK,"",null);
-		MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);
-	 	
-	 	Collection values = prop.values();
-	 	
-	 	if(values.contains(END_INSTALL_LOG)){
-			// all is good
-			delete();
-			UpdateCore.warn("Found log file. Log file contains END_INSTALL_LOG. No need to process rename");
-			multi.add(createStatus(IStatus.OK,null,null));
-			return multi;
-	 	}
-	 	
-	 	if (values.contains(ALL_INSTALLED) && !forceRemove){
-	 		// finish install by renaming
-	 		int index = 0;
-	 		boolean found = false;
-	 		String val = prop.getProperty(LOG_ENTRY_KEY+index);
-	 		while(val!=null && !found){
-	 			if(val.equalsIgnoreCase(ALL_INSTALLED)) found = true;
-	 			IStatus renameStatus = processRename(val);
-	 			UpdateCore.log(renameStatus);
-	 			if(renameStatus.getSeverity()!=IStatus.OK){
-	 				multi.add(renameStatus);
-	 			}
-	 			index++;
-	 			val = prop.getProperty(LOG_ENTRY_KEY+index);	 			
-	 		}
-	 		if (val==null){
-	 			UpdateCore.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
-	 			multi.add(createStatus(IStatus.ERROR,"Wrong log file. Unable to find entry for:"+LOG_ENTRY_KEY+index,null));
-				return multi;
-	 		}
-	 		// process recovery finished
-	 		delete();
-			UpdateCore.warn("Found log file. Successfully recovered by renaming. Feature is installed.");
-			multi.add(createStatus(IStatus.OK,null,null));
-	 	} else {
-	 		// remove all because install did not lay out all the files
-	 		// or recovery is not allowed
-	 		int index = 0;
-	 		String val = prop.getProperty(LOG_ENTRY_KEY+index);
-	 		while(val!=null){
-	 			IStatus removeStatus = processRemove(val);
-	 			UpdateCore.log(removeStatus);
-	 			if(removeStatus.getSeverity()!=IStatus.OK){
-	 				multi.addAll(removeStatus);
-	 			}
-	 			index++;
-	 			val = prop.getProperty(LOG_ENTRY_KEY+index);	 			
-	 		}
-	 		// process recovery finished
-	 		delete();
-			UpdateCore.warn("Found log file. Successfully recovered by removing. Feature is removed.");
-			multi.add(createStatus(IStatus.OK,null,null));
-	 	}
-	 	return multi;
-	 }
-	 
-	 /*
-	  * 
-	  */
-	  private IStatus processRename(String val){
-	  	
-		// get the path
-		int index = -1;
-		String newFileName = null;
-	  	if (val.startsWith(PLUGIN_ENTRY)){
-	  		index = PLUGIN_ENTRY.length();
-	  		newFileName= "plugin.xml";
-	  	} else if (val.startsWith(BUNDLE_MANIFEST_ENTRY)){
-	  		index = BUNDLE_MANIFEST_ENTRY.length();
-	  		newFileName= "META-INF/MANIFEST.MF";
-	  	}else if (val.startsWith(FRAGMENT_ENTRY)){
-	  		index = FRAGMENT_ENTRY.length();
-	  		newFileName= "fragment.xml";
-	  	} else if (val.startsWith(FEATURE_ENTRY)){
-	  		index = FEATURE_ENTRY.length();
-	  		newFileName= "feature.xml";
-	  	} else if (val.startsWith(BUNDLE_JAR_ENTRY)){
-	  		index = BUNDLE_JAR_ENTRY.length();
-	  	}
-	  	
-	  	if (index==-1){
-	  		return createStatus(IStatus.ERROR,"Unable to determine what action was taken by parsing"+val,null);
-	  	}
-	  	
-	  	String oldName = val.substring(index+1);
-	  	// oldname is com.pid/plugin#####.xml
-	  	// or oldname is com.pid/pid_pver.jar######.tmp
-	  	File oldFile = new File(oldName);
-	  	File newFile;
-	  	if(val.startsWith(BUNDLE_JAR_ENTRY)){
-	  		newFile = new File(oldFile.getAbsolutePath().substring(0, oldFile.getAbsolutePath().lastIndexOf(".jar")+".jar".length()));
-	  	}else{
-	  		newFile = new File(oldFile.getParentFile(),newFileName);
-	  	}
-	  	if (!oldFile.exists()){
-	  		if (newFile.exists()){
-	  			// ok the file has been renamed apparently
-			  	return createStatus(IStatus.OK,"File already renamed into:"+newFile,null);	  				
-	  		} else {
-	  			// the file doesn't exist, log as problem, and force the removal of the feature
-		  		return createStatus(IStatus.ERROR,"Unable to find file:"+oldFile,null);	  			
-	  		}
-	  	} 	
-	  	
-		boolean sucess = false;
-		if (newFile.exists()) {
-			UpdateManagerUtils.removeFromFileSystem(newFile);
-			UpdateCore.warn("Removing already existing file:"+newFile);
-		}
-		sucess = oldFile.renameTo(newFile);
-			
-		if(!sucess){
-			String msg =("Unable to rename old in new:"+oldFile+newFile);
-			return createStatus(IStatus.ERROR,msg,null);
-		}
-		return createStatus(IStatus.OK,"Sucessfully renamed:"+oldFile+" to:"+newFile,null);
-	  }
-	  
-	 /*
-	  * 
-	  */
-	  private IStatus processRemove(String val){
-	  	
-		IStatus mainStatus = createStatus(IStatus.OK,"",null);
-		MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);	  	
-	  	
-		// get the path
-		int index = -1;
-		if (val.startsWith(BUNDLE_JAR_ENTRY)){
-	  		index = BUNDLE_JAR_ENTRY.length();
-	  	}
-	  	
-	  	if (index==-1){
-	  		return createStatus(IStatus.ERROR,"Unable to determine what action was taken by parsing"+val,null);
-	  	}
-	  	
-	  	String oldName = val.substring(index+1);
-	  	File oldFile = new File(oldName);
-	  	if (!oldFile.exists()){
-  			// the jar or directory doesn't exist, log as problem, and force the removal of the feature
-	  		multi.add(createStatus(IStatus.ERROR,"Unable to find file:"+oldFile,null));	  			
-	  		return multi;
-	  	} 		  	
-		multi.addAll(removeFromFileSystem(oldFile));
-
-		return multi;
-	  }	
-	  
-	/**
-	 * return a multi status, 
-	 * the children are the file that couldn't be removed
-	 */
-	public IStatus removeFromFileSystem(File file) {
-		
-		IStatus mainStatus = createStatus(IStatus.OK,"",null);
-		MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);		
-		
-		if (!file.exists()){
-			multi.add(createStatus(IStatus.ERROR,"Unable to find file to remove:"+file,null));
-			return multi;
-		}
-			
-		if (file.isDirectory()) {
-			String[] files = file.list();
-			if (files != null) // be careful since file.list() can return null
-				for (int i = 0; i < files.length; ++i){
-					multi.addAll(removeFromFileSystem(new File(file, files[i])));
-				}
-		}
-		
-		if (!file.delete()) {
-			String msg = "Unable to remove file" +file.getAbsolutePath(); //$NON-NLS-1$ 
-			multi.add(createStatus(IStatus.ERROR,msg,null));
-		}
-		return multi;
-	}	
-	
-	/*
-	 * 
-	 */
-	 private IStatus processRecoverRemove(Properties prop){
-	 	
-		IStatus mainStatus = createStatus(IStatus.OK,"",null);
-		MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);
-	 	
-	 	Collection values = prop.values();
-	 	
-	 	if(values.contains(END_REMOVE_LOG)){
-			// all is good
-			delete();
-			UpdateCore.warn("Found log file. Log file contains END_REMOVE_LOG. No need to process rename");
-			multi.add(createStatus(IStatus.OK,null,null));
-			return multi;
-	 	}
-	 	
-	 	if (!values.contains(END_ABOUT_REMOVE)){
-	 		// finish install by renaming
- 			multi.add(createStatus(IStatus.ERROR,"The remove process didn't start. Please remove the disable feature from the program.",null));
-				return multi;
-	 	} else {
-	 		// finish install by renaming
-	 		int index = 0;
-	 		boolean found = false;
-	 		String val = prop.getProperty(LOG_ENTRY_KEY+index);
-	 		while(val!=null && !found){
-	 			if(val.equalsIgnoreCase(END_ABOUT_REMOVE)) found = true;
-	 			IStatus renameStatus = processRemove(val);
-	 			UpdateCore.log(renameStatus);
-	 			if(renameStatus.getSeverity()!=IStatus.OK){
-	 				multi.add(renameStatus);
-	 			}
-	 			index++;
-	 			val = prop.getProperty(LOG_ENTRY_KEY+index);	 			
-	 		}
-	 		if (val==null){
-	 			UpdateCore.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
-	 			multi.add(createStatus(IStatus.ERROR,"Wrong log file. Unable to find entry for:"+LOG_ENTRY_KEY+index,null));
-				return multi;
-	 		}
-	 		// process recovery finished
-	 		delete();
-			UpdateCore.warn("Found log file. Successfully recovered by deleting. Feature is removed.");
-			multi.add(createStatus(IStatus.OK,null,null));
-	 	}
-	 	return multi;
-	 }	    
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
deleted file mode 100644
index 0a89f1d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.update.internal.core;
-
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-
-/**
- * A default implementation for IFeatureContentConsumer
- * </p>
- * @since 2.0
- */
-
-public abstract class FeatureContentConsumer extends ModelObject
-	implements IFeatureContentConsumer {
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureDownloadException.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureDownloadException.java
deleted file mode 100644
index fb8f679..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureDownloadException.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.update.internal.core;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Exception thrown when IOException during downloading features
- * 
- * @since 3.0
- */
-public class FeatureDownloadException extends CoreException {
-	/**
-	 * Construct the exception indicating enclosing CoreException
-	 * 
-	 * @since 3.0
-	 */
-	public FeatureDownloadException(String msg, Exception e) {
-		super(
-			new Status(
-				IStatus.INFO,
-				"org.eclipse.update.core", //$NON-NLS-1$
-				IStatus.OK,
-				msg,
-				e));
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
deleted file mode 100644
index 1e65f48..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

- 

-import java.util.*;

-

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

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

-

-/**

- * ContentConsumer Implementation for a FeatureExecutable

- */

-

-public class FeatureExecutableContentConsumer extends FeatureContentConsumer {

-

-	private IFeature feature;

-	private boolean closed= false;

-	private boolean aborted= false;	

-	private ISiteContentConsumer contentConsumer;

-	private IFeatureContentConsumer parent = null;

-	private List /* of IFeatureContentCOnsumer */ children;

-

-	/*

-	 * @see IContentConsumer#open(INonPluginEntry)

-	 */

-	public IContentConsumer open(INonPluginEntry nonPluginEntry)

-		throws CoreException {

-		ContentConsumer cons = new NonPluginEntryContentConsumer(

-			getContentConsumer().open(nonPluginEntry));

-		return cons;

-	}

-

-	/*

-	 * @see IContentConsumer#open(IPluginEntry)

-	 */

-	public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException {

-		ContentConsumer cons = new PluginEntryContentConsumer(getContentConsumer().open(pluginEntry));

-		return cons;		

-	}

-

-	/*

-	 * @see IContentConsumer#addChild(IFeature)

-	 */

-	public void addChild(IFeature child) throws CoreException {

-		IFeatureContentConsumer childConsumer = child.getFeatureContentConsumer();

-		childConsumer.setParent(this);

-		if (children==null) children = new ArrayList();

-		children.add(childConsumer);

-		return;

-	}

-

-

-	/*

-	 * @see IFeatureContentConsumer#store(ContentReference, IProgressMonitor)

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor)

-		throws CoreException {

-		getContentConsumer().store(contentReference, monitor);

-	}

-

-	/*

-	 * @see IFeatureContentConsumer#close()

-	 */

-	public IFeatureReference close() throws CoreException {

-		

-		if (!closed && getParent()!=null){

-			closed=true;

-			return null;

-		}

-		

-		// parent consumer, log we are about to rename

-		// log files have been downloaded

-		if (getParent()==null){

-			ErrorRecoveryLog.getLog().append(ErrorRecoveryLog.ALL_INSTALLED);

-		}

-		

-		IFeatureReference ref= null;

-		if (contentConsumer != null)

-			ref = contentConsumer.close();

-		

-		// close nested feature

-		IFeatureContentConsumer[] children = getChildren();

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

-			children[i].close();

-		}

-							

-		return ref;

-	}

-

-	/*

-	 * @see IFeatureContentConsumer#setFeature(IFeature)

-	 */

-	public void setFeature(IFeature feature) {

-		this.feature= feature;

-	}

-

-	/*

-	 * Sets the parent 

-	 */

-	public void setParent(IFeatureContentConsumer featureContentConsumer) {

-		this.parent= featureContentConsumer;

-	}

-

-	/*

-	 * returns the Content Consumer for the feature

-	 * 

-	 * Right now we are the only one to implement SiteContentConsumer

-	 * Need to be exposed as API post v2.0

-	 */

-	private ISiteContentConsumer getContentConsumer() throws CoreException {

-		if (contentConsumer == null)

-			if (feature.getSite() instanceof SiteFile) {

-				SiteFile site= (SiteFile) feature.getSite();

-				contentConsumer= site.createSiteContentConsumer(feature);

-			} else {

-				throw new UnsupportedOperationException();

-			}

-		return contentConsumer;

-	}

-

-	/*

-	 * @see IFeatureContentConsumer#abort()

-	 */

-	public void abort() throws CoreException {

-

-		if (aborted) return;

-		

-		IFeatureContentConsumer[] children = getChildren();

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

-			try {

-			children[i].abort();

-			} catch (Exception e){

-				//do Nothing

-			}

-		}

-

-		// do not close plugin and non plugin content consumer

-		// the contentConsumer will abort them

-		// we do not need to abort the NonPluginEntryContentConsumer and PluginEntryContentConsume

-

-		//implement the cleanup

-		if (contentConsumer!=null)

-			contentConsumer.abort();

-		

-		aborted = true;

-	}

-

-	/*

-	 * @see IFeatureContentConsumer#getFeature()

-	 */

-	public IFeature getFeature(){

-		return feature;

-	}

-

-	/*

-	 * @see IFeatureContentConsumer#getParent()

-	 */

-	public IFeatureContentConsumer getParent(){

-		return parent;

-	}

-

-	/*

-	 * @see IFeatureContentConsumer#getChildren()

-	 */

-	public IFeatureContentConsumer[] getChildren(){

-		if (children==null)

-			return new IFeatureContentConsumer[0];

-

-		return (IFeatureContentConsumer[]) children.toArray(arrayTypeFor(children));

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
deleted file mode 100644
index 0a6630e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
+++ /dev/null

@@ -1,273 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

-

-/**

- * Default implementation of a Executable Feature Content Provider

- */

-

-public class FeatureExecutableContentProvider extends FeatureContentProvider {

-

-	/*

-	 * Constructor 

-	 */

-	public FeatureExecutableContentProvider(URL url) {

-		super(url);

-	}

-

-	/*

-	 * Return the path for a pluginEntry

-	 */

-	private String getPath(IPluginEntry pluginEntry)

-		throws IOException, CoreException {

-

-		// get the URL of the Archive file that contains the plugin entry

-		ISiteContentProvider provider = getFeature().getSite().getSiteContentProvider();

-		URL fileURL = provider.getArchiveReference(getPathID(pluginEntry));

-		String result = fileURL.getFile();

-

-		if (!result.endsWith(".jar") && !result.endsWith(File.separator)) //$NON-NLS-1$

-			result += File.separator;

-		File pluginPath = new File(result);

-		if (!pluginPath.exists())

-			throw new IOException(

-				Policy.bind("FeatureExecutableContentProvider.FileDoesNotExist", result));	//$NON-NLS-1$

-

-		return result;

-	}

-

-	/*

-	 * Returns the path for the Feature

-	 */

-	private String getFeaturePath() throws IOException {

-		String result = getFeature().getURL().getFile();

-

-		// return the list of all subdirectories

-		if (!(result.endsWith(File.separator) || result.endsWith("/"))) //$NON-NLS-1$

-			result += File.separator;

-		File pluginDir = new File(result);

-		if (!pluginDir.exists())

-			throw new IOException(

-				Policy.bind("FeatureExecutableContentProvider.FileDoesNotExist", result)); //$NON-NLS-1$

-

-		return result;

-	}

-

-	/*

-	 * Returns all the files under the directory

-	 * Recursive call

-	 */

-	private List getFiles(File dir) throws IOException {

-		List result = new ArrayList();

-

-		if (!dir.isDirectory()) {

-			String msg =

-				Policy.bind(

-					"FeatureExecutableContentProvider.InvalidDirectory", //$NON-NLS-1$

-					dir.getAbsolutePath());

-

-			throw new IOException(msg);

-

-		}

-

-		File[] files = dir.listFiles();

-		if (files != null)

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

-				if (files[i].isDirectory()) {

-					result.addAll(getFiles(files[i]));

-				} else {

-					result.add(files[i]);

-				}

-			}

-

-		return result;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getVerifier()

-	 */

-	public IVerifier getVerifier() throws CoreException {

-		return null;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureManifestReference()

-	 */

-	public ContentReference getFeatureManifestReference(InstallMonitor monitor)

-		throws CoreException {

-		ContentReference result = null;

-		try {

-			result = new ContentReference(Feature.FEATURE_XML, new URL(getURL(), Feature.FEATURE_XML));

-

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(

-				Policy.bind(

-					"FeatureExecutableContentProvider.UnableToCreateURLFor", //$NON-NLS-1$

-					getURL().toExternalForm() + " " + Feature.FEATURE_XML), //$NON-NLS-1$

-				e);

-		}

-		return result;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getArchiveReferences()

-	 */

-	public ContentReference[] getArchiveReferences(InstallMonitor monitor)

-		throws CoreException {

-		// executable feature does not contain archives

-		return new ContentReference[0];

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry)

-	 */

-	public ContentReference[] getPluginEntryArchiveReferences(

-		IPluginEntry pluginEntry,

-		InstallMonitor monitor)

-		throws CoreException {

-		ContentReference[] result = new ContentReference[1];

-		String archiveID = getPathID(pluginEntry);

-		try {

-			File archiveFile = new File(getPath(pluginEntry));

-			if(!archiveFile.isDirectory() && archiveFile.getName().endsWith(".jar")){ //$NON-NLS-1$

-				result[0] = new JarContentReference(archiveID, archiveFile);				

-			} else {

-				result[0] =

-					new ContentReference(archiveID, archiveFile);

-			}

-		} catch (IOException e) {

-			throw Utilities.newCoreException(

-					Policy.bind(

-						"FeatureExecutableContentProvider.UnableToRetrievePluginEntry", //$NON-NLS-1$

-						pluginEntry.getVersionedIdentifier().toString()),

-					e);

-		}

-		return result;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getNonPluginEntryArchiveReferences(INonPluginEntry)

-	 */

-	public ContentReference[] getNonPluginEntryArchiveReferences(

-		INonPluginEntry nonPluginEntry,

-		InstallMonitor monitor)

-		throws CoreException {

-

-		ContentReference[] result = new ContentReference[1];

-		URL fileURL;

-

-		//try {

-		// get the URL of the Archive file that contains the plugin entry

-		ISiteContentProvider provider = getFeature().getSite().getSiteContentProvider();

-		fileURL = provider.getArchiveReference(getPathID(nonPluginEntry));

-

-		String fileString = fileURL.getFile();

-		File nonPluginData = new File(fileString);

-		if (!nonPluginData.exists())

-			throw Utilities.newCoreException(

-				Policy.bind("FeatureExecutableContentProvider.FileDoesNotExist", fileString), //$NON-NLS-1$

-				null); 

-

-		try {

-			result[0] =

-				new ContentReference(nonPluginEntry.getIdentifier(), nonPluginData.toURL());

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(

-				Policy.bind(

-					"FeatureExecutableContentProvider.UnableToRetrieveNonPluginEntry", //$NON-NLS-1$

-					nonPluginEntry.getIdentifier().toString()),

-				e);

-		}

-		return result;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureEntryArchiveReferences()

-	 */

-	public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor)

-		throws CoreException {

-		ContentReference[] contentReferences = new ContentReference[1];

-		contentReferences[0] = new ContentReference(null, getURL());

-		return contentReferences;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureEntryArchivesContentReferences()

-	 */

-	public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor)

-		throws CoreException {

-		ContentReference[] result = new ContentReference[0];

-		try {

-			File featureDir = new File(getFeaturePath());

-			List files = getFiles(featureDir);

-			result = new ContentReference[files.size()];

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

-				File currentFile = (File) files.get(i);

-				result[i] = new ContentReference(currentFile.getName(), currentFile.toURL());

-			}

-		} catch (IOException e) {

-			throw Utilities.newCoreException(

-				Policy.bind(

-					"FeatureExecutableContentProvider.UnableToRetrieveFeatureEntryContentRef", //$NON-NLS-1$

-					getFeature().getVersionedIdentifier().toString()),

-				e);

-		}

-		return result;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry)

-	 */

-	public ContentReference[] getPluginEntryContentReferences(

-		IPluginEntry pluginEntry,

-		InstallMonitor monitor)

-		throws CoreException {

-

-		ContentReference[] references = getPluginEntryArchiveReferences(pluginEntry, monitor);

-		ContentReference[] result = new ContentReference[0];

-

-		try {

-			if (references[0] instanceof JarContentReference) {

-				result = ((JarContentReference)references[0]).peek(null, monitor);

-			} else {

-				// return the list of all subdirectories

-				File pluginDir = new File(getPath(pluginEntry));

-				URL pluginURL = pluginDir.toURL();

-				List files = getFiles(pluginDir);

-				result = new ContentReference[files.size()];

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

-					File currentFile = (File) files.get(i);

-					String relativeString = UpdateManagerUtils.getURLAsString(pluginURL, currentFile.toURL());

-					result[i] = new ContentReference(relativeString, currentFile.toURL());

-				}

-			}

-		} catch (IOException e) {

-			throw Utilities.newCoreException(

-				Policy.bind(

-					"FeatureExecutableContentProvider.UnableToRetriveArchiveContentRef") //$NON-NLS-1$

-					+ pluginEntry.getVersionedIdentifier().toString(),

-				e);

-		}

-		

-		//[20866] we did not preserve executable bit

-		validatePermissions(result);

-		

-		return result;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
deleted file mode 100644
index cd8471e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-

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

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

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

-

-/**

- * FeatureFactory for Executable Features

- */

-public class FeatureExecutableFactory extends BaseFeatureFactory {

-

-	/*

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

-	 */

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

-

-		TargetFeature feature = null;

-		InputStream featureStream = null;

-		if (monitor == null)

-			monitor = new NullProgressMonitor();

-

-		if (url == null)

-			return createFeature(site);

-

-		// the URL should point to a directory

-		url = validate(url);

-

-		try {

-			IFeatureContentProvider contentProvider = new FeatureExecutableContentProvider(url);

-			// PERF: Do not create FeatureContentConsumer

-			//IFeatureContentConsumer contentConsumer =new FeatureExecutableContentConsumer();

-

-			URL nonResolvedURL = contentProvider.getFeatureManifestReference(null).asURL();

-			URL resolvedURL = URLEncoder.encode(nonResolvedURL);

-			featureStream = UpdateCore.getPlugin().get(resolvedURL).getInputStream();

-

-			feature = (TargetFeature) this.parseFeature(featureStream);

-			monitor.worked(1);

-			feature.setSite(site);

-

-			feature.setFeatureContentProvider(contentProvider);

-			// PERF: FeatureContentConsumer

-			//feature.setContentConsumer(contentConsumer);

-

-			feature.resolve(url, url);

-			feature.markReadOnly();

-		} catch (CoreException e) {

-			throw e;

-		} catch (Exception e) {

-			throw Utilities.newCoreException(Policy.bind("FeatureFactory.CreatingError", url.toExternalForm()), e);	//$NON-NLS-1$

-		} finally {

-			try {

-				if (featureStream != null)

-					featureStream.close();

-			} catch (IOException e) {

-			}

-		}

-		return feature;

-	}

-

-	/*

-	 * @see FeatureModelFactory#createFeatureModel()

-	 */

-	public FeatureModel createFeatureModel() {

-		return new TargetFeature();

-	}

-

-	/*

-	 * Creates an empty feature on the site 

-	 */

-	private IFeature createFeature(ISite site) throws CoreException {

-		TargetFeature feature = null;

-

-		IFeatureContentProvider contentProvider = new FeatureExecutableContentProvider(null);

-		IFeatureContentConsumer contentConsumer = new FeatureExecutableContentConsumer();

-		feature = (TargetFeature) createFeatureModel();

-		feature.setSite(site);

-		feature.setFeatureContentProvider(contentProvider);

-		feature.setContentConsumer(contentConsumer);

-

-		// do not mark read only yet...	

-		return feature;

-	}

-

-	/*

-	 * validates a URL as a directory URL

-	 */

-	private URL validate(URL url) throws CoreException {

-

-		if (url == null)

-			throw Utilities.newCoreException(Policy.bind("FeatureExecutableFactory.NullURL"), null); //$NON-NLS-1$

-

-		if (!(url.getFile().endsWith("/") || url.getFile().endsWith(File.separator) || url.getFile().endsWith(Feature.FEATURE_XML))) { //$NON-NLS-1$

-			try {

-				String path = url.getFile() + "/"; //$NON-NLS-1$

-				url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);

-			} catch (MalformedURLException e) {

-				throw Utilities.newCoreException(Policy.bind("FeatureExecutableFactory.CannotCreateURL", url.toExternalForm()), e);	//$NON-NLS-1$

-			}

-		}

-		return url;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
deleted file mode 100644
index 9a1f89c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
+++ /dev/null

@@ -1,273 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

-import org.eclipse.update.internal.security.*;

-

-/**

- * Content Provider of a Feature Package

- */

-public class FeaturePackagedContentProvider extends FeatureContentProvider {

-

-	private ContentReference localManifest = null;

-	private ContentReference[] localFeatureFiles = new ContentReference[0];

-	private IVerifier jarVerifier = null;

-

-	/*

-	 * filter for file with .jar

-	 */

-	public static final FilenameFilter filter = new FilenameFilter() {

-		public boolean accept(File dir, String name) {

-			return name.endsWith(FeaturePackagedContentProvider.JAR_EXTENSION);

-		}

-	};

-

-	/*

-	 * Constructor 

-	 */

-	public FeaturePackagedContentProvider(URL url) {

-		super(url);

-	}

-

-	/*

-	 * Returns a new verifier for each top-level install

-	 * (if the verifier has a parent, return the verifier

-	 * otherwise reinitialize)

-	 */

-	public IVerifier getVerifier() throws CoreException {

-		if (jarVerifier == null || jarVerifier.getParent() == null) {

-			jarVerifier = new JarVerifier();

-			return jarVerifier;

-		}

-

-		// re-init will be done if the parent changes

-		return jarVerifier;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureManifestReference()

-	 */

-	public ContentReference getFeatureManifestReference(InstallMonitor monitor) throws CoreException {

-

-		// check to see if we already have local copy of the manifest

-		if (localManifest != null)

-			return localManifest;

-		ContentReference[] featureArchiveReference = getFeatureEntryArchiveReferences(monitor);

-		JarContentReference featureJarReference = null;

-		try {

-

-			// force feature archive to local.

-			// This content provider always assumes exactly 1 archive file (index [0])		

-			featureJarReference = (JarContentReference) asLocalReference(featureArchiveReference[0], null);

-			// we need to unpack archive locally for UI browser references to be resolved correctly

-			localFeatureFiles = featureJarReference.unpack(getWorkingDirectory(), null, monitor);

-		} catch (IOException e) {

-			throw errorRetrieving(Feature.FEATURE_XML, featureJarReference, getURL(), e); //$NON-NLS-1$ 

-		}

-

-		// find the manifest in the unpacked feature files

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

-			if (localFeatureFiles[i].getIdentifier().equals(Feature.FEATURE_XML)) {

-				localManifest = localFeatureFiles[i];

-				// cache reference to manifest

-				return localManifest;

-			}

-		}

-

-		// the manifest has not been found

-		String[] values = new String[] { Feature.FEATURE_XML, getURL().toExternalForm()};

-		throw Utilities.newCoreException(Policy.bind("FeaturePackagedContentProvider.NoManifestFile", values), new Exception()); //$NON-NLS-1$ 

-

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getArchiveReferences()

-	 */

-	public ContentReference[] getArchiveReferences(InstallMonitor monitor) throws CoreException {

-

-		IPluginEntry[] entries = getFeature().getPluginEntries();

-		INonPluginEntry[] nonEntries = getFeature().getNonPluginEntries();

-		List listAllContentRef = new ArrayList();

-		ContentReference[] allContentRef = new ContentReference[0];

-

-		// feature

-		listAllContentRef.addAll(Arrays.asList(getFeatureEntryArchiveReferences(monitor)));

-

-		// plugins

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

-			listAllContentRef.addAll(Arrays.asList(getPluginEntryArchiveReferences(entries[i], monitor)));

-		}

-

-		// non plugins

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

-			listAllContentRef.addAll(Arrays.asList(getNonPluginEntryArchiveReferences(nonEntries[i], monitor)));

-		}

-

-		// transform List in Array

-		if (listAllContentRef.size() > 0) {

-			allContentRef = new ContentReference[listAllContentRef.size()];

-			listAllContentRef.toArray(allContentRef);

-		}

-

-		return allContentRef;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureEntryArchiveReferences()

-	 */

-	public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor) throws CoreException {

-

-		//1 jar file <-> 1 feature

-		// we will return the JAR file 

-		ContentReference[] references = new ContentReference[1];

-		ContentReference currentReference = null;

-		String archiveID = null;

-

-		try {

-			archiveID = (getFeature() != null) ? getFeature().getVersionedIdentifier().toString() : "";	//$NON-NLS-1$

-			currentReference = new JarContentReference(archiveID, getURL());

-			currentReference = asLocalReference(currentReference, monitor);

-			references[0] = currentReference;

-		} catch (IOException e) {

-			throw errorRetrieving(archiveID, currentReference, getFeature().getURL(), e); //$NON-NLS-1$

-		}

-		return references;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry)

-	 */

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

-

-		// 1 plugin <-> 1 jar

-		// we return the JAR file	

-		ContentReference[] references = new ContentReference[1];

-		String archiveID = getPathID(pluginEntry);

-		ISite site = (getFeature() == null) ? null : getFeature().getSite();

-		ISiteContentProvider siteContentProvider = (site == null) ? null : site.getSiteContentProvider();

-		URL url = (siteContentProvider == null) ? null : siteContentProvider.getArchiveReference(archiveID);

-

-		try {

-			references[0] = asLocalReference(new JarContentReference(archiveID, url), monitor);

-		} catch (IOException e) {

-			throw errorRetrieving(archiveID, references[0], getFeature().getURL(), e);

-		}

-		return references;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getNonPluginEntryArchiveReferences(INonPluginEntry)

-	 */

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

-

-		// archive = feature/<id>_<ver>/<file>

-		String archiveID = Site.DEFAULT_FEATURE_PATH + ((getFeature() != null) ? getFeature().getVersionedIdentifier().toString() : ""); //$NON-NLS-1$

-		archiveID += "/" + nonPluginEntry.getIdentifier(); //$NON-NLS-1$

-

-		ContentReference[] references = new ContentReference[1];

-		ContentReference currentReference = null;

-

-		try {

-			ISite site = (getFeature() == null) ? null : getFeature().getSite();

-			ISiteContentProvider siteContentProvider = (site == null) ? null : site.getSiteContentProvider();

-			URL url = (siteContentProvider == null) ? null : siteContentProvider.getArchiveReference(archiveID);

-

-			currentReference = new ContentReference(nonPluginEntry.getIdentifier(), url);

-			currentReference = asLocalReference(currentReference, monitor);

-			references[0] = currentReference;

-

-		} catch (IOException e) {

-			throw errorRetrieving(archiveID, currentReference, getFeature().getURL(), e);

-		}

-

-		return references;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureEntryContentReferences()

-	 */

-	public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor) throws CoreException {

-

-		return localFeatureFiles; // return cached feature references

-		// Note: assumes this content provider is always called first to

-		//       get the feature manifest. This forces the feature files

-		//       to be unpacked and caches the references

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry)

-	 */

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

-

-		ContentReference[] references = getPluginEntryArchiveReferences(pluginEntry, monitor);

-		ContentReference[] pluginReferences = new ContentReference[0];

-

-		try {

-			if (references[0] instanceof JarContentReference) {

-				JarContentReference localRef = (JarContentReference) asLocalReference(references[0], monitor);

-				pluginReferences = localRef.peek(null, monitor);

-			} else {

-				// return the list of all subdirectories

-				List files = getFiles(references[0].asFile());

-				pluginReferences = new ContentReference[files.size()];

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

-					File currentFile = (File) files.get(i);

-					pluginReferences[i] = new ContentReference(null, currentFile.toURL());

-				}

-			}

-

-			//[20866] we did not preserve executable bit

-			validatePermissions(pluginReferences);

-

-		} catch (IOException e) {

-			throw errorRetrieving(pluginEntry.getVersionedIdentifier().toString(), references[0], getFeature().getURL(), e);

-		}

-		return pluginReferences;

-	}

-

-	/*

-	 * return all the files under the directory

-	 */

-	private List getFiles(File dir) throws IOException {

-		List result = new ArrayList();

-

-		if (!dir.isDirectory())

-			throw new IOException(Policy.bind("FeaturePackagedContentProvider.InvalidDirectory", dir.getPath())); //$NON-NLS-1$

-

-		File[] files = dir.listFiles();

-		if (files != null) // be careful since it can be null

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

-				if (files[i].isDirectory()) {

-					result.addAll(getFiles(files[i]));

-				} else {

-					result.add(files[i]);

-				}

-			}

-		return result;

-	}

-

-	/*

-	 * 

-	 */

-	private CoreException errorRetrieving(String obj, ContentReference archive, URL url, Exception e) {

-

-		String[] values = new String[] { obj };

-

-		return Utilities.newCoreException(Policy.bind("FeaturePackagedContentProvider.ErrorRetrieving", values), e); //$NON-NLS-1$	 	

-

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
deleted file mode 100644
index bbd7de4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.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.internal.core;

-import java.io.*;

-import java.net.*;

-

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

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

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

-

-/**

- * Factory for Feature Packaged

- */

-public class FeaturePackagedFactory extends BaseFeatureFactory {

-

-	/*

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

-	 */

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

-		Feature feature = null;

-		InputStream featureStream = null;

-		if (monitor == null)

-			monitor = new NullProgressMonitor();

-		monitor.beginTask(null,2);

-		monitor.worked(1);

-			

-					

-		try {	

-			IFeatureContentProvider contentProvider = new FeaturePackagedContentProvider(url);	

-			ContentReference manifest = contentProvider.getFeatureManifestReference(null/*IProgressMonitor*/);

-			featureStream = manifest.getInputStream();

-			feature = (Feature)parseFeature(featureStream);

-			monitor.worked(1);

-	

-			// if there is no update URL for the Feature

-			// use the Site URL

-			if (feature.getUpdateSiteEntry()==null){

-				URLEntryModel entryModel = createURLEntryModel();

-				URL siteUrl = site.getURL();

-				if (siteUrl!=null){

-					entryModel.setURLString(siteUrl.toExternalForm());

-					entryModel.resolve(siteUrl,null);

-					feature.setUpdateSiteEntryModel(entryModel);

-				}

-			}	

-			feature.setFeatureContentProvider(contentProvider);

-			feature.setSite(site);						

-			URL baseUrl = null;

-			try {

-				baseUrl = new URL(manifest.asURL(),"."); // make sure we have URL to feature directory //$NON-NLS-1$

-			} catch(MalformedURLException e) {	

-			}

-			feature.resolve(baseUrl, baseUrl);

-			feature.markReadOnly();			

-		}  catch (CoreException e){

-			throw e;

-		} catch (Exception e) { 

-			throw Utilities.newCoreException(Policy.bind("FeatureFactory.CreatingError", url.toExternalForm()), e); //$NON-NLS-1$

-		}finally {

-			try {

-				if (featureStream!=null)	

-					featureStream.close();

-			} catch (IOException e) {

-			}

-		}

-		return feature;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePlugin.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePlugin.java
deleted file mode 100644
index 3c3d854..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePlugin.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-import org.eclipse.update.core.*;
-/**
- * An IPluginEntry - IFeature pair.
- * The IFeature is a featue or a patch wich delivered the plugin
- */
-public class FeaturePlugin {
-	private IPluginEntry pluginEntry;
-	private IFeature feature;
-	public FeaturePlugin(IPluginEntry entry, IFeature feature) {
-		pluginEntry = entry;
-		this.feature = feature;
-	}
-	public IPluginEntry getEntry() {
-		return pluginEntry;
-	}
-	public IFeature getFeature() {
-		return feature;
-	}
-	/**
-	 * Plugins are equal if their IDs and versions are the same.
-	 */
-	public boolean equals(Object o) {
-		if (o instanceof FeaturePlugin) {
-			FeaturePlugin p = (FeaturePlugin) o;
-			return getEntry().getVersionedIdentifier().equals(p.getEntry().getVersionedIdentifier());
-		}
-		return false;
-	}
-	public int hashCode() {
-		return getEntry().getVersionedIdentifier().hashCode();
-	}
-	public String toString() {
-		return pluginEntry + " in " + feature; //$NON-NLS-1$
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
deleted file mode 100644
index dc1d29f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.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.internal.core;

-import java.util.*;

-

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

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

-

-/**

- * Manages FeatureFactory extension point

- */

-public final class FeatureTypeFactory {

-

-	private static FeatureTypeFactory inst;

-	private Map factories;

-

-	private static final String SIMPLE_EXTENSION_ID = "featureTypes";	//$NON-NLS-1$	

-

-	/*

-	 * hide constructor

-	 */

-	private FeatureTypeFactory() {

-	}

-

-	/*

-	 * Singleton pattern

-	 */

-	public static FeatureTypeFactory getInstance() {

-		if (inst == null)

-			inst = new FeatureTypeFactory();

-		return inst;

-	}

-

-	/*

-	 * return the factory for the associated type

-	 */

-	public IFeatureFactory getFactory(String type) throws CoreException {

-		//

-		Object instance = getFactories().get(type);

-		if (instance == null) {

-			instance = createFactoryFor(type);

-			getFactories().put(type, instance);

-		}

-		return (IFeatureFactory) instance;

-	}

-

-	/*

-	 * creates a factory for the associated type and cache it 

-	 */

-	private IFeatureFactory createFactoryFor(String type) throws CoreException {

-		IFeatureFactory result = null;

-

-		String pluginID =

-			UpdateCore.getPlugin().getBundle().getSymbolicName();

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IConfigurationElement[] elements =

-			registry.getConfigurationElementsFor(pluginID, SIMPLE_EXTENSION_ID, type);

-

-		if (elements == null || elements.length == 0) {

-			throw Utilities.newCoreException(

-					Policy.bind("FeatureTypeFactory.UnableToFindFeatureFactory", type), //$NON-NLS-1$

-					null);

-		} 

-

-		IConfigurationElement element = elements[0];

-		result = (IFeatureFactory) element.createExecutableExtension("class");	//$NON-NLS-1$

-		return result;

-	}

-

-	/*

-	 * 

-	 */

-	private Map getFactories() {

-		if (factories == null)

-			factories = new HashMap();

-		return factories;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileFragment.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileFragment.java
deleted file mode 100644
index d382705..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileFragment.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.internal.core;
-
-import java.io.*;
-
-
-public class FileFragment{
-	private File file;
-	private long bytes;
-	public FileFragment(File file, long size){
-		this.file=file;
-		this.bytes=size;
-	}
-	public File getFile(){
-		return file;
-	}
-	public long getSize(){
-		return bytes;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
deleted file mode 100644
index d1bf021..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.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.update.internal.core;
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-
-public class FileResponse implements Response {
-
-	protected URL url;
-	protected long lastModified;
-
-	public FileResponse(URL url) {
-		this.url = url;
-	}
-
-	public InputStream getInputStream() throws IOException {
-		return url.openStream();
-	}
-
-	public InputStream getInputStream(IProgressMonitor monitor)
-		throws IOException, CoreException {
-		return getInputStream();
-	}
-
-	public long getContentLength() {
-		return 0;
-	}
-
-	public int getStatusCode() {
-		return IStatusCodes.HTTP_OK;
-	}
-
-	public String getStatusMessage() {
-		return ""; //$NON-NLS-1$
-	}
-
-	public long getLastModified() {
-		if (lastModified == 0) {
-			File f = new File(url.getFile());
-			if (f.isDirectory())
-				f = new File(f, "site.xml"); //$NON-NLS-1$
-			lastModified = f.lastModified();
-		}
-		return lastModified;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FragmentEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FragmentEntry.java
deleted file mode 100644
index 4afac79..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FragmentEntry.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-
-/**
- * This class is used to retrieve the fragments associated with a plugin.
- */
-public class FragmentEntry {
-	
-	private String pluginId;
-	private String pluginVersion;
-	private String name; 
-	private String location;
-	
-	public FragmentEntry(String id, String version, String name, String location) {
-		this.pluginId = id;
-		this.pluginVersion = version;
-		this.name = name;
-		this.location = location;
-	}
-
-	/**
-	 * @return the plugin translatable name
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * @return the location of the plugin
-	 */
-	public String getLocation() {
-		return location;
-	}
-	
-	/**
-	 * Returns the plug-in identifier for this entry.
-	 * 
-	 * @return the plug-in identifier, or <code>null</code>
-	 */
-	public String getPluginIdentifier() {
-		return pluginId;
-	}
-
-	/**
-	 * Returns the plug-in version for this entry.
-	 * 
-	 * @return the plug-in version, or <code>null</code>
-	 */
-	public String getPluginVersion() {
-		return pluginVersion;
-	}
-
-	/**
-	 * @see Object#toString()
-	 */
-	public String toString() {
-		String msg = (getPluginIdentifier()!=null)?getPluginIdentifier().toString():""; //$NON-NLS-1$
-		msg += getPluginVersion()!=null?" "+getPluginVersion().toString():""; //$NON-NLS-1$ //$NON-NLS-2$
-		return msg;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
deleted file mode 100644
index e9ac119..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-
-public class HttpResponse implements Response {
-	private static final long POLLING_INTERVAL = 200;
-	protected URL url;
-	protected InputStream in;
-	protected URLConnection connection;
-	protected long lastModified;
-	protected long offset;
-
-	public HttpResponse(URL url) {
-		this.url = url;
-	}
-
-	public InputStream getInputStream() throws IOException {
-		if (in == null && url != null) {
-			connection = url.openConnection();
-			if (offset > 0)
-				connection.setRequestProperty("Range", "bytes=" + offset + "-"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			in = connection.getInputStream();
-			checkOffset();
-		}
-		return in;
-	}
-	/**
-	 * @see Response#getInputStream(IProgressMonitor)
-	 */
-	public InputStream getInputStream(IProgressMonitor monitor)
-		throws IOException, CoreException {
-		if (in == null && url != null) {
-			connection = url.openConnection();
-			if (offset > 0)
-				connection.setRequestProperty("Range", "bytes=" + offset + "-"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-			if (monitor != null) {
-				this.in =
-					openStreamWithCancel(
-						(HttpURLConnection) connection,
-						monitor);
-			} else {
-				this.in = connection.getInputStream();
-			}
-			// this can also be run inside a monitoring thread, but it is safe
-			// to
-			// just call it now, if the input stream has already been obtained
-			checkOffset();
-			if (in != null) {
-				this.lastModified = connection.getLastModified();
-			}
-		}
-		return in;
-	}
-
-	public long getContentLength() {
-		if (connection != null)
-			return connection.getContentLength();
-		return 0;
-	}
-
-	public int getStatusCode() {
-		if (connection != null) {
-			try {
-				return ((HttpURLConnection) connection).getResponseCode();
-			} catch (IOException e) {
-				UpdateCore.warn("", e); //$NON-NLS-1$
-			}
-		}
-		return IStatusCodes.HTTP_OK;
-	}
-
-	public String getStatusMessage() {
-		if (connection != null) {
-			try {
-				return ((HttpURLConnection) connection).getResponseMessage();
-			} catch (IOException e) {
-				UpdateCore.warn("", e); //$NON-NLS-1$
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public long getLastModified() {
-		if (lastModified == 0) {
-			if (connection == null)
-				try {
-					connection = url.openConnection();
-				} catch (IOException e) {
-				}
-			if (connection != null)
-				lastModified = connection.getLastModified();
-		}
-		return lastModified;
-	}
-
-	private InputStream openStreamWithCancel(
-		HttpURLConnection urlConnection,
-		IProgressMonitor monitor)
-		throws IOException, CoreException {
-		ConnectionThreadManager.StreamRunnable runnable =
-			new ConnectionThreadManager.StreamRunnable(urlConnection);
-		Thread t =
-			UpdateCore.getPlugin().getConnectionManager().createThread(
-				runnable);
-		t.start();
-		InputStream is = null;
-		try {
-			for (;;) {
-				if (monitor.isCanceled()) {
-					runnable.disconnect();
-					break;
-				}
-				if (runnable.getInputStream() != null) {
-					is = runnable.getInputStream();
-					break;
-				}
-				if (runnable.getException() != null) {
-					if (runnable.getException() instanceof IOException)
-						throw (IOException) runnable.getException();
-					else
-						throw new CoreException(new Status(IStatus.ERROR,
-								UpdateCore.getPlugin().getBundle()
-										.getSymbolicName(), IStatus.OK,
-								runnable.getException().getMessage(), runnable
-										.getException()));
-				}
-				t.join(POLLING_INTERVAL);
-			}
-		} catch (InterruptedException e) {
-		}
-		return is;
-	}
-	public void setOffset(long offset) {
-		this.offset = offset;
-	}
-	private void checkOffset() throws IOException {
-		if (offset == 0)
-			return;
-		String range = connection.getHeaderField("Content-Range"); //$NON-NLS-1$
-		//System.out.println("Content-Range=" + range);
-		if (range == null) {
-			//System.err.println("Server does not support ranges");
-			throw new IOException(Policy.bind("HttpResponse.rangeExpected")); //$NON-NLS-1$
-		} else if (!range.startsWith("bytes " + offset + "-")) { //$NON-NLS-1$ //$NON-NLS-2$
-			//System.err.println("Server returned wrong range");
-			throw new IOException(Policy.bind("HttpResponse.wrongRange")); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
deleted file mode 100644
index 918a17d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
- 
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
- 
- /**
-  * A site content consumer manages the storage or archives, plugins and
-  * feature inside an <code> ISite</code>
-  */
- 
-public interface ISiteContentConsumer {
-
-	/**
-	 * Stores a content reference into the SiteContentConsumer
-	 * @param contentReference the content reference to store
-	 * @param monitor the progress monitor
-	 * @throws CoreException if an error occurs storing the content reference
-	 * @since 2.0 
-	 */
-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * opens a Non plugin Entry for storage
-	 * @return the new FeatureContentConsumer for this <code>INonPluginEntry</code>
-	 * @throws CoreException if the opens is done on a FeatureContentConsumer parent other than an IFeature.
-	 * @since 2.0 
-	 */
-	public IContentConsumer open(INonPluginEntry nonPluginEntry) throws CoreException;
-
-	/**
-	 * opens a Non plugin Entry for storage
-	 * @return the new FeatureContentConsumer for this <code>IPluginEntry</code>
-	 * @throws CoreException if the opens is done on a FeatureContentConsumer parent other than an IFeature.
-	 * @since 2.0 
-	 */
-	public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException;
-	
-	/**
-	 * closes the opened SiteContentConsumer
-	 * @throws CoreException
-	 * @since 2.0 
-	 */
-	public IFeatureReference close() throws CoreException ;	
-	
-
-	/**
-	 * aborts the opened SiteContentConsumer
-	 * @throws CoreException
-	 * @since 2.0 
-	 */
-	public void abort() throws CoreException;		
-	
-}
-
-

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
deleted file mode 100644
index 6582d7b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.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.update.internal.core;
-
-/**
- * HTTP status codes.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under 
- * development and expected to change significantly before reaching stability. 
- * It is being made available at this early stage to solicit feedback from pioneering 
- * adopters on the understanding that any code that uses this API will almost 
- * certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public interface IStatusCodes {
-	public static final int HTTP_CONTINUE = 100;
-	public static final int HTTP_SWITCHING_PROTOCOLS = 101;
-	public static final int HTTP_OK = 200;
-	public static final int HTTP_CREATED = 201;
-	public static final int HTTP_ACCEPTED = 202;
-	public static final int HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
-	public static final int HTTP_NO_CONTENT = 204;
-	public static final int HTTP_RESET_CONTENT = 205;
-	public static final int HTTP_PARTIAL_CONTENT = 206;
-	public static final int HTTP_MULTIPLE_CHOICES = 300;
-	public static final int HTTP_MOVED_PERMANENTLY = 301;
-	public static final int HTTP_MOVED_TEMPORARILY = 302;
-	public static final int HTTP_SEE_OTHER = 303;
-	public static final int HTTP_NOT_MODIFIED = 304;
-	public static final int HTTP_USE_PROXY = 305;
-	public static final int HTTP_TEMPORARY_REDIRECT = 307;
-	public static final int HTTP_BAD_REQUEST = 400;
-	public static final int HTTP_UNAUTHORIZED = 401;
-	public static final int HTTP_PAYMENT_REQUIRED = 402;
-	public static final int HTTP_FORBIDDEN = 403;
-	public static final int HTTP_NOT_FOUND = 404;
-	public static final int HTTP_METHOD_NOT_ALLOWED = 405;
-	public static final int HTTP_NOT_ACCEPTABLE = 406;
-	public static final int HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
-	public static final int HTTP_REQUEST_TIMEOUT = 408;
-	public static final int HTTP_CONFLICT = 409;
-	public static final int HTTP_GONE = 410;
-	public static final int HTTP_LENGTH_REQUIRED = 411;
-	public static final int HTTP_PRECONDITION_FAILED = 412;
-	public static final int HTTP_REQUEST_TOO_LONG = 413;
-	public static final int HTTP_REQUEST_URI_TOO_LONG = 414;
-	public static final int HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
-	public static final int HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
-	public static final int HTTP_EXPECTATION_FAILED = 417;
-	public static final int HTTP_INTERNAL_SERVER_ERROR = 500;
-	public static final int HTTP_NOT_IMPLEMENTED = 501;
-	public static final int HTTP_BAD_GATEWAY = 502;
-	public static final int HTTP_SERVICE_UNAVAILABLE = 503;
-	public static final int HTTP_GATEWAY_TIMEOUT = 504;
-	public static final int HTTP_HTTP_VERSION_NOT_SUPPORTED = 505;
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
deleted file mode 100644
index cc63d84..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.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.internal.core;

-

-import java.io.*;

-

-/**

- * Called when we want the model to persist as XML

- */

-

-public interface IWritable {

-	

-	public static final int INDENT = 3;

-

-	void write(int indent, PrintWriter w);

-

-

-}

-


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
deleted file mode 100644
index a37fccc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
+++ /dev/null

@@ -1,865 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

-import org.eclipse.osgi.service.resolver.*;

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

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

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

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

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

-import org.eclipse.update.internal.configurator.*;

-import org.eclipse.update.internal.model.*;

-import org.osgi.framework.*;

-

-/**

- * Manages ConfiguredSites

- *

- */

-

-public class InstallConfiguration extends InstallConfigurationModel implements IInstallConfiguration {

-	private static boolean isWindows = System.getProperty("os.name").startsWith("Win"); //$NON-NLS-1$ //$NON-NLS-2$

-	private ListenersList listeners = new ListenersList();

-

-	/*

-	 * default constructor.

-	 */

-	public InstallConfiguration() {

-	}

-

-	/*

-	 * Copy constructor 

-	 * @since 3.0

-	 */

-	public InstallConfiguration(IInstallConfiguration config) throws MalformedURLException, CoreException {

-		this(config, null, null);

-	}

-	

-	/*

-	 * copy constructor

-	 */

-	public InstallConfiguration(IInstallConfiguration config, URL newLocation, String label) throws CoreException, MalformedURLException {

-		// set current date and timeline as caller can call setDate if the

-		// date on the URL string has to be the same

-		Date now = new Date();

-		setCreationDate(now);

-		setCurrent(false);

-		

-		if (newLocation == null) {

-			String newFileName = UpdateManagerUtils.getLocalRandomIdentifier(SiteLocal.CONFIG_FILE, now);

-			newLocation = UpdateManagerUtils.getURL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(), newFileName, null);

-		}

-		setLocationURLString(newLocation.toExternalForm());

-		

-		if (label == null)

-			label = Utilities.format(now);

-		setLabel(label);

-

-		// do not copy list of listeners nor activities

-		// make a copy of the siteConfiguration object

-		if (config != null) {

-			IConfiguredSite[] csites = config.getConfiguredSites();

-			if (csites != null) {

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

-					ConfiguredSite configSite = new ConfiguredSite(csites[i]);

-					addConfigurationSiteModel(configSite);

-				}

-			}

-		}

-

-		resolve(newLocation, null);

-		// no need to parse file, all data are initialized

-		initialized = true;

-	}

-	

-

-	/*

-	 * Returns the list of configured sites or an empty array

-	 */

-	public IConfiguredSite[] getConfiguredSites() {

-		ConfiguredSiteModel[] result = getConfigurationSitesModel();

-		if (result.length == 0)

-			return new IConfiguredSite[0];

-		else

-			return (IConfiguredSite[]) result;

-	}

-

-	/*

-	 * Returns the default site policy

-	 */

-	private int getDefaultPolicy() {

-		return IPlatformConfiguration.ISitePolicy.USER_EXCLUDE;

-	}

-

-	/**

-	 * Creates a Configuration Site and a new Site

-	 * The policy is from <code> org.eclipse.core.boot.IPlatformConfiguration</code>

-	 */

-	public IConfiguredSite createConfiguredSite(File file) throws CoreException {

-

-		if (!file.getName().equals("eclipse")) { //$NON-NLS-1$

-			file = new File(file, "eclipse"); //$NON-NLS-1$

-			file.mkdirs();

-		}

-		

-		if (isDuplicateSite(file))

-			throw Utilities.newCoreException(Policy.bind("InstallConfiguration.location.exists", file.getPath()),null); //$NON-NLS-1$

-		ISite site = InternalSiteManager.createSite(file);

-

-		//create a config site around the site

-		// even if the site == null

-		BaseSiteLocalFactory factory = new BaseSiteLocalFactory();

-		ConfiguredSite configSite = (ConfiguredSite) factory.createConfigurationSiteModel((SiteModel) site, getDefaultPolicy());

-

-		if (configSite.isNativelyLinked()) {

-			throw Utilities.newCoreException("InstallConfiguration.AlreadyNativelyLinked", null); //$NON-NLS-1$

-		}

-		

-		if (configSite.isProductSite()) {

-			throw Utilities.newCoreException("InstallConfiguration.AlreadyProductSite", null); //$NON-NLS-1$

-		}

-		

-		if (site != null) {

-			configSite.setPlatformURLString(site.getURL().toExternalForm());

-

-			// obtain the list of plugins

-			IPlatformConfiguration runtimeConfiguration = ConfiguratorUtils.getCurrentPlatformConfiguration();

-			ConfigurationPolicy configurationPolicy = configSite.getConfigurationPolicy();

-			String[] pluginPath = new String[0];

-			if (configurationPolicy.getPolicy() == IPlatformConfiguration.ISitePolicy.USER_INCLUDE)

-				pluginPath = configurationPolicy.getPluginPath(site);

-

-			// create new Site in configuration

-			IPlatformConfiguration.ISitePolicy sitePolicy = runtimeConfiguration.createSitePolicy(configurationPolicy.getPolicy(), pluginPath);

-

-			// change runtime

-			IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.createSiteEntry(site.getURL(), sitePolicy);

-			runtimeConfiguration.configureSite(siteEntry);

-

-			// if the privatre marker doesn't already exist create it

-			configSite.createPrivateSiteMarker();

-		}

-		// configure all features as enable

-		configure(configSite);

-		

-		return configSite;

-	}

-

-	/**

-	 * Creates a Configuration Site and a new Site as a private link site

-	 * The policy is from <code> org.eclipse.core.boot.IPlatformConfiguration</code>

-	 */

-	public IConfiguredSite createLinkedConfiguredSite(File file) throws CoreException {

-		return createConfiguredSite(file);

-//		if (isDuplicateSite(file))

-//			throw Utilities.newCoreException(UpdateUtils.getFormattedMessage("InstallConfiguration.location.exists", file.getPath()),null);

-//		

-//		ISite site = InternalSiteManager.createSite(file);

-//

-//		//create a config site around the site

-//		// even if the site == null

-//		BaseSiteLocalFactory factory = new BaseSiteLocalFactory();

-//		ConfiguredSite configSite = (ConfiguredSite) factory.createConfigurationSiteModel((SiteModel) site, getDefaultPolicy());

-//

-//		if (!configSite.isExtensionSite()) {

-//			String msg = Policy.bind("InstallConfiguration.NotAnExtensionSite");

-//			throw Utilities.newCoreException(msg, null);

-//		}

-//

-//		if (configSite.isNativelyLinked()) {

-//			throw Utilities.newCoreException("InstallConfiguration.AlreadyNativelyLinked", null);

-//		}

-//

-//		if (site != null) {

-//			configSite.setPlatformURLString(site.getURL().toExternalForm());

-//

-//			// obtain the list of plugins

-//			IPlatformConfiguration runtimeConfiguration = ConfiguratorUtils.getCurrentPlatformConfiguration();

-//			ConfigurationPolicy configurationPolicy = configSite.getConfigurationPolicy();

-//			String[] pluginPath = new String[0];

-//			if (configurationPolicy.getPolicy() == IPlatformConfiguration.ISitePolicy.USER_INCLUDE)

-//				pluginPath = configurationPolicy.getPluginPath(site);

-//

-//			// create new Site in configuration

-//			IPlatformConfiguration.ISitePolicy sitePolicy = runtimeConfiguration.createSitePolicy(configurationPolicy.getPolicy(), pluginPath);

-//

-//			// change runtime

-//			IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.createSiteEntry(site.getURL(), sitePolicy);

-//			runtimeConfiguration.configureSite(siteEntry);

-//

-//		}

-//

-//		// configure all features as enable

-//		configure(configSite);

-//

-//		return configSite;

-	}

-

-	/*

-	 *Configure all features as Enable Check we only enable highest version

-	 */

-	private void configure(ConfiguredSite linkedSite) throws CoreException {

-		ISite site = linkedSite.getSite();

-		ISiteFeatureReference[] newFeaturesRef = site.getFeatureReferences();

-

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

-			// TRACE

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {

-				String reconciliationType = "enable (optimistic)"; //$NON-NLS-1$

-				UpdateCore.debug("New Linked Site:New Feature: " + newFeaturesRef[i].getURL() + " as " + reconciliationType); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			ConfigurationPolicy policy = linkedSite.getConfigurationPolicy();

-			policy.configure(newFeaturesRef[i], true, false);

-		}

-		SiteReconciler.checkConfiguredFeatures(linkedSite);

-	}

-

-	/*

-	 *

-	 */

-	public void addConfiguredSite(IConfiguredSite site) {

-		if (!isCurrent() && isReadOnly())

-			return;

-

-		ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_SITE_INSTALL);

-		activity.setLabel(site.getSite().getURL().toExternalForm());

-		activity.setDate(new Date());

-		ConfiguredSiteModel configSiteModel = (ConfiguredSiteModel) site;

-		addConfigurationSiteModel(configSiteModel);

-		configSiteModel.setInstallConfigurationModel(this);

-

-		// notify listeners

-		Object[] configurationListeners = listeners.getListeners();

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

-			IInstallConfigurationChangedListener listener = ((IInstallConfigurationChangedListener) configurationListeners[i]);

-			listener.installSiteAdded(site);

-		}

-

-		// everything done ok

-		activity.setStatus(IActivity.STATUS_OK);

-		this.addActivity(activity);

-	}

-

-	/**

-	 * Method addActivity.

-	 * @param activity

-	 */

-	public void addActivity(IActivity activity) {

-		addActivityModel((ConfigurationActivityModel)activity);

-	}

-

-	/*

-	 *

-	 */

-	public void removeConfiguredSite(IConfiguredSite site) {

-		if (!isCurrent() && isReadOnly())

-			return;

-

-		if (removeConfigurationSiteModel((ConfiguredSiteModel) site)) {

-			// notify listeners

-			Object[] configurationListeners = listeners.getListeners();

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

-				IInstallConfigurationChangedListener listener = ((IInstallConfigurationChangedListener) configurationListeners[i]);

-				listener.installSiteRemoved(site);

-			}

-			

-			//activity

-			ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_SITE_REMOVE);

-			activity.setLabel(site.getSite().getURL().toExternalForm());

-			activity.setDate(new Date());

-			activity.setStatus(IActivity.STATUS_OK);

-			this.addActivity(activity);

-		}

-	}

-

-	/*

-	 * @see IInstallConfiguration#addInstallConfigurationChangedListener(IInstallConfigurationChangedListener)

-	 */

-	public void addInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener) {

-		synchronized (listeners) {

-			listeners.add(listener);

-		}

-	}

-

-	/*

-	 * @see IInstallConfiguration#removeInstallConfigurationChangedListener(IInstallConfigurationChangedListener)

-	 */

-	public void removeInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener) {

-		synchronized (listeners) {

-			listeners.remove(listener);

-		}

-	}

-

-

-	/*

-	 * Deletes the configuration from its URL/location

-	 */

-	public void remove() {

-		// save the configuration

-		if ("file".equalsIgnoreCase(getURL().getProtocol())) { //$NON-NLS-1$

-			// the location points to a file

-			File file = new File(getURL().getFile());

-			UpdateManagerUtils.removeFromFileSystem(file);

-		}

-	}

-

-	/**

-	 * Saves the configuration into its URL/location

-	 * and changes the platform configuration.

-	 * The runtime site entries from platform.xml are updated as required

-	 * (cannot recreate these because must preserve other runtime state) [18520]

-	 * @return true if restart is needed

-	 */

-	public boolean save() throws CoreException {

-		

-		// Write info  into platform for the next runtime

-		IPlatformConfiguration runtimeConfiguration = ConfiguratorUtils.getCurrentPlatformConfiguration();

-		ConfiguredSiteModel[] configurationSites = getConfigurationSitesModel();

-

-		// clean configured Entries from platform runtime

-		IPlatformConfiguration.IFeatureEntry[] configuredFeatureEntries = runtimeConfiguration.getConfiguredFeatureEntries();

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

-			runtimeConfiguration.unconfigureFeatureEntry(configuredFeatureEntries[i]);

-		}

-

-		// [19958] remember sites currently configured by runtime (use

-		// temp configuration object rather than a straight list to ensure

-		// correct lookup)

-		IPlatformConfiguration tempConfig = null;

-		try {

-			tempConfig = ConfiguratorUtils.getPlatformConfiguration(null);

-			IPlatformConfiguration.ISiteEntry[] tmpSites = runtimeConfiguration.getConfiguredSites();

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

-				tempConfig.configureSite(tmpSites[i]);

-			}

-		} catch (IOException e) {

-			// assume no currently configured sites

-		}

-

-		//check sites

-		checkSites(configurationSites, runtimeConfiguration);

-

-		// Save the plugin path, primary feature and platform

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

-			ConfiguredSite cSite = ((ConfiguredSite) configurationSites[i]);

-			ConfigurationPolicy configurationPolicy = cSite.getConfigurationPolicy();

-

-			savePluginPath(cSite, runtimeConfiguration, tempConfig);

-

-			// IF primary feature URL or platform feature URL that we need to pass to runtime config

-			// is part of platform:base:, write it as platform:base: URL

-			IFeatureReference[] configuredFeaturesRef = configurationPolicy.getConfiguredFeatures();

-			for (int j = 0; j < configuredFeaturesRef.length; j++) {

-				IFeature feature = null;

-				try {

-					feature = configuredFeaturesRef[j].getFeature(null);

-				} catch (CoreException e) {

-					UpdateCore.warn(null, e);

-				}

-				saveFeatureEntry(cSite, feature, runtimeConfiguration);

-			}

-		}

-

-		// [19958] remove any extra site entries from runtime configuration

-		// (site entries that no longer exist in this configuration)

-		if (tempConfig != null) {

-			IPlatformConfiguration.ISiteEntry[] tmpSites = tempConfig.getConfiguredSites();

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

-				runtimeConfiguration.unconfigureSite(tmpSites[i]);

-			}

-		}

-

-		try {

-			runtimeConfiguration.save();

-			// log configuration and activities

-			this.date = new Date(runtimeConfiguration.getChangeStamp());

-			if ("file".equalsIgnoreCase(getURL().getProtocol())) //$NON-NLS-1$

-				UpdateCore.log(this);

-			resetActivities();

-			return isRestartNeeded(runtimeConfiguration);

-		} catch (IOException e) {

-			CoreException exc = Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToSavePlatformConfiguration", runtimeConfiguration.getConfigurationLocation().toExternalForm()), e);	//$NON-NLS-1$

-			UpdateCore.warn("",exc); //$NON-NLS-1$

-		}

-		return true;

-	}

-

-	/*

-	 * Write the plugin path for each site

-	 * Do not check if the site already existed before [16696].

-	 * Reuse any runtime site objects in platform.cfg (to preserve state) [18520].

-	 */

-	private void savePluginPath(ConfiguredSite cSite, IPlatformConfiguration runtimeConfiguration, IPlatformConfiguration tempConfig) // [19958]

-	throws CoreException {

-

-		ConfigurationPolicy configurationPolicy = cSite.getConfigurationPolicy();

-

-		// create a ISitePolicy (policy, pluginPath)

-		// for the site

-		String[] pluginPath = configurationPolicy.getPluginPath(cSite.getSite());

-		IPlatformConfiguration.ISitePolicy sitePolicy = runtimeConfiguration.createSitePolicy(configurationPolicy.getPolicy(), pluginPath);

-

-		// get the URL of the site that matches the one platform.cfg gave us

-		URL urlToCheck = null;

-		try {

-			urlToCheck = new URL(cSite.getPlatformURLString());

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToCreateURL", cSite.getPlatformURLString()), e); //$NON-NLS-1$

-		} catch (ClassCastException e) {

-			throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToCast"), e);	//$NON-NLS-1$

-		}

-

-		// update runtime configuration [18520]

-		// Note: we must not blindly replace the site entries because they

-		//       contain additional runtime state that needs to be preserved.

-		IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.findConfiguredSite(urlToCheck);

-		if (siteEntry == null)

-			siteEntry = runtimeConfiguration.createSiteEntry(urlToCheck, sitePolicy);

-		else {

-			siteEntry.setSitePolicy(sitePolicy);

-			((SiteEntry)siteEntry).refreshPlugins();

-			if (tempConfig != null) // [19958] remove reused entries from list

-				tempConfig.unconfigureSite(siteEntry);

-		}

-		((SiteEntry)siteEntry).setEnabled(cSite.isEnabled());

-		runtimeConfiguration.configureSite(siteEntry, true /*replace if exists*/);

-	}

-

-	/*

-	 * Save the Feature entry

-	 * The feature can be a primary feature and/or a platform feature

-	 */

-	private void saveFeatureEntry(ConfiguredSite cSite, IFeature feature, IPlatformConfiguration runtimeConfiguration) throws CoreException {

-		if (feature == null)

-			return;

-

-		// get the URL of the plugin that corresponds to the feature (pluginid = featureid)

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

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

-		URL url = null;

-		IPluginEntry featurePlugin = null;

-		for (int k = 0; k < entries.length; k++) {

-			if (id.equalsIgnoreCase(entries[k].getVersionedIdentifier().getIdentifier())) {

-				url = getRuntimeConfigurationURL(entries[k], cSite);

-				featurePlugin = entries[k];

-				break;

-			}

-		}

-		String pluginVersion = null;

-		if (featurePlugin != null)

-			pluginVersion = featurePlugin.getVersionedIdentifier().getVersion().toString();

-

-		// write the primary features

-		if (feature.isPrimary()) {

-			// get any fragments for the feature plugin

-			ArrayList list = new ArrayList();

-			if (url != null)

-				list.add(url);

-			if (featurePlugin != null) {

-				URL[] fragments = getRuntimeFragmentURLs(featurePlugin);

-				list.addAll(Arrays.asList(fragments));

-			}

-			URL[] roots = (URL[]) list.toArray(new URL[0]);

-			String pluginIdentifier = feature.getPrimaryPluginID();

-

-			// save information in runtime platform state

-			String version = feature.getVersionedIdentifier().getVersion().toString();

-			String application = feature.getApplication();

-			FeatureEntry featureEntry = (FeatureEntry)runtimeConfiguration.createFeatureEntry(id, version, pluginIdentifier, pluginVersion, true, application, roots);

-			featureEntry.setURL(getFeatureRelativeURL(feature));

-			SiteEntry siteEntry = (SiteEntry)runtimeConfiguration.findConfiguredSite(cSite.getSite().getURL());

-			siteEntry.addFeatureEntry(featureEntry);

-		} else {

-			// write non-primary feature entries

-			String version = feature.getVersionedIdentifier().getVersion().toString();

-			String pluginIdentifier = feature.getPrimaryPluginID();

-			FeatureEntry featureEntry = (FeatureEntry)runtimeConfiguration.createFeatureEntry(id, version, pluginIdentifier, pluginVersion, false, null, null);

-			featureEntry.setURL(getFeatureRelativeURL(feature));

-			SiteEntry siteEntry = (SiteEntry)runtimeConfiguration.findConfiguredSite(cSite.getSite().getURL());

-			siteEntry.addFeatureEntry(featureEntry);

-		}

-

-		// write the platform features (features that contain special platform plugins)

-		IPluginEntry[] platformPlugins = getPlatformPlugins(feature, runtimeConfiguration);

-		for (int k = 0; k < platformPlugins.length; k++) {

-			id = platformPlugins[k].getVersionedIdentifier().getIdentifier();

-			url = getRuntimeConfigurationURL(platformPlugins[k], cSite);

-			if (url != null) {

-				runtimeConfiguration.setBootstrapPluginLocation(id, url);

-			}

-		}

-	}

-

-	/*

-	 * Log if we are about to create a site that didn't exist before

-	 * in platform.cfg [16696].

-	 */

-	private void checkSites(ConfiguredSiteModel[] configurationSites, IPlatformConfiguration runtimeConfiguration) throws CoreException {

-

-		// check all the sites we are about to write already existed

-		// they should have existed either because they were created by

-		// updateManager or because we read them from platform.cfg

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

-			// get the URL of the site that matches the one platform.cfg gave us

-			URL urlToCheck = null;

-			try {

-				urlToCheck = new URL(configurationSites[i].getPlatformURLString());

-			} catch (MalformedURLException e) {

-				UpdateCore.warn(Policy.bind("InstallConfiguration.UnableToCreateURL", configurationSites[i].getPlatformURLString()), e); //$NON-NLS-1$

-			} catch (ClassCastException e) {

-				UpdateCore.warn(Policy.bind("InstallConfiguration.UnableToCast"), e);//$NON-NLS-1$

-			}

-

-			// if the URL doesn't exits log it

-			IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.findConfiguredSite(urlToCheck);

-			if (siteEntry == null) {

-				UpdateCore.warn(Policy.bind("Unable to find site {0} in platform configuration {1}.", urlToCheck.toExternalForm(), runtimeConfiguration.getConfigurationLocation().toExternalForm())); //$NON-NLS-1$

-			}

-		}

-	}

-

-

-	/*

-	 * reverts this configuration to the match the new one

-	 *

-	 * Compare the oldSites with the currentOne. the old state is the state we want to revert to.

-	 *

-	 * If a site was in old state, but not in the currentOne, keep it in the hash.

-	 * If a site is in the currentOne but was not in the old state, unconfigure all features and add it in the hash

-	 * If a site was in baoth state, calculate the 'delta' and re-set it in the hash map

-	 *

-	 * At the end, set the configured site from the new sites hash map

-	 *

-	 */

-	public void revertTo(IInstallConfiguration configuration, IProgressMonitor monitor, IProblemHandler handler) throws CoreException, InterruptedException {

-

-		IConfiguredSite[] oldConfigSites = configuration.getConfiguredSites();

-		IConfiguredSite[] nowConfigSites = this.getConfiguredSites();

-

-		// create a hashtable of the *old* and *new* sites

-		Map oldSitesMap = new Hashtable(0);

-		Map newSitesMap = new Hashtable(0);

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

-			IConfiguredSite element = oldConfigSites[i];

-			oldSitesMap.put(element.getSite().getURL().toExternalForm(), element);

-			newSitesMap.put(element.getSite().getURL().toExternalForm(), element);

-		}

-		// create list of all the sites that map the *old* sites

-		// we want the intersection between the old sites and the current sites

-		if (nowConfigSites != null) {

-			String key = null;

-

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

-				key = nowConfigSites[i].getSite().getURL().toExternalForm();

-				IConfiguredSite oldSite = (IConfiguredSite) oldSitesMap.get(key);

-				if (oldSite != null) {

-					// the Site existed before, calculate the delta between its current state and the

-					// state we are reverting to and put it back into the map

-					 ((ConfiguredSite) nowConfigSites[i]).revertTo(oldSite, monitor, handler);

-				} else {

-					// the site didn't exist in the InstallConfiguration we are reverting to

-					// unconfigure everything from this site so it is still present

-					ISiteFeatureReference[] featuresToUnconfigure = nowConfigSites[i].getSite().getFeatureReferences();

-					for (int j = 0; j < featuresToUnconfigure.length; j++) {

-						IFeature featureToUnconfigure = null;

-						try {

-							featureToUnconfigure = featuresToUnconfigure[j].getFeature(null);

-						} catch (CoreException e) {

-							UpdateCore.warn(null, e);

-						}

-						if (featureToUnconfigure != null)

-							nowConfigSites[i].unconfigure(featureToUnconfigure);

-					}

-				}

-				newSitesMap.put(key,nowConfigSites[i]);

-			}

-

-			// the new configuration has the exact same sites as the old configuration

-			// the old configuration in the Map are either as-is because they don't exist

-			// in the current one, or they are the delta from the current one to the old one

-			Collection sites = newSitesMap.values();

-			if (sites != null && !sites.isEmpty()) {

-				ConfiguredSiteModel[] sitesModel = new ConfiguredSiteModel[sites.size()];

-				sites.toArray(sitesModel);

-				setConfigurationSiteModel(sitesModel);

-			}

-		}

-	}

-

-	/*

-	 * @see IInstallConfiguration#getActivities()

-	 */

-	public IActivity[] getActivities() {

-		if (getActivityModel().length == 0)

-			return new IActivity[0];

-		return (IActivity[]) getActivityModel();

-	}

-

-	/*

-	 * returns the list of platform plugins of the feature or an empty list

-	 * if the feature doesn't contain any platform plugins

-	 */

-	private IPluginEntry[] getPlatformPlugins(IFeature feature, IPlatformConfiguration runtimeConfiguration) {

-		Map featurePlatformPlugins = new HashMap();

-		String[] platformPluginID = runtimeConfiguration.getBootstrapPluginIdentifiers();

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

-

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

-			String featurePluginId = null;

-			for (int j = 0; j < featurePlugins.length; j++) {

-				featurePluginId = featurePlugins[j].getVersionedIdentifier().getIdentifier();

-				if (platformPluginID[i].equals(featurePluginId)) {

-					featurePlatformPlugins.put(platformPluginID[i], featurePlugins[j]);

-				}

-			}

-		}

-

-		Collection values = featurePlatformPlugins.values();

-		if (values == null || values.size() == 0)

-			return new IPluginEntry[0];

-

-		IPluginEntry[] result = new IPluginEntry[values.size()];

-		Iterator iter = values.iterator();

-		int index = 0;

-		while (iter.hasNext()) {

-			result[index] = ((IPluginEntry) iter.next());

-			index++;

-		}

-		return result;

-	}

-

-	/*

-	 * returns the URL of the pluginEntry on the site

-	 * Transform the URL to use platform: protocol if needed

-	 * return null if the URL to write is not valid

-	 */

-	private URL getRuntimeConfigurationURL(IPluginEntry entry, ConfiguredSite cSite) throws CoreException {

-

-		String rootString = cSite.getPlatformURLString();

-		String pluginPathID = getPathID(entry);

-		try {

-			ISiteContentProvider siteContentProvider = cSite.getSite().getSiteContentProvider();

-			URL pluginEntryfullURL = siteContentProvider.getArchiveReference(pluginPathID);

-

-			//

-			if (!rootString.startsWith("platform")) { //$NON-NLS-1$

-				// DEBUG:

-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)

-					UpdateCore.debug("getRuntimeConfiguration Plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " [NON PLATFORM URL]."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				return pluginEntryfullURL;

-			}

-

-			//URL pluginEntryRootURL = Platform.resolve(new URL(rootString));

-			// Do not resolve [16507], just use platform:base/ as a root

-			// rootString = platform:base

-			// pluginRoot = /home/a

-			// pluginFull = /home/a/c/boot.jar

-			// relative = platform:/base/c/boot.jar

-			URL pluginEntryRootURL = cSite.getSite().getURL();

-			String relativeString = UpdateManagerUtils.getURLAsString(pluginEntryRootURL, pluginEntryfullURL);

-			URL result = new URL(new URL(rootString), relativeString);

-

-			// DEBUG:

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)

-				UpdateCore.debug("getRuntimeConfiguration plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " Site URL:" + pluginEntryRootURL + " Relative:" + relativeString); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-

-			// verify we are about to write a valid file URL

-			// check with fullURL as it is not resolved to platform:base/

-			if (pluginEntryfullURL != null) {

-				if ("file".equals(pluginEntryfullURL.getProtocol())) { //$NON-NLS-1$

-					String fileString = pluginEntryfullURL.getFile();

-					if (!new File(fileString).exists()) {

-						UpdateCore.warn("The URL:" + result + " doesn't point to a valid platform plugin.The URL will not be written in the platform configuration", new Exception()); //$NON-NLS-1$ //$NON-NLS-2$

-						return null;

-					}

-				}

-			}

-

-			return result;

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToCreateURL", rootString), e);	//$NON-NLS-1$

-		}

-	}

-

-	/*

-	 * Return URLs for any fragments that are associated with the specified plugin entry

-	 */

-	private URL[] getRuntimeFragmentURLs(IPluginEntry entry) throws CoreException {

-

-		// get the identifier associated with the entry

-		VersionedIdentifier vid = entry.getVersionedIdentifier();

-

-		// get the plugin descriptor from the registry

-		Bundle bundle = Platform.getBundle(vid.getIdentifier());

-		ArrayList list = new ArrayList();

-		if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.INSTALLED) {

-			FragmentEntry[] fragments = UpdateManagerUtils.getFragments(bundle);

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

-				String location = fragments[i].getLocation();

-				try {

-					URL locationURL = new URL(location);

-					locationURL = Platform.asLocalURL(Platform.resolve(locationURL));

-					list.add(asInstallRelativeURL(locationURL));

-				} catch (IOException e) {

-					// skip bad fragments

-				}

-			}

-		}

-		return (URL[]) list.toArray(new URL[0]);

-	}

-

-	/**

-	 * Returns the path identifier for a plugin entry.

-	 * <code>plugins/&lt;pluginId>_&lt;pluginVersion>.jar</code>

-	 * @return the path identifier

-	 */

-	private String getPathID(IPluginEntry entry) {

-		return Site.DEFAULT_PLUGIN_PATH + entry.getVersionedIdentifier().toString() + FeatureContentProvider.JAR_EXTENSION;

-	}

-

-	/**

-	 * Try to recast URL as platform:/base/

-	 */

-	private URL asInstallRelativeURL(URL url) {

-		// get location of install

-		URL install = ConfiguratorUtils.getInstallURL();

-

-		// try to determine if supplied URL can be recast as install-relative

-		if (install.getProtocol().equals(url.getProtocol())) {

-			if (install.getProtocol().equals("file")) { //$NON-NLS-1$

-				String installS = new File(install.getFile()).getAbsolutePath().replace(File.separatorChar, '/');

-				if (!installS.endsWith("/")) //$NON-NLS-1$

-					installS += "/"; //$NON-NLS-1$

-				String urlS = new File(url.getFile()).getAbsolutePath().replace(File.separatorChar, '/');

-				if (!urlS.endsWith("/")) //$NON-NLS-1$

-					urlS += "/"; //$NON-NLS-1$

-				int ix = installS.lastIndexOf("/"); //$NON-NLS-1$

-				if (ix != -1) {

-					installS = installS.substring(0, ix + 1);

-					if (urlS.startsWith(installS)) {

-						try {

-							return new URL("platform:/base/" + urlS.substring(installS.length())); //$NON-NLS-1$

-						} catch (MalformedURLException e) {

-						}

-					}

-				}

-			}

-		}

-		return url;

-	}

-	

-	private boolean isDuplicateSite(File siteDirectory) {

-		IConfiguredSite[] sites = getConfiguredSites();

-		URL fileURL;

-		try {

-			fileURL = siteDirectory.toURL();

-		} catch (MalformedURLException e) {

-			return false;

-		}

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

-			URL url = sites[i].getSite().getURL();

-			if (UpdateManagerUtils.sameURL(fileURL, url))

-				return true;

-		}

-		return false;

-	}

-	

-	/*

-	 * Returns the feature url relative to the site.

-	 */

-	private String getFeatureRelativeURL(IFeature feature) {

-		String url = feature.getURL().toExternalForm();

-		String siteURL = feature.getSite().getURL().toExternalForm();

-		// TODO fix this. toURL() returns file:/d:/eclipse/etc... wheareas the 

-		// platform.asLocalURL() returns file:d:/eclipse/etc... (no leading / )

-//		if (url.startsWith("file:/") && Platform.getOS().equals("win32"))

-//			url = "file:" + url.substring(6);

-		

-		if (url.startsWith(siteURL))

-			return url.substring(siteURL.length());

-		else

-			return url;

-	}

-	

-	/**

-	 * @return true if restart is needed

-	 */

-	private boolean isRestartNeeded(IPlatformConfiguration runtimeConfig) {

-

-		// First, create a map for faster lookups

-		URL[] newBundlePaths = runtimeConfig.getPluginPath();

-		HashSet newPluginsSet = new HashSet(newBundlePaths.length);

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

-			

-			String pluginLocation = newBundlePaths[i].getFile();

-			newPluginsSet.add(pluginLocation);

-			// On windows, we will be doing case insensitive search as well, so lower it now

-			if (isWindows)

-				newPluginsSet.add(pluginLocation.toLowerCase());

-		}

-		

-		PlatformAdmin platformAdmin = Platform.getPlatformAdmin();

-		State state = platformAdmin.getState();

-		BundleDescription[] oldBundles = state.getBundles();

-

-		int offset = ConfigurationActivator.UPDATE_PREFIX.length();

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

-			if (oldBundles[i].getBundleId() == 0)

-				continue; // skip the system bundle

-			String oldBundleLocation = oldBundles[i].getLocation();

-			// Don't worry about bundles we did not install

-			if (!oldBundleLocation.startsWith(ConfigurationActivator.UPDATE_PREFIX))

-				continue;

-			oldBundleLocation = oldBundleLocation.substring(offset);

-			

-			if (newPluginsSet.contains(oldBundleLocation))

-				continue;

-			if (isWindows && newPluginsSet.contains(oldBundleLocation.toLowerCase()))

-				continue;

-			

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)

-				UpdateCore.debug("Bundle " + oldBundleLocation + " has been removed"); //$NON-NLS-1$ //$NON-NLS-2$

-			return true;

-		}

-

-		return false;

-	}

-	

-	/**

-	 * To be called when committing the update changes to current configuration

-	 *

-	 */

-	public static void applyChanges() {

-		ConfigurationActivator configurator = ConfigurationActivator.getConfigurator();

-		configurator.installBundles();

-	}

-	

-	

-	/* (non-Javadoc)

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object obj) {

-		if (this == obj)

-			return true;

-		if (!(obj instanceof InstallConfiguration))

-			return false;

-		

-		InstallConfiguration config = (InstallConfiguration)obj;

-	

-		return getCreationDate().equals(config.getCreationDate()) && 

-				getLabel().equals(config.getLabel()) &&

-				getLocationURLString().equals(config.getLocationURLString());

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
deleted file mode 100644
index 115a130..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
+++ /dev/null

@@ -1,503 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-public class InstallHandlerProxy implements IInstallHandler {
-
-	private IFeature feature = null;
-	private int type;
-	private IInstallHandler handler = null;
-	private IStatus savedStatus = null;
-	private boolean DEBUG = false;
-
-	private static final String EXT_PLUGIN = "org.eclipse.update.core"; //$NON-NLS-1$
-	private static final String EXT_POINT = "installHandlers"; //$NON-NLS-1$
-
-	private InstallHandlerProxy() {
-	}
-
-	public InstallHandlerProxy(
-		int type,
-		IFeature feature,
-		IInstallHandlerEntry entry,
-		InstallMonitor monitor)
-		throws CoreException {
-
-		initialize(type, feature, entry, monitor);
-	}
-
-	/*
-	 * @see IInstallHandler#initialize
-	 */
-	public void initialize(
-		int type,
-		IFeature feature,
-		IInstallHandlerEntry entry,
-		InstallMonitor monitor)
-		throws CoreException {
-
-		DEBUG = UpdateCore.DEBUG_SHOW_IHANDLER;
-		// validate arguments
-		if (feature == null)
-			throw new IllegalArgumentException();
-		this.feature = feature;
-		this.type = type;
-
-		//  check if we have a handler entry specified in the feature.xml
-		if (entry == null) {
-			if (DEBUG)
-				debug("not specified"); //$NON-NLS-1$
-			return; // no handler entry
-		}
-
-		String library = entry.getLibrary();
-		String handlerName = entry.getHandlerName();
-		if (handlerName == null || handlerName.trim().equals("")) { //$NON-NLS-1$
-			if (DEBUG)
-				debug("not specified"); //$NON-NLS-1$
-			return; // no handler class spacified in entry
-		}
-		if (DEBUG) {
-			debug("handler=" + handlerName); //$NON-NLS-1$
-			debug("path=   " + library); //$NON-NLS-1$
-		}
-
-		// get handler instance
-		try {
-			if (library == null || library.trim().equals("")) //$NON-NLS-1$
-				this.handler = getGlobalHandler(handlerName);
-			else
-				this.handler = getLocalHandler(library, handlerName);
-			if (this.handler == null)
-				return;
-			handler.initialize(type, feature, entry, monitor);
-		} catch (ClassNotFoundException e) {
-			handleExceptionInInit(
-				Policy.bind("InstallHandler.notFound", feature.getLabel()), //$NON-NLS-1$
-				e);
-
-		} catch (ClassCastException e) {
-			handleExceptionInInit(
-				Policy.bind("InstallHandler.invalidHandler", feature.getLabel()), //$NON-NLS-1$
-				e);
-		} catch (CoreException e) {
-			handleExceptionInInit(null, e);
-		} catch (Exception e) {
-			handleExceptionInInit(
-				Policy.bind("InstallHandler.unableToCreateHandler", feature.getLabel()), //$NON-NLS-1$
-				e);
-		}
-
-	}
-
-	/*
-	 * @see IInstallHandler#installInitiated
-	 */
-	public void installInitiated() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling installInitiated()"); //$NON-NLS-1$
-				handler.installInitiated();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#allPluginsDownloaded
-	 */
-	public void pluginsDownloaded(IPluginEntry[] plugins) throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling pluginsDownloaded()"); //$NON-NLS-1$
-				handler.pluginsDownloaded(plugins);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#allPluginsInstalled
-	 */
-	public void completeInstall(IFeatureContentConsumer consumer)
-		throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling completeInstall()"); //$NON-NLS-1$
-				handler.completeInstall(consumer);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#allDataDownloaded
-	 */
-	public void nonPluginDataDownloaded(
-		INonPluginEntry[] nonPluginData,
-		IVerificationListener listener)
-		throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling nonPluginDataDownloaded()"); //$NON-NLS-1$
-				handler.nonPluginDataDownloaded(nonPluginData, listener);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#installCompleted
-	 */
-	public void installCompleted(boolean success) throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling installCompleted()"); //$NON-NLS-1$
-				handler.installCompleted(success);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#configureInitiated
-	 */
-	public void configureInitiated() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling configureInitiated()"); //$NON-NLS-1$
-				handler.configureInitiated();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#completeConfigure
-	 */
-	public void completeConfigure() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling completeConfigure()"); //$NON-NLS-1$
-				handler.completeConfigure();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#configureCompleted
-	 */
-	public void configureCompleted(boolean success) throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling configureCompleted()"); //$NON-NLS-1$
-				handler.configureCompleted(success);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#unconfigureInitiated
-	 */
-	public void unconfigureInitiated() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling unconfigureInitiated()"); //$NON-NLS-1$
-				handler.unconfigureInitiated();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#completeUnconfigure
-	 */
-	public void completeUnconfigure() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling completeUnconfigure()"); //$NON-NLS-1$
-				handler.completeUnconfigure();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#unconfigureCompleted
-	 */
-	public void unconfigureCompleted(boolean success) throws CoreException {
-		if (handler == null) {
-			if (savedStatus == null)
-				return;
-			else
-				throw new CoreException(savedStatus); // delayed exception
-		} else {
-			try {
-				if (DEBUG)
-					debug("calling unconfigureCompleted()"); //$NON-NLS-1$
-				handler.unconfigureCompleted(success);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-			if (savedStatus != null)
-				throw new CoreException(savedStatus); // delayed exception
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#uninstallInitiated
-	 */
-	public void uninstallInitiated() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling uninstallInitiated()"); //$NON-NLS-1$
-				handler.uninstallInitiated();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#completeUninstall
-	 */
-	public void completeUninstall() throws CoreException {
-		if (handler == null)
-			return;
-		else {
-			try {
-				if (DEBUG)
-					debug("calling completeUninstall()"); //$NON-NLS-1$
-				handler.completeUninstall();
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-		}
-	}
-
-	/*
-	 * @see IInstallHandler#uninstallCompleted
-	 */
-	public void uninstallCompleted(boolean success) throws CoreException {
-		if (handler == null) {
-			if (savedStatus == null)
-				return;
-			else
-				throw new CoreException(savedStatus); // delayed exception
-		} else {
-			try {
-				if (DEBUG)
-					debug("calling uninstallCompleted()"); //$NON-NLS-1$
-				handler.uninstallCompleted(success);
-			} catch (Throwable e) {
-				handleExceptionInCall(e, feature);
-			}
-			if (savedStatus != null)
-				throw new CoreException(savedStatus); // delayed exception
-		}
-	}
-
-	/*
-	 * common exception handling for initialization
-	 */
-	private void handleExceptionInInit(String s, Exception e)
-		throws CoreException {
-
-		CoreException ce;
-		if (e instanceof CoreException)
-			ce = (CoreException) e;
-		else
-			ce = Utilities.newCoreException(s, e);
-
-		if (isUndoAction()) {
-			// for "undo" operations, deactivate handler and log error
-			String id =
-				UpdateCore.getPlugin().getBundle().getSymbolicName();
-			IStatus status =
-				new Status(IStatus.ERROR, id, 0, "InstallHandler.deactivated", ce);	//$NON-NLS-1$
-			UpdateCore.getPlugin().getLog().log(status);
-			handler = null; // disable subsequent handler calls
-			savedStatus = status;
-		} else
-			// for "do" operations, hurl ...
-			throw ce;
-	}
-
-	/*
-	 * common exception handling for calls to install handler
-	 */
-	private void handleExceptionInCall(Throwable e, IFeature feature)
-		throws CoreException {
-
-		CoreException ce;
-		if (e instanceof CoreException)
-			ce = (CoreException) e;
-		else
-			ce =
-				Utilities.newCoreException(
-					Policy.bind("InstallHandler.callException", feature.getLabel()), //$NON-NLS-1$
-					e);
-		
-		if (isUndoAction()) {
-			// for "undo" operations, deactivate handler and log error
-			String id =
-				UpdateCore.getPlugin().getBundle().getSymbolicName();
-			IStatus status =
-				new Status(IStatus.ERROR, id, 0, "InstallHandler.deactivated", ce);	//$NON-NLS-1$
-			UpdateCore.getPlugin().getLog().log(status);
-			handler = null; // disable subsequent handler calls
-			savedStatus = status;
-		} else
-			// for "do" operations, hurl ...
-			throw ce;
-	}
-
-	/*
-	 * Indicates whether we are doing (install, configure) or 
-	 * undoing (uninstall, unconfigure)
-	 */
-	private boolean isUndoAction() {
-		if (this.type == IInstallHandler.HANDLER_ACTION_INSTALL
-			|| this.type == IInstallHandler.HANDLER_ACTION_CONFIGURE)
-			return false; // causes exception to be thrown and action aborted
-		else
-			return true; // causes exception to be logged and action continues
-	}
-
-	/*
-	 * get an instance of handler downloaded as part of the feature
-	 */
-	private IInstallHandler getLocalHandler(String lib, String name)
-		throws Exception {
-
-		// Get baseline URL for handler (relative to feature.xml). For
-		// features being installed from a server (eg. http protocol)
-		// the URL will most likely be to a local file copy containing the
-		// unpacked feature jar.
-		ContentReference baseRef =
-			feature.getFeatureContentProvider().getFeatureManifestReference(null);
-		URL base = null;
-		if (baseRef != null)
-			base = baseRef.asURL();
-		if (base == null)
-			throw Utilities.newCoreException(
-				Policy.bind("InstallHandler.unableToCreateHandler", this.feature.getLabel()), //$NON-NLS-1$
-				null);
-
-
-		// determine loader class path
-		URL cp = new URL(base, lib);
-		if (this.type == IInstallHandler.HANDLER_ACTION_UNINSTALL) {
-			// check if we are doing uninstall
-			// ... need to make temp copy of library (being removed)
-			File tempLib = File.createTempFile("tmp", ".jar"); //$NON-NLS-1$ //$NON-NLS-2$
-			tempLib.deleteOnExit();
-			FileOutputStream fos = null;
-			InputStream is = null;
-			try {
-				fos = new FileOutputStream(tempLib);
-				is = UpdateCore.getPlugin().get(cp).getInputStream();
-				Utilities.copy(is, fos, null);
-			} finally {
-				if (fos != null)
-					try {
-						fos.close();
-					} catch (Exception e) {
-					}
-				if (is != null)
-					try {
-						is.close();
-					} catch (Exception e) {
-					}
-			}
-			cp = tempLib.toURL();
-		}
-
-		// create class loader, load and instantiate handler
-		URLClassLoader loader =
-			new URLClassLoader(new URL[] { cp }, this.getClass().getClassLoader());
-		Class clazz = loader.loadClass(name);
-		IInstallHandler handler = (IInstallHandler) clazz.newInstance();
-		return handler;
-	}
-
-	/*
-	 * get instance of global handler registered via extension point
-	 */
-	private IInstallHandler getGlobalHandler(String name) throws Exception {
-
-		IExtensionRegistry reg = Platform.getExtensionRegistry();
-		IConfigurationElement[] handlerExtension =
-			reg.getConfigurationElementsFor(EXT_PLUGIN, EXT_POINT, name);
-		if (handlerExtension == null || handlerExtension.length <= 0)
-			throw Utilities.newCoreException(
-				Policy.bind("InstallHandler.unableToCreateHandler", this.feature.getLabel()), //$NON-NLS-1$
-				null);
-
-		return (IInstallHandler) handlerExtension[0].createExecutableExtension("class"); //$NON-NLS-1$
-	}
-	
-	private void debug(String s) {
-		String pfx = (feature==null) ? "" : feature.getVersionedIdentifier().toString(); //$NON-NLS-1$
-		System.out.println("InstallHandler["+pfx+"]: " + s); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java
deleted file mode 100644
index 1c4e090..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallLogParser.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-
-
-/**
- * Parses the installation log and creates installation configuration objects
- */
-public class InstallLogParser {
-	private IPath logPath;
-	private BufferedReader buffRead;
-	private InstallConfiguration currentConfiguration;
-	private HashMap installConfigMap;
-	private Comparator comparator;
-	
-	private static final String FEATURE_INSTALL = "feature-install"; //$NON-NLS-1$
-	private static final String FEATURE_REMOVE = "feature-remove"; //$NON-NLS-1$
-	private static final String SITE_INSTALL = "site-install"; //$NON-NLS-1$
-	private static final String SITE_REMOVE = "site-remove"; //$NON-NLS-1$
-	private static final String UNCONFIGURE = "feature-disable"; //$NON-NLS-1$
-	private static final String CONFIGURE = "feature-enable"; //$NON-NLS-1$
-	private static final String REVERT = "revert"; //$NON-NLS-1$
-	private static final String RECONCILIATION = "reconciliation"; //$NON-NLS-1$
-	private static final String PRESERVED = "preserve-configuration"; //$NON-NLS-1$	
-	
-	private static final String ACTIVITY = "!ACTIVITY"; //$NON-NLS-1$
-	
-	public static final String SUCCESS = "success"; //$NON-NLS-1$
-	public static final String FAILURE = "failure"; //$NON-NLS-1$
-
-	
-	public InstallLogParser(){
-		String loc = ConfiguratorUtils.getCurrentPlatformConfiguration().getConfigurationLocation().getFile();
-		logPath = new Path(loc).removeLastSegments(1).append("install.log");  //$NON-NLS-1$
-		installConfigMap = new HashMap();
-		try {
-			InstallConfiguration[] configs = (InstallConfiguration[])SiteManager.getLocalSite().getConfigurationHistory();
-			for (int i=0;i<configs.length; i++){
-				if (!configs[i].isCurrent())
-					installConfigMap.put(new Long(configs[i].getCreationDate().getTime()), configs[i]);
-			}
-			// Need to make a copy of the current config instead
-			InstallConfiguration config = getConfigCopy((InstallConfiguration)SiteManager.getLocalSite().getCurrentConfiguration());
-			installConfigMap.put(new Long(config.getCreationDate().getTime()), config);
-			
-		} catch (CoreException e) {
-			UpdateCore.log(e);
-		} catch (MalformedURLException e){
-			UpdateCore.log(e);
-		}
-		comparator = new Comparator(){
-			public int compare(Object e1, Object e2) {
-				Date date1 = ((InstallConfiguration)e1).getCreationDate();
-				Date date2 = ((InstallConfiguration)e2).getCreationDate();
-				return date1.before(date2) ? 1 : -1;
-			}
-		};
-	}
-	private InstallConfiguration getConfigCopy(InstallConfiguration origConfig) throws CoreException, MalformedURLException{
-		InstallConfiguration config = new InstallConfiguration(origConfig, origConfig.getURL(), origConfig.getLabel() );
-		config.setCreationDate(origConfig.getCreationDate());
-		return config;
-	}
-	public void parseInstallationLog(){
-		try {
-			openLog();
-			parseLog();
-		} catch (CoreException e) {
-			UpdateUtils.logException(e);
-		} finally {
-			closeLog();
-		}
-	}
-	
-	private void openLog() throws CoreException {
-		try {
-			buffRead = new BufferedReader(new FileReader(logPath.toOSString()));
-		} catch (FileNotFoundException e) {
-			throwCoreException(e);
-		}
-	}
-	
-	private void throwCoreException(Throwable e) throws CoreException {
-		throw new CoreException(
-			new Status(
-				IStatus.ERROR,
-				UpdateUtils.getPluginId(),
-				IStatus.ERROR,
-				Policy.bind("InstallLogParser.errors"), //$NON-NLS-1$
-				e));
-	}
-	
-	private void parseLog() throws CoreException {
-		// 		.install-log template
-		//		!CONFIGURATION <configuration-date>
-		//		!ACTIVITY <date> <target> <action> <status>
-
-		try {
-			String type, status, action;
-			StringTokenizer htmlCode;
-
-			while (buffRead.ready()) {
-
-				htmlCode = new StringTokenizer(buffRead.readLine());
-				while (!(htmlCode.hasMoreElements())) {
-					if (!buffRead.ready())
-						return;
-					htmlCode = new StringTokenizer(buffRead.readLine());
-				}
-
-				type = htmlCode.nextToken().trim();
-
-				if (type.equals(ACTIVITY)) {
-					String time = htmlCode.nextToken();
-					String date;
-					StringBuffer target = new StringBuffer();
-					date = htmlCode.nextToken(".");  //$NON-NLS-1$
-					htmlCode.nextToken(" ");  //$NON-NLS-1$
-					while (htmlCode.countTokens() > 2){
-						target.append(" "); //$NON-NLS-1$
-						target.append(htmlCode.nextToken());
-					}
-					
-					action = htmlCode.nextToken();
-					status = htmlCode.nextToken();
-					createActivity(action, time, date, status, target.toString(), currentConfiguration);
-				}  else {
-					String time = htmlCode.nextToken();
-					StringBuffer date;
-					date = new StringBuffer();
-					while (htmlCode.countTokens() > 0){
-						if (date.length() != 0)
-							date.append(" "); //$NON-NLS-1$
-						date.append(htmlCode.nextToken());
-					}
-					currentConfiguration = (InstallConfiguration)installConfigMap.get(new Long(time));
-				}
-			}
-		} catch (Exception e) {
-			throwCoreException(e);
-		}
-	}
-	
-	private void closeLog() {
-		try {
-			if (buffRead != null)
-				buffRead.close();
-		} catch (IOException e) {
-		} finally {
-			buffRead = null;
-		}
-	}
-	private IActivity createActivity(String action, String time, String date, String status, String target, InstallConfiguration config){
-		ConfigurationActivity a = new ConfigurationActivity();
-
-		int code = 0;
-		if (FEATURE_INSTALL.equals(action))
-			code = IActivity.ACTION_FEATURE_INSTALL;
-		else if (FEATURE_REMOVE.equals(action))
-			code = IActivity.ACTION_FEATURE_REMOVE;
-		else if (SITE_INSTALL.equals(action))
-			code = IActivity.ACTION_SITE_INSTALL;
-		else if (SITE_REMOVE.equals(action))
-			code = IActivity.ACTION_SITE_REMOVE;
-		else if (UNCONFIGURE.equals(action))
-			code = IActivity.ACTION_UNCONFIGURE;
-		else if (CONFIGURE.equals(action))
-			code = IActivity.ACTION_CONFIGURE;
-		else if (REVERT.equals(action))
-			code = IActivity.ACTION_REVERT;
-		else if (RECONCILIATION.equals(action))
-			code = IActivity.ACTION_RECONCILIATION;
-		else if (PRESERVED.equals(action))
-			code = IActivity.ACTION_ADD_PRESERVED;
-		
-		a.setAction(code);
-		try {
-			long activityTime = Long.parseLong(time);
-			a.setDate(new Date(activityTime));
-		} catch (NumberFormatException e) {
-			a.setDate(new Date(date));
-		}
-		a.setStatus(SUCCESS.equals(status) ? IActivity.STATUS_OK : IActivity.STATUS_NOK);
-		a.setLabel(target);
-		a.setInstallConfigurationModel(config);
-		
-		if (config != null && !configContainsActivity(config, a)){
-			config.addActivity(a);
-		}
-		
-		return a;
-	}
-	
-	private boolean configContainsActivity(InstallConfiguration c, IActivity a){
-		IActivity[] activities = c.getActivities();
-		for (int i = 0 ; i<activities.length; i++){
-			if (a.equals(activities[i]))
-				return true;
-		}
-		return false;
-	}
-
-	public InstallConfiguration[] getConfigurations(){
-		Collection configSet = installConfigMap.values();
-		InstallConfiguration[] configs = (InstallConfiguration[]) configSet.toArray(new InstallConfiguration[configSet.size()]);
-		Arrays.sort(configs, comparator);
-		return configs;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallRegistry.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallRegistry.java
deleted file mode 100644
index 373853d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallRegistry.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.core.*;
-
-/**
- * Keeps track of all the features and plugins installed by Update mgr
- * so they can be uninstalled later.
- * The info is persisted in the .config/registry file and each entry has a key=key where
- * for feature this key is feature_<id>_<version> and for plugins
- * key is plugin_<id>_<version>. Normally, getVersionedIdentifier() will
- * return <id>_<version>. Eg: feature_org.eclipse.platform_3.0.0
- * 
- */
-public class InstallRegistry extends Properties {
-	private File file = null;
-	private final static String REGISTRY = "registry"; //$NON-NLS-1$
-	private static InstallRegistry instance;
-	
-	// plugins installed in this eclipse session
-	private HashMap justInstalledPlugins = new HashMap();
-	
-	/**
-	 * Creates empty Properties.
-	 */
-	private InstallRegistry() {
-		super();
-		String configFile =
-			ConfiguratorUtils
-				.getCurrentPlatformConfiguration()
-				.getConfigurationLocation()
-				.getFile();
-		file = new File(configFile);
-		file = file.getParentFile();
-		file = new File(file, REGISTRY);
-		restore();
-	}
-
-	/**
-	 * Singleton
-	 */
-	public static InstallRegistry getInstance() {
-		if (instance == null)
-			instance = new InstallRegistry();
-		return instance;
-	}
-
-	/**
-	 * Restores contents of the Properties from a file.
-	 * @return true if persistant data was read in
-	 */
-	public boolean restore() {
-		InputStream in = null;
-		boolean loaded = false;
-		clear();
-		// Test if we have a contribution file to start with
-		// If this is a clean start, then we will not have a 
-		// contribution file. return false.
-		if (!file.exists())
-			return loaded;
-		try {
-			in = new FileInputStream(file);
-			super.load(in);
-			loaded = true;
-		} catch (IOException e) {
-			UpdateCore.log(e);
-		} finally {
-			if (in != null)
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-		}
-		return loaded;
-	}
-	/**
-	 * Saves contents of the table to a file.
-	 * @return true if operation was successful
-	 */
-	public synchronized boolean save() {
-		OutputStream out = null;
-		boolean ret = false;
-		try {
-			out = new FileOutputStream(file);
-			super.store(out, "This is a generated file; do not edit."); //$NON-NLS-1$
-			ret = true;
-		} catch (IOException e) {
-			UpdateCore.log(e);
-		} finally {
-			try {
-				if (out != null) {
-					out.close();
-				}
-			} catch (IOException e) {
-			}
-		}
-		return ret;
-	}
-	
-	/**
-	 * Registers an installed feature so it can be uninstalled later.
-	 * @param feature feature to register.
-	 */
-	public static synchronized void registerFeature(IFeature feature) {
-		String name = "feature_"+feature.getVersionedIdentifier(); //$NON-NLS-1$
-		if (InstallRegistry.getInstance().get(name) == null) {
-			InstallRegistry.getInstance().put(name, name);
-			// we save after each registration
-			InstallRegistry.getInstance().save();
-		}
-	}
-	
-	/**
-	 * Registers an installed feature so it can be uninstalled later.
-	 * @param pluginEntry plugin to register.
-	 */
-	public static synchronized void registerPlugin(IPluginEntry pluginEntry) {
-		String name = "plugin_"+pluginEntry.getVersionedIdentifier(); //$NON-NLS-1$
-		if (InstallRegistry.getInstance().get(name) == null) {
-			InstallRegistry.getInstance().put(name, name);
-			// we save after each registration
-			InstallRegistry.getInstance().save();
-		}
-		
-		// add plugin to the list of just installed plugins .
-		InstallRegistry.getInstance().justInstalledPlugins.put(name,name);
-	}
-	
-	/**
-	 * Removes specified feature from registry
-	 *
-	 */
-	public static synchronized void unregisterFeature(IFeature feature) {
-		String name = "feature_"+feature.getVersionedIdentifier(); //$NON-NLS-1$
-		InstallRegistry.getInstance().remove(name);
-	}
-	
-	/**
-	 * Removes specified plugin from registry
-	 *
-	 */
-	public static synchronized void unregisterPlugin(IPluginEntry pluginEntry) {
-		String name = "plugin_"+pluginEntry.getVersionedIdentifier(); //$NON-NLS-1$
-		InstallRegistry.getInstance().remove(name);
-		
-		// remove the plugin from the list of just installed plugins (if needed).
-		InstallRegistry.getInstance().justInstalledPlugins.remove(name);
-	}
-	
-	/**
-	 * Returns true if the plugin was installed during this eclipse session
-	 * @param pluginEntry
-	 * @return
-	 */
-	public boolean isPluginJustInstalled(IPluginEntry pluginEntry) {
-		String name = "plugin_"+pluginEntry.getVersionedIdentifier(); //$NON-NLS-1$
-		return InstallRegistry.getInstance().justInstalledPlugins.get(name) != null;
-	}
-	
-	/**
-	 * This method is only needed for the update JUnit tests.
-	 *
-	 */
-	public static void cleanup() {
-		InstallRegistry.getInstance().justInstalledPlugins.clear();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
deleted file mode 100644
index 918fd7e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
+++ /dev/null

@@ -1,362 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

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

-

-/**

- * 

- */

-public class InternalSiteManager {

-

-	public static ILocalSite localSite;

-

-	public static final String DEFAULT_SITE_TYPE = SiteURLContentProvider.SITE_TYPE;

-	private static final String DEFAULT_EXECUTABLE_SITE_TYPE = SiteFileContentProvider.SITE_TYPE;

-

-	private static Map estimates;

-

-	// cache found sites

-	private static Map sites = new HashMap();

-	// cache timestamps

-	private static Map siteTimestamps = new HashMap();

-	public static boolean globalUseCache = true;

-

-	// true if an exception occured creating localSite

-	// so we cache it and don't attempt to create it again

-	private static CoreException exceptionOccured = null;

-

-	/*

-	 * @see SiteManager#getLocalSite()

-	 */

-	public static ILocalSite getLocalSite() throws CoreException {

-		return internalGetLocalSite();

-	}

-

-	/*

-	 * Internal call if optimistic reconciliation needed

-	 */

-	private static ILocalSite internalGetLocalSite() throws CoreException {

-

-		// if an exception occured while retrieving the Site

-		// rethrow it

-		if (exceptionOccured != null)

-			throw exceptionOccured;

-

-		if (localSite == null) {

-			try {

-				localSite = SiteLocal.internalGetLocalSite();

-			} catch (CoreException e) {

-				exceptionOccured = e;

-				throw e;

-			}

-		}

-		return localSite;

-	}

-	

-	private static boolean isValidCachedSite(URL siteURL) {

-		if (!sites.containsKey(siteURL.toExternalForm()))

-			return false;

-			

-		Long timestamp = (Long)siteTimestamps.get(siteURL);

-		if (timestamp == null)

-			return false;

-		long localLastModified = timestamp.longValue();

-		

-		return UpdateManagerUtils.isSameTimestamp(siteURL, localLastModified);

-	}

-

-	/*

-	 * @see ILocalSite#getSite(URL)

-	 */

-	public static ISite getSite(URL siteURL, boolean useCache, IProgressMonitor monitor) throws CoreException {

-		ISite site = null;

-		if (monitor==null) monitor = new NullProgressMonitor();

-

-		if (siteURL == null)

-			return null;

-

-		// use cache if set up globally (globalUseCache=true)

-		// and passed as parameter (useCache=true)

-		String siteURLString = siteURL.toExternalForm();

-		if ((useCache && globalUseCache) && isValidCachedSite(siteURL)) {

-			site = (ISite) sites.get(siteURLString);

-			return site;

-		}

-		

-		// try adding "eclipse" to the site url, in case this is an extension site

-		if ("file".equals(siteURL.getProtocol()) ) { //$NON-NLS-1$

-			File f = new File(siteURL.getFile());

-			if (f.isDirectory() && !"eclipse".equals(f.getName())) { //$NON-NLS-1$

-				f = new File(f, "eclipse"); //$NON-NLS-1$

-				try {

-					if ((useCache && globalUseCache) && isValidCachedSite(f.toURL())) {

-						site = (ISite) sites.get(f.toURL().toExternalForm());

-						return site;

-					}

-				} catch (MalformedURLException e) {

-				}	

-			}

-		}

-

-		// consider file protocol also if the URL points to a directory

-		// and no site.xml exist

-		// if the user points to a file, consider DEFAULT_SITE_TYPE

-		// site.xml will have to specify the type

-		boolean fileProtocol = "file".equalsIgnoreCase(siteURL.getProtocol()); //$NON-NLS-1$

-		boolean directoryExists = false;

-		if (fileProtocol) {

-			File dir;

-			dir = new File(siteURL.getFile());

-			if (dir != null && dir.isDirectory()) {

-				if (!(new File(dir, Site.SITE_XML).exists()))

-					directoryExists = true;

-			}

-		}

-

-		//PERF: if file: <path>/ and directory exists then consider executable

-		monitor.beginTask(Policy.bind("InternalSiteManager.ConnectingToSite"), 8); //$NON-NLS-1$

-		if (fileProtocol && directoryExists) {

-			site = attemptCreateSite(DEFAULT_EXECUTABLE_SITE_TYPE, siteURL, monitor);

-			monitor.worked(4); // only one attempt

-		} else {

-			try {

-				monitor.worked(3);

-				site = attemptCreateSite(DEFAULT_SITE_TYPE, siteURL, monitor);

-				monitor.worked(1);

-			} catch (CoreException preservedException) {

-				if (!monitor.isCanceled()) {

-					// attempt a retry is the protocol is file, with executbale type

-					if (!fileProtocol)

-						throw preservedException;

-

-					try {

-						site = attemptCreateSite(DEFAULT_EXECUTABLE_SITE_TYPE, siteURL, monitor);

-					} catch (CoreException retryException) {

-						IStatus firstStatus = preservedException.getStatus();

-						MultiStatus multi = new MultiStatus(firstStatus.getPlugin(), IStatus.OK, Policy.bind("InternalSiteManager.FailedRetryAccessingSite"), retryException); //$NON-NLS-1$

-						multi.addAll(firstStatus);

-						throw preservedException;

-					}

-				}

-			}

-		}

-

-		if (site != null) {

-			sites.put(siteURL.toExternalForm(), site);

-			try {

-				Response response = UpdateCore.getPlugin().get(URLEncoder.encode(siteURL));

-				siteTimestamps.put(siteURL, new Long(response.getLastModified()));

-			} catch (MalformedURLException e) {

-			} catch (IOException e) {

-			}

-		}

-

-		//flush the JarFile we may hold on to

-		// we keep the temp not to create them again

-		JarContentReference.shutdown(); // make sure we are not leaving jars open for this site

-

-		//flush mapping of downloaded JAR files

-		// FIXME : provide better cache flushing after 2.1

-		// FIXED: everything downloaded is cached and timestamped.

-		//        Timestamps are compared to lastModifed on the server

-		//        and we download only when there is a differenc

-		// Utilities.flushLocalFile();

-

-		return site;

-	}

-

-	/*

-	 * Attempt to create a site

-	 * if the site guessed is not the type found,

-	 * attempt to create a type with the type found in the site.xml

-	 */

-	private static ISite attemptCreateSite(String guessedTypeSite, URL siteURL, IProgressMonitor monitor) throws CoreException {

-		if (monitor == null) monitor = new NullProgressMonitor();

-		ISite site = null;

-

-		try {

-			monitor.worked(1);

-			site = createSite(guessedTypeSite, siteURL, monitor);

-			monitor.worked(1); // if no error, occurs the retry branch doesn't need to be executed

-		} catch (InvalidSiteTypeException e) {

-			if (monitor.isCanceled()) return null;

-

-			// the type in the site.xml is not the one expected	

-			// attempt to use this type instead	

-			//DEBUG:

-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_TYPE) {

-				UpdateCore.debug("The Site :" + siteURL.toExternalForm() + " is a different type than the guessed type based on the protocol. new Type:" + e.getNewType());	//$NON-NLS-1$ //$NON-NLS-2$ 

-			}

-

-			try {

-				if (e.getNewType() == null)

-					throw e;

-				site = createSite(e.getNewType(), siteURL, monitor);

-			} catch (InvalidSiteTypeException e1) {

-				throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateSiteWithType", e.getNewType(), siteURL.toExternalForm()), e1);	//$NON-NLS-1$ 

-			}

-		}

-

-		return site;

-	}

-

-	/*

-	 * create an instance of a class that implements ISite

-	 * 

-	 * the URL can be of the following form

-	 * 1 protocol://...../

-	 * 2 protocol://.....

-	 * 3 protocol://..../site.xml

-	 * 4 protocol://...#...

-	 * 

-	 * 1 If the file of the file of teh url ends with '/', attempt to open the stream.

-	 * if it fails, add site.xml and attempt to open the stream

-	 * 

-	 * 2 attempt to open the stream

-	 * 	fail

-	 * 		add '/site.xml' and attempt to open the stream

-	 * 	sucess

-	 * 		attempt to parse, if it fails, add '/site.xml' and attempt to open the stream

-	 * 

-	 * 3 open the stream

-	 * 

-	 * 4 open the stream	

-	 */

-	private static ISite createSite(String siteType, URL url, IProgressMonitor monitor) throws CoreException, InvalidSiteTypeException {

-		ISite site = null;

-		ISiteFactory factory = SiteTypeFactory.getInstance().getFactory(siteType);

-

-		try {

-			if (monitor != null)

-				monitor.worked(1);

-			site = createSite(factory, url, monitor);

-		} catch (CoreException e) {

-			if (monitor != null && monitor.isCanceled())

-				return null;

-

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

-			// or a directory, without reference			

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

-				// 4 nothing we can do

-				throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), e); //$NON-NLS-1$

-			} else if (url.getFile().endsWith("/")) { //$NON-NLS-1$

-				// 1 try to add site.xml

-				URL urlRetry;

-				try {

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

-				} catch (MalformedURLException e1) {

-					throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateURL", url.toExternalForm() + "+" + Site.SITE_XML), e1);	//$NON-NLS-1$ //$NON-NLS-2$

-				}

-				try {

-					if (monitor != null)

-						monitor.worked(1);

-					site = createSite(factory, urlRetry, monitor);

-				} catch (CoreException e1) {

-					throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), url.toExternalForm(), urlRetry.toExternalForm(), e, e1);//$NON-NLS-1$

-				}

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

-				// 3 nothing we can do

-				throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), e);//$NON-NLS-1$

-			} else {

-				// 2 try to add /site.xml 

-				URL urlRetry;

-				try {

-					urlRetry = new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile() + "/" + Site.SITE_XML);	//$NON-NLS-1$

-				} catch (MalformedURLException e1) {

-					throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateURL", url.toExternalForm() + "+" + Site.SITE_XML), e1);	//$NON-NLS-1$ //$NON-NLS-2$

-				}

-

-				try {

-					if (monitor != null)

-						monitor.worked(1);

-					site = createSite(factory, urlRetry, monitor);

-				} catch (CoreException e1) {

-					throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), url.toExternalForm(), urlRetry.toExternalForm(), e, e1);//$NON-NLS-1$

-				}

-			}

-		}

-		return site;

-	}

-	

-	private static ISite createSite(ISiteFactory factory, URL url, IProgressMonitor monitor) throws CoreException, InvalidSiteTypeException {

-		if (factory instanceof ISiteFactoryExtension)

-			return ((ISiteFactoryExtension)factory).createSite(url, monitor);

-		else

-			return factory.createSite(url);

-	}

-

-	/*

-	 * Creates a new site on the file system

-	 * This is the only Site we can create.

-	 * 

-	 * @param siteLocation

-	 * @throws CoreException

-	 */

-	public static ISite createSite(File siteLocation) throws CoreException {

-		ISite site = null;

-		if (siteLocation != null) {

-			try {

-				URL siteURL = siteLocation.toURL();

-				site = getSite(siteURL, false, null);

-			} catch (MalformedURLException e) {

-				throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateURL", siteLocation.getAbsolutePath()), e);	//$NON-NLS-1$

-			}

-		}

-		return site;

-	}

-

-

-	/**

-	 * Method downloaded.

-	 * @param downloadSize size downloaded in bytes

-	 * @param time time in seconds

-	 * @param url

-	 */

-	public static void downloaded(long downloadSize, long time, URL url) {

-		if (downloadSize <= 0 || time < 0)

-			return;

-		String host = url.getHost();

-		long sizeByTime = (time == 0) ? 0 : downloadSize / time;

-		Long value = new Long(sizeByTime);

-		if (estimates == null) {

-			estimates = new HashMap();

-		} else {

-			Long previous = (Long) estimates.get(host);

-			if (previous != null) {

-				value = new Long((previous.longValue() + sizeByTime) / 2);

-			}

-		}

-		estimates.put(host, value);

-	}

-	/**

-	 * Method getEstimatedTransferRate rate bytes/seconds.

-	 * @param host

-	 * @return long

-	 */

-	public static long getEstimatedTransferRate(String host) {

-		if (estimates == null)

-			return 0;

-		Long value = (Long) estimates.get(host);

-		if (value == null)

-			return 0;

-		return value.longValue();

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
deleted file mode 100644
index e46abb3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.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.update.internal.core;

-

-

-/**

- * This class is used to maintain a list of listeners, and

- * is used in the implementations of several classes within JFace

- * which allow you to register listeners of various kinds.

- * It is a fairly lightweight object, occupying minimal space when

- * no listeners are registered.

- * <p>

- * Note that the <code>add</code> method checks for and eliminates 

- * duplicates based on identity (not equality).  Likewise, the

- * <code>remove</code> method compares based on identity.

- * </p>

- * <p>

- * Use the <code>getListeners</code> method when notifying listeners.

- * Note that no garbage is created if no listeners are registered.

- * The recommended code sequence for notifying all registered listeners

- * of say, <code>FooListener.eventHappened</code>, is:

- * <pre>

- * Object[] listeners = myListenerList.getListeners();

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

- *    ((FooListener) listeners[i]).eventHappened(event);

- * }

- * </pre>

- * </p>

- */

-

-public class ListenersList {

-	/**

-	 * The initial capacity of the list. Always >= 1.

-	 */

-	private int capacity;

-

-	/**

-	 * The current number of listeners.

-	 * Maintains invariant: 0 <= size <= listeners.length.

-	 */

-	private int size;

-

-	/**

-	 * The list of listeners.  Initially <code>null</code> but initialized

-	 * to an array of size capacity the first time a listener is added.

-	 * Maintains invariant: listeners != null IFF size != 0

-	 */

-	private Object[] listeners = null;

-

-	/**

-	 * The empty array singleton instance, returned by getListeners()

-	 * when size == 0.

-	 */

-	private static final Object[] EmptyArray = new Object[0];

-/**

- * Creates a listener list with an initial capacity of 3.

- */

-public ListenersList() {

-	this(3);

-}

-/**

- * Creates a listener list with the given initial capacity.

- *

- * @param capacity the number of listeners which this list can initially accept 

- *    without growing its internal representation; must be at least 1

- */

-public ListenersList(int capacity) {

-	Assert.isTrue(capacity >= 1);

-	this.capacity = capacity;

-}

-/**

- * Adds the given listener to this list. Has no effect if an identical listener

- * is already registered.

- *

- * @param listener the listener

- */

-public void add(Object listener) {

-	Assert.isNotNull(listener);

-	if (size == 0) {

-		listeners = new Object[capacity];

-	} else {

-	    // check for duplicates using identity

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

-			if (listeners[i] == listener) {

-				return;

-			}

-		}

-		// grow array if necessary

-		if (size == listeners.length) {

-			System.arraycopy(listeners, 0, listeners = new Object[size * 2 + 1], 0, size);

-		}

-	}

-	listeners[size++] = listener;

-}

-/**

- * Returns an array containing all the registered listeners.

- * The resulting array is unaffected by subsequent adds or removes.

- * If there are no listeners registered, the result is an empty array

- * singleton instance (no garbage is created).

- * Use this method when notifying listeners, so that any modifications

- * to the listener list during the notification will have no effect on the

- * notification itself.

- *

- * @return the list of registered listeners

- */

-public Object[] getListeners() {

-	if (size == 0)

-		return EmptyArray;

-	Object[] result = new Object[size];

-	System.arraycopy(listeners, 0, result, 0, size);

-	return result;

-}

-/**

- * Returns whether this listener list is empty.

- *

- * @return <code>true</code> if there are no registered listeners, and

- *   <code>false</code> otherwise

- */

-public boolean isEmpty() {

-	return size == 0;

-}

-/**

- * Removes the given listener from this list. Has no effect if an identical

- * listener was not already registered.

- *

- * @param listener the listener

- */

-public void remove(Object listener) {

-	Assert.isNotNull(listener);

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

-		if (listeners[i] == listener) {

-			if (size == 1) {

-				listeners = null;

-				size = 0;

-			}

-			else {

-				System.arraycopy(listeners, i + 1, listeners, i, --size - i);

-				listeners[size] = null;

-			}

-			return;

-		}

-	}

-}

-/**

- * Returns the number of registered listeners.

- *

- * @return the number of registered listeners

- */

-public int size() {

-	return size;

-}

-}

-	

-

-

-


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
deleted file mode 100644
index a24168b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.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.update.internal.core;

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

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

-

-/**

- * ContentConsumer for a non plugin entry of a feature

- */

-

-public class NonPluginEntryContentConsumer extends ContentConsumer {

-

-	private boolean closed = false;

-

-	private IContentConsumer contentConsumer;

-		

-	/*

-	 * Constructor

-	 */

-	public NonPluginEntryContentConsumer(IContentConsumer contentConsumer){

-		this.contentConsumer = contentConsumer;

-	}

-

-	/*

-	 * @see ContentConsumer#store(ContentReference, IProgressMonitor)

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {

-		if (!closed){

-			contentConsumer.store( contentReference,monitor);

-		} else {

-			UpdateCore.warn("Attempt to store in a closed NonPluginEntryContentConsumer",new Exception()); //$NON-NLS-1$

-		}

-	}

-

-	/*

-	 * @see ContentConsumer#close()

-	 */

-	public void close() throws CoreException  {

-		if (!closed){

-			closed = true;

-			contentConsumer.close();

-		} else {

-			UpdateCore.warn("Attempt to close a closed NonPluginEntryContentConsumer",new Exception()); //$NON-NLS-1$

-		}

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/OtherResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/OtherResponse.java
deleted file mode 100644
index 223bec1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/OtherResponse.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.internal.core;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-
-public class OtherResponse implements Response {
-	protected URL url;
-	protected InputStream in;
-	protected URLConnection connection;
-	protected long lastModified;
-
-	public OtherResponse(URL url) throws IOException {
-		this.url = url;
-		connection = url.openConnection();
-	}
-
-	public InputStream getInputStream() throws IOException {
-		if (in == null && url != null) {
-			in = connection.getInputStream();
-			this.lastModified = connection.getLastModified();
-		}
-		return in;
-	}
-	/**
-	 * @see Response#getInputStream(IProgressMonitor)
-	 */
-	public InputStream getInputStream(IProgressMonitor monitor)
-		throws IOException, CoreException {
-		return getInputStream();
-	}
-
-	public long getContentLength() {
-		return connection.getContentLength();
-	}
-
-	public int getStatusCode() {
-		return IStatusCodes.HTTP_OK;
-	}
-
-	public String getStatusMessage() {
-		return ""; //$NON-NLS-1$
-	}
-
-	public long getLastModified() {
-		if (lastModified == 0) {
-			lastModified = connection.getLastModified();
-		}
-		return lastModified;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PatchedFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PatchedFeature.java
deleted file mode 100644
index f6d6edb..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PatchedFeature.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-/**
- * Feature and corresponding patch features
- */
-public class PatchedFeature {
-	private IFeatureReference feature;
-	private Collection patches = new HashSet();
-	/**
-	 *  
-	 */
-	public PatchedFeature(IFeatureReference feature) {
-		super();
-		this.feature = feature;
-	}
-	public void addPatch(IFeatureReference patch) {
-		patches.add(patch);
-	}
-	/**
-	 * @return Returns the feature.
-	 */
-	public IFeatureReference getFeature() {
-		return feature;
-	}
-	/**
-	 * @return Returns the patches.
-	 */
-	public IFeatureReference[] getPatches() {
-		return (IFeatureReference[]) patches.toArray(new IFeatureReference[patches.size()]);
-	}
-	/**
-	 * @return Returns the feature and the patches.
-	 */
-	public IFeatureReference[] getFeatureAndPatches() {
-		IFeatureReference[] features = new IFeatureReference[patches.size() + 1];
-		features[0] = feature;
-		System.arraycopy(getPatches(), 0, features, 1, patches.size());
-		return features;
-	}
-	/**
-	 * Obtains all plugins from the feature and its patches. Each plugin will
-	 * have unique ID.
-	 * If there are multiple version of plugin with same ID among the feature
-	 * and its patches, highest version plugins are chosen.
-	 * 
-	 * @return FeaturePlugin[]
-	 */
-	public FeaturePlugin[] getPlugins() {
-		// Use a map of PatchedPluigns by plugin ID
-		// to collect one version of each plugin
-		Map plugins = new HashMap();
-		IFeatureReference[] featureRefs = getFeatureAndPatches();
-		// for each (feature or any patch)
-		for (int i = 0; i < featureRefs.length; i++) {
-			try {
-				IFeature feature = featureRefs[i].getFeature(null);
-				if (feature == null) {
-					UpdateCore.warn("Null Feature", new Exception()); //$NON-NLS-1$
-					continue;
-				}
-				// get plugin entries
-				IPluginEntry[] entries = feature.getPluginEntries();
-				for (int entr = 0; entr < entries.length; entr++) {
-					String pluginId = entries[entr].getVersionedIdentifier().getIdentifier();
-					PluginVersionIdentifier pluginVersion = entries[entr].getVersionedIdentifier().getVersion();
-					// check if map contains >= version of same plugin
-					FeaturePlugin existingPlugin = (FeaturePlugin) plugins.get(pluginId);
-					if (existingPlugin != null && existingPlugin.getEntry().getVersionedIdentifier().getVersion().isGreaterOrEqualTo(pluginVersion)) {
-						// same or newer plugin already collected
-						continue;
-					} else {
-						plugins.put(pluginId, new FeaturePlugin(entries[entr], feature));
-					}
-				}
-			} catch (CoreException e) {
-				UpdateCore.warn(null, e);
-			}
-		}
-		return (FeaturePlugin[]) plugins.values().toArray(new FeaturePlugin[plugins.size()]);
-	}
-	public String toString() {
-		StringBuffer str = new StringBuffer(feature.toString());
-		IFeatureReference[] patches = getFeatureAndPatches();
-		for (int i = 0; i < patches.length; i++) {
-			str.append(" +patch=" + patches[i].toString() + " "); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return str.toString();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
deleted file mode 100644
index f99c265..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.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.update.internal.core;

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

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

-

-/**

- * ContentConsumer for a plugin entry of a feature

- */

-

-public class PluginEntryContentConsumer extends ContentConsumer {

-

-	private boolean closed = false;

-

-	private IContentConsumer contentConsumer;

-		

-	/*

-	 * Constructor

-	 */

-	public PluginEntryContentConsumer(IContentConsumer contentConsumer){

-		this.contentConsumer = contentConsumer;

-	}

-

-	/*

-	 * @see ContentConsumer#store(ContentReference, IProgressMonitor)

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {

-		if (!closed){

-			contentConsumer.store(contentReference,monitor);

-		} else {

-			UpdateCore.warn("Attempt to store in a closed PluginEntryContentConsumer",new Exception()); //$NON-NLS-1$

-		}

-	}

-

-	/*

-	 * @see ContentConsumer#close()

-	 */

-	public void close() throws CoreException {

-		if (!closed){

-			closed = true;

-			contentConsumer.close();

-		} else {

-			UpdateCore.warn("Attempt to close a closed PluginEntryContentConsumer",new Exception()); //$NON-NLS-1$

-		}

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
deleted file mode 100644
index 5c3e314..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.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.update.internal.core;
-
-
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-
-public class Policy {
-	protected static ResourceBundle bundle = null;
-
-	/**
-	 * Creates a NLS catalog for the given locale.
-	 */
-	public static void localize(String bundleName) {
-		bundle = ResourceBundle.getBundle(bundleName);
-	}
-	
-	/**
-	 * Lookup the message with the given ID in this catalog and bind its
-	 * substitution locations with the given string.
-	 */
-	public static String bind(String id, String binding) {
-		return bind(id, new String[] { binding });
-	}
-	
-	/**
-	 * Lookup the message with the given ID in this catalog and bind its
-	 * substitution locations with the given strings.
-	 */
-	public static String bind(String id, String binding1, String binding2) {
-		return bind(id, new String[] { binding1, binding2 });
-	}
-	
-	/**
-	 * Gets a string from the resource bundle. We don't want to crash because of a missing String.
-	 * Returns the key if not found.
-	 */
-	public static String bind(String key) {
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	/**
-	 * Gets a string from the resource bundle and binds it with the given arguments. If the key is 
-	 * not found, return the key.
-	 */
-	public static String bind(String key, Object[] args) {
-		try {
-			return MessageFormat.format(bind(key), args);
-		} catch (MissingResourceException e) {
-			return key;
-		} catch (NullPointerException e) {
-			return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	/**
-	 * Progress monitor helpers
-	 */
-	public static void checkCanceled(IProgressMonitor monitor) {
-		if (monitor.isCanceled())
-			throw new OperationCanceledException();
-	}
-	public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
-		if (monitor == null)
-			return new NullProgressMonitor();
-		return monitor;
-	}
-	
-	public static 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/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
deleted file mode 100644
index 1c9f4e0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-
-public interface Response {
-
-	/**
-	 * Method getInputStream.
-	 * 
-	 * @return InputStream
-	 */
-	public InputStream getInputStream() throws IOException;
-
-	/**
-	 * A special version of 'getInputStream' that can be canceled.
-	 * A monitor thread checks the state of the monitor
-	 * and disconnects the connection if 'isCanceled()' is detected.
-	 * 
-	 * @param monitor
-	 *            the progress monitor
-	 * @return InputStream an opened stream or null if failed.
-	 * @throws IOException
-	 *             if there are problems
-	 * @throws CoreException
-	 *             if no more connection threads are available
-	 */
-	public InputStream getInputStream(IProgressMonitor monitor)
-		throws IOException, CoreException;
-
-	/**
-	 * Method getContentLength.
-	 * 
-	 * @return long
-	 */
-	public long getContentLength();
-
-	/**
-	 * Method getStatusCode.
-	 * 
-	 * @return int
-	 */
-	public int getStatusCode();
-
-	/**
-	 * Method getStatusMessage.
-	 * 
-	 * @return String
-	 */
-	public String getStatusMessage();
-
-	/**
-	 * Returns the timestamp of last modification to the resource
-	 * 
-	 * @return
-	 */
-	public long getLastModified();
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
deleted file mode 100644
index a5de692..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-
-import org.eclipse.update.core.*;
-
-/**
- * A default implementation for IFeatureContentConsumer
- * </p>
- * @since 2.0
- */
-
-public abstract class SiteContentConsumer implements ISiteContentConsumer {
-	
-	private ISite site;
-	
-	/*
-	 * @see ISiteContentConsumer#setSite(ISite)
-	 */
-	/**
-	 * Sets the site.
-	 * @param site The site to set
-	 */
-	public void setSite(ISite site) {
-		this.site = site;
-	}
-
-	/**
-	 * Gets the site.
-	 * @return Returns a ISite
-	 */
-	public ISite getSite() {
-		return site;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
deleted file mode 100644
index ae25fd0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
+++ /dev/null

@@ -1,431 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.util.*;

-

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

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

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

-

-/**

- * @author birsan

- *

- * TODO To change the template for this generated type comment go to

- * Window - Preferences - Java - Code Generation - Code and Comments

- */

-/**

- * Site on the File System

- */

-public class SiteFile extends Site {

-

-	/**

-	 * plugin entries 

-	 */

-	private List pluginEntries = new ArrayList(0);

-

-	/**

-	 * 

-	 */

-	public ISiteContentConsumer createSiteContentConsumer(IFeature targetFeature) throws CoreException {

-		SiteFileContentConsumer consumer = new SiteFileContentConsumer(targetFeature);

-		consumer.setSite(this);

-		return consumer;

-	}

-

-	/**

-	 */

-	public String getDefaultPackagedFeatureType() {

-		return DEFAULT_INSTALLED_FEATURE_TYPE;

-	}

-

-	/*

-	 * @see ISite#install(IFeature, IVerifier, IProgressMonitor)

-	 */

-	public IFeatureReference install(IFeature sourceFeature, IVerificationListener verificationListener, IProgressMonitor progress) throws CoreException {

-		return install(sourceFeature,null,verificationListener,progress);

-	}

-

-	/*

-	 * @see ISite#install(IFeature, IVerifier, IProgressMonitor)

-	 */

-	public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor progress) throws CoreException {

-

-		if (sourceFeature == null)

-			return null;

-

-		// make sure we have an InstallMonitor		

-		InstallMonitor monitor;

-		if (progress == null)

-			monitor = null;

-		else if (progress instanceof InstallMonitor)

-			monitor = (InstallMonitor) progress;

-		else

-			monitor = new InstallMonitor(progress);

-

-		// create new executable feature and install source content into it

-		IFeature localFeature = createExecutableFeature(sourceFeature);

-

-		IFeatureReference localFeatureReference = null;

-		localFeatureReference = sourceFeature.install(localFeature, optionalfeatures, verificationListener, monitor);

-

-		return localFeatureReference;

-	}

-

-	/*

-	 * @see ISite#install(IFeature,IFeatureContentConsumer, IVerifier,IVerificationLIstener, IProgressMonitor)

-	 */

-	public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalfeatures, IFeatureContentConsumer parentContentConsumer, IVerifier parentVerifier, IVerificationListener verificationListener, IProgressMonitor progress)

-		throws InstallAbortedException, CoreException {

-

-		if (sourceFeature == null)

-			return null;

-

-		// make sure we have an InstallMonitor		

-		InstallMonitor monitor;

-		if (progress == null)

-			monitor = null;

-		else if (progress instanceof InstallMonitor)

-			monitor = (InstallMonitor) progress;

-		else

-			monitor = new InstallMonitor(progress);

-

-		// create new executable feature and install source content into it

-		IFeature localFeature = createExecutableFeature(sourceFeature);

-		parentContentConsumer.addChild(localFeature);

-

-		// set the verifier

-		IVerifier vr = sourceFeature.getFeatureContentProvider().getVerifier();

-		if (vr != null)

-			vr.setParent(parentVerifier);

-

-		IFeatureReference localFeatureReference = null;

-		localFeatureReference = sourceFeature.install(localFeature, optionalfeatures, verificationListener, monitor);

-

-		return localFeatureReference;

-	}

-

-	/*

-	 * @see ISite#remove(IFeature, IProgressMonitor)

-	 */

-	public void remove(IFeature feature, IProgressMonitor progress) throws CoreException {

-

-		if (feature == null) {

-			UpdateCore.warn("Feature to remove is null");

-			return;

-		}

-		

-		ErrorRecoveryLog recoveryLog = ErrorRecoveryLog.getLog();

-

-		// make sure we have an InstallMonitor		

-		InstallMonitor monitor;

-		if (progress == null)

-			monitor = null;

-		else if (progress instanceof InstallMonitor)

-			monitor = (InstallMonitor) progress;

-		else

-			monitor = new InstallMonitor(progress);

-

-		// Setup optional install handler

-		InstallHandlerProxy handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_UNINSTALL, feature, feature.getInstallHandlerEntry(), monitor);

-		boolean success = false;

-		Throwable originalException = null;

-

-		try {

-

-			// start log

-			recoveryLog.open(ErrorRecoveryLog.START_REMOVE_LOG);

-

-			aboutToRemove(feature);

-

-			// log files have been downloaded

-			recoveryLog.append(ErrorRecoveryLog.END_ABOUT_REMOVE);

-

-			handler.uninstallInitiated();

-

-			// remove the feature and the plugins if they are not used and not activated

-			// get the plugins from the feature

-			IPluginEntry[] pluginsToRemove = getPluginEntriesOnlyReferencedBy(feature);

-

-			if (monitor != null) {

-				monitor.beginTask(Policy.bind("SiteFile.Removing") + feature.getLabel(), pluginsToRemove.length + 1);	//$NON-NLS-1$

-			}

-

-			// remove feature reference from the site

-			ISiteFeatureReference[] featureReferences = getFeatureReferences();

-			if (featureReferences != null) {

-				for (int indexRef = 0; indexRef < featureReferences.length; indexRef++) {

-					IFeatureReference element = featureReferences[indexRef];

-					if (element.getVersionedIdentifier().equals(feature.getVersionedIdentifier())) {

-						removeFeatureReferenceModel((FeatureReferenceModel) element);

-						break;

-					}

-				}

-			}

-

-			if (InstallRegistry.getInstance().get("feature_"+feature.getVersionedIdentifier()) == null) {

-				UpdateCore.log("Feature " + feature.getVersionedIdentifier() + " was not removed", null);

-			} else {

-				// remove the feature content

-				ContentReference[] references = feature.getFeatureContentProvider().getFeatureEntryArchiveReferences(monitor);

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

-					try {

-						UpdateManagerUtils.removeFromFileSystem(references[i].asFile());

-						if (monitor != null)

-							monitor.worked(1);

-					} catch (IOException e) {

-						throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemoveFeature", feature.getVersionedIdentifier().getIdentifier(), getURL().toExternalForm()), e);	//$NON-NLS-1$

-					}

-				}

-				InstallRegistry.unregisterFeature(feature);

-			}

-

-			//finds the contentReferences for an IPluginEntry

-			// and remove it

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

-				remove(feature, pluginsToRemove[i], monitor);

-			}

-

-			// remove any children feature

-			IFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();

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

-				IFeature childFeature = null;

-				try {

-					childFeature = childrenRef[i].getFeature(null);

-				} catch (CoreException e) {

-					UpdateCore.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);

-				}

-				if (childFeature != null)

-					remove(childrenRef[i].getFeature(null), monitor);

-			}

-

-			// remove the feature from the site cache

-			removeFeatureFromCache(feature.getURL());

-			

-			handler.completeUninstall();

-

-			success = true;

-		} catch (Throwable t) {

-			originalException = t;

-		} finally {

-			Throwable newException = null;

-			try {

-				if (success) {

-					// close the log

-					recoveryLog.close(ErrorRecoveryLog.END_REMOVE_LOG);

-					recoveryLog.delete();

-				} else {

-					recoveryLog.close(ErrorRecoveryLog.END_REMOVE_LOG);

-				}

-				handler.uninstallCompleted(success);

-			} catch (Throwable t) {

-				newException = t;

-			}

-			if (originalException != null) // original exception wins

-				throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), originalException); //$NON-NLS-1$

-			if (newException != null)

-				throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), newException);//$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * returns the download size

-	 * of the feature to be installed on the site.

-	 * If the site is <code>null</code> returns the maximum size

-	 * 

-	 * If one plug-in entry has an unknown size.

-	 * then the download size is unknown.

-	 * 

-	 */

-	public long getDownloadSizeFor(IFeature feature) {

-		long result = 0;

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

-		IPluginEntry[] siteEntries = this.getPluginEntries();

-		entriesToInstall = UpdateManagerUtils.diff(entriesToInstall, siteEntries);

-		//[18355]

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

-

-		try {

-			result = feature.getFeatureContentProvider().getDownloadSizeFor(entriesToInstall, nonPluginEntriesToInstall);

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-			result = ContentEntryModel.UNKNOWN_SIZE;

-		}

-		return result;

-	}

-

-	/**

-	 * returns the download size

-	 * of the feature to be installed on the site.

-	 * If the site is <code>null</code> returns the maximum size

-	 * 

-	 * If one plug-in entry has an unknown size.

-	 * then the download size is unknown.

-	 * 

-	 * @see ISite#getDownloadSizeFor(IFeature)

-	 * 

-	 */

-	public long getInstallSizeFor(IFeature feature) {

-		long result = 0;

-

-		try {

-			List pluginsToInstall = new ArrayList();

-

-			// get all the plugins [17304]

-			pluginsToInstall.addAll(Arrays.asList(feature.getPluginEntries()));

-			IFeatureReference[] children = feature.getIncludedFeatureReferences();

-			IFeature currentFeature = null;

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

-				currentFeature = children[i].getFeature(null);

-				if (currentFeature != null) {

-					pluginsToInstall.addAll(Arrays.asList(currentFeature.getPluginEntries()));

-				}

-			}

-

-			IPluginEntry[] entriesToInstall = new IPluginEntry[0];

-			if (pluginsToInstall.size() > 0) {

-				entriesToInstall = new IPluginEntry[pluginsToInstall.size()];

-				pluginsToInstall.toArray(entriesToInstall);

-			}

-

-			IPluginEntry[] siteEntries = this.getPluginEntries();

-			entriesToInstall = UpdateManagerUtils.diff(entriesToInstall, siteEntries);

-

-			//[18355]

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

-

-			result = feature.getFeatureContentProvider().getInstallSizeFor(entriesToInstall, nonPluginEntriesToInstall);

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-			result = ContentEntryModel.UNKNOWN_SIZE;

-		}

-

-		return result;

-	}

-

-	/**

-	 * Adds a plugin entry 

-	 * Either from parsing the file system or 

-	 * installing a feature

-	 * 

-	 * We cannot figure out the list of plugins by reading the Site.xml as

-	 * the archives tag are optionals

-	 */

-	public void addPluginEntry(IPluginEntry pluginEntry) {

-		pluginEntries.add(pluginEntry);

-	}

-

-	public IPluginEntry[] getPluginEntries() {

-		IPluginEntry[] result = new IPluginEntry[0];

-		if (!(pluginEntries == null || pluginEntries.isEmpty())) {

-			result = new IPluginEntry[pluginEntries.size()];

-			pluginEntries.toArray(result);

-		}

-		return result;

-	}

-

-

-	public int getPluginEntryCount() {

-		return getPluginEntries().length;

-	}

-

-	/**

-	 * 

-	 */

-	private IFeature createExecutableFeature(IFeature sourceFeature) throws CoreException {

-		IFeature result = null;

-		IFeatureFactory factory = FeatureTypeFactory.getInstance().getFactory(DEFAULT_INSTALLED_FEATURE_TYPE);

-		result = factory.createFeature(/*URL*/null, this, null);

-

-		// at least set the version identifier to be the same

-		 ((FeatureModel) result).setFeatureIdentifier(sourceFeature.getVersionedIdentifier().getIdentifier());

-		((FeatureModel) result).setFeatureVersion(sourceFeature.getVersionedIdentifier().getVersion().toString());

-		return result;

-	}

-

-	/**

-	 * 

-	 */

-	private void remove(IFeature feature, IPluginEntry pluginEntry, InstallMonitor monitor) throws CoreException {

-

-		if (pluginEntry == null)

-			return;

-			

-		if (InstallRegistry.getInstance().get("plugin_"+pluginEntry.getVersionedIdentifier()) == null) {

-			UpdateCore.log("Plugin " + pluginEntry.getVersionedIdentifier() + " was not removed", null);

-			return; 

-		}

-

-		ContentReference[] references = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(pluginEntry, monitor);

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

-			try {

-				UpdateManagerUtils.removeFromFileSystem(references[i].asFile());

-				if (monitor != null)

-					monitor.worked(1);

-			} catch (IOException e) {

-				throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemovePlugin", pluginEntry.getVersionedIdentifier().toString(), getURL().toExternalForm()), e);//$NON-NLS-1$

-			}

-		}

-		pluginEntries.remove(pluginEntry);

-		InstallRegistry.unregisterPlugin(pluginEntry);

-	}

-

-	/*

-	 * 

-	 */

-	private void aboutToRemove(IFeature feature) throws CoreException {

-

-		ErrorRecoveryLog recoveryLog = ErrorRecoveryLog.getLog();

-		// if the recovery is not turned on

-		if (!ErrorRecoveryLog.RECOVERY_ON)

-			return;

-

-		//logFeature

-		if (feature != null) {

-					

-			// log feature URL

-			ContentReference[] references = feature.getFeatureContentProvider().getFeatureEntryArchiveReferences(null);

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

-				try {

-					recoveryLog.appendPath(ErrorRecoveryLog.FEATURE_ENTRY, references[i].asFile().getAbsolutePath());

-				} catch (IOException e) {

-					String id = UpdateCore.getPlugin().getBundle().getSymbolicName();

-					throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemoveFeature", feature.getVersionedIdentifier().getIdentifier(), getURL().toExternalForm()), e); //$NON-NLS-1$

-				}

-			}

-			// log pluginEntry URL

-			IPluginEntry[] pluginsToRemove = getPluginEntriesOnlyReferencedBy(feature);

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

-				references = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(pluginsToRemove[i], null);

-				for (int j = 0; j < references.length; j++) {

-					try {

-						recoveryLog.appendPath(ErrorRecoveryLog.BUNDLE_JAR_ENTRY, references[j].asFile().getAbsolutePath());

-					} catch (IOException e) {

-						throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemovePlugin", pluginsToRemove[i].getVersionedIdentifier().toString(), getURL().toExternalForm()), e); //$NON-NLS-1$

-					}

-				}

-			}

-		}

-

-		// call recursively for each children	 

-		IFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();

-		IFeature childFeature = null;

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

-			try {

-				childFeature = childrenRef[i].getFeature(null);

-			} catch (CoreException e) {

-				UpdateCore.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);

-			}

-			aboutToRemove(childFeature);

-		}

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
deleted file mode 100644
index 4fdbe14..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

-

-/**

- * ContentConsummer for a SiteFile

- */

-public class SiteFileContentConsumer extends SiteContentConsumer {

-

-	private IFeature feature;

-	private boolean closed = false;

-

-	// recovery

-	private String oldPath;

-	private String newPath;

-

-	//  for abort

-	private List /* of SiteFilePluginContentConsumer */

-	contentConsumers;

-	private List /*of path as String */

-	installedFiles;

-	

-	// PERF: new instance variable

-	private SiteFileFactory archiveFactory = new SiteFileFactory();

-

-	/*

-	 * Constructor 

-	 */

-	public SiteFileContentConsumer(IFeature feature) {

-		this.feature = feature;

-		installedFiles = new ArrayList();

-	}

-

-	/*

-	 * Returns the path in which the Feature will be installed

-	 */

-	private String getFeaturePath() throws CoreException {

-		String featurePath = null;

-		try {

-			VersionedIdentifier featureIdentifier = feature.getVersionedIdentifier();

-			String path = Site.DEFAULT_INSTALLED_FEATURE_PATH + featureIdentifier.toString() + File.separator;

-			URL newURL = new URL(getSite().getURL(), path);

-			featurePath = newURL.getFile();

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteFileContentConsumer.UnableToCreateURL") + e.getMessage(), e);	//$NON-NLS-1$

-		}

-		return featurePath;

-	}

-

-	/*

-	 * @see ISiteContentConsumer#open(INonPluginEntry)

-	 */

-	public IContentConsumer open(INonPluginEntry nonPluginEntry) throws CoreException {

-		return new SiteFileNonPluginContentConsumer(getFeaturePath());

-	}

-

-	/*

-	 * @see ISiteContentConsumer#open(IPluginEntry)

-	 */

-	public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException {

-		ContentConsumer cons;

-		if(pluginEntry instanceof PluginEntryModel && !((PluginEntryModel)pluginEntry).isUnpack()){

-			// plugin can run from a jar

-			 cons = new SiteFilePackedPluginContentConsumer(pluginEntry, getSite());

-		} else{

-			// plugin must be unpacked

-			cons = new SiteFilePluginContentConsumer(pluginEntry, getSite());

-		}

-		addContentConsumers(cons);

-		return cons;

-	}

-

-	/*

-	 * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {

-

-		if (closed) {

-			UpdateCore.warn("Attempt to store in a closed SiteFileContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-

-		InputStream inStream = null;

-		String featurePath = getFeaturePath();

-		String contentKey = contentReference.getIdentifier();

-		featurePath += contentKey;

-

-		// error recovery

-		if (featurePath.endsWith("\\"+Feature.FEATURE_XML) || featurePath.endsWith("/"+Feature.FEATURE_XML)) { //$NON-NLS-1$ //$NON-NLS-2$

-			oldPath = featurePath.replace(File.separatorChar, '/');

-			File localFile = new File(oldPath);

-			if (localFile.exists()) {

-				throw Utilities.newCoreException(Policy.bind("UpdateManagerUtils.FileAlreadyExists", new Object[] { localFile }), null); //$NON-NLS-1$

-			}

-			featurePath = ErrorRecoveryLog.getLocalRandomIdentifier(featurePath);

-			newPath = featurePath;

-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.FEATURE_ENTRY, featurePath);

-		}

-

-		try {

-			inStream = contentReference.getInputStream();

-			UpdateManagerUtils.copyToLocal(inStream, featurePath, null);

-			UpdateManagerUtils.checkPermissions(contentReference, featurePath); // 20305

-			installedFiles.add(featurePath);

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("GlobalConsumer.ErrorCreatingFile", featurePath), e); //$NON-NLS-1$

-		} finally {

-			if (inStream != null) {

-				try {

-					// close stream

-					inStream.close();

-				} catch (IOException e) {

-				}

-			}

-		}

-

-	}

-

-	/*

-	 * @see ISiteContentConsumer#close()

-	 */

-	public IFeatureReference close() throws CoreException {

-

-		if (closed)

-			UpdateCore.warn("Attempt to close a closed SiteFileContentConsumer", new Exception()); //$NON-NLS-1$

-

-		// create a new Feature reference to be added to the site

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(getSite());

-		File file = null;

-

-		try {

-			file = new File(getFeaturePath());

-			ref.setURL(file.toURL());

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteFileContentConsumer.UnableToCreateURLForFile", file.getAbsolutePath()), e); //$NON-NLS-1$

-		}

-

-		//rename file back 

-		if (newPath != null) {

-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.RENAME_ENTRY, newPath);

-			boolean sucess = false;

-			File fileToRename = new File(newPath);

-			if (fileToRename.exists()) {

-				File renamedFile = new File(oldPath);

-				if (renamedFile.exists()) {

-					UpdateManagerUtils.removeFromFileSystem(renamedFile);

-					UpdateCore.warn("Removing already existing file:" + oldPath); //$NON-NLS-1$

-				}

-				sucess = fileToRename.renameTo(renamedFile);

-			}

-			if (!sucess) {

-				String msg = Policy.bind("ContentConsumer.UnableToRename", newPath, oldPath); //$NON-NLS-1$

-				throw Utilities.newCoreException(msg, new Exception(msg));

-			}

-		}

-

-		// close plugin and non plugin content consumer

-		if (contentConsumers != null) {

-			Iterator iter = contentConsumers.iterator();

-			while (iter.hasNext()) {

-				ContentConsumer element = (ContentConsumer) iter.next();

-				element.close();

-			}

-		}

-		contentConsumers = null;

-

-		if (ref != null) {

-			// the feature MUST have renamed the plugins at that point

-			// (by closing the PluginContentConsumer)

-			commitPlugins(ref);

-			ref.markReadOnly();

-		}

-

-		closed = true;

-		return ref;

-	}

-

-	/*

-	 * @see ISiteContentConsumer#abort()

-	 */

-	public void abort() throws CoreException {

-

-		if (closed) {

-			UpdateCore.warn("Attempt to abort a closed SiteFileContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-

-		//abort all plugins content consumer opened

-		if (contentConsumers != null) {

-			Iterator iter = contentConsumers.iterator();

-			while (iter.hasNext()) {

-				SiteFilePluginContentConsumer element = (SiteFilePluginContentConsumer) iter.next();

-				element.abort();

-			}

-		}

-		contentConsumers = null;

-		boolean sucess = true;

-

-		//Remove feature.xml first if it exists

-		if (oldPath != null) {

-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.DELETE_ENTRY, oldPath);

-			File fileToDelete = new File(oldPath);

-			if (fileToDelete.exists()) {

-				sucess = fileToDelete.delete();

-			}

-		}

-

-		if (!sucess) {

-			String msg = Policy.bind("Unable to delete", oldPath); //$NON-NLS-1$

-			UpdateCore.log(msg, null);

-		} else {

-			// remove the feature files;

-			Iterator iter = installedFiles.iterator();

-			File featureFile = null;

-			while (iter.hasNext()) {

-				String path = (String) iter.next();

-				featureFile = new File(path);

-				UpdateManagerUtils.removeFromFileSystem(featureFile);

-			}

-

-			// remove the feature directory if empty

-			String featurePath = getFeaturePath();

-			UpdateManagerUtils.removeEmptyDirectoriesFromFileSystem(new File(featurePath));

-		}

-		closed = true;

-		return;

-	}

-

-	/*

-	 * commit the plugins installed as archive on the site

-	 * (creates the map between the plugin id and the location of the plugin)

-	 */

-	private void commitPlugins(IFeatureReference localFeatureReference) throws CoreException {

-	

-		// get the feature

-		 ((SiteFile) getSite()).addFeatureReferenceModel((SiteFeatureReferenceModel) localFeatureReference);

-		IFeature localFeature = null;

-		try {

-			localFeature = localFeatureReference.getFeature(null);

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-			return;

-		}

-	

-		if (localFeature == null)

-			return;

-	

-		// add the installed plugins directories as archives entry

-		ArchiveReferenceModel archive = null;

-		IPluginEntry[] pluginEntries = localFeature.getPluginEntries();

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

-			String versionId = pluginEntries[i].getVersionedIdentifier().toString();

-			String pluginID = Site.DEFAULT_PLUGIN_PATH + versionId + FeaturePackagedContentProvider.JAR_EXTENSION;

-			archive = archiveFactory.createArchiveReferenceModel();

-			archive.setPath(pluginID);

-			try {

-				URL url = new URL(getSite().getURL(), Site.DEFAULT_PLUGIN_PATH + versionId + File.separator);

-				archive.setURLString(url.toExternalForm());

-				archive.resolve(url, null);

-				((SiteFile) getSite()).addArchiveReferenceModel(archive);

-			} catch (MalformedURLException e) {

-	

-				String urlString = (getSite().getURL() != null) ? getSite().getURL().toExternalForm() : "";	//$NON-NLS-1$

-				urlString += Site.DEFAULT_PLUGIN_PATH + pluginEntries[i].toString();

-				throw Utilities.newCoreException(Policy.bind("SiteFile.UnableToCreateURL", urlString), e);	//$NON-NLS-1$

-			}

-		}

-		return;

-	}

-

-	/*

-	 * Adds a SiteFilePluginContentConsumer to the list

-	 */

-	private void addContentConsumers(ContentConsumer cons) {

-		if (contentConsumers == null)

-			contentConsumers = new ArrayList();

-		contentConsumers.add(cons);

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
deleted file mode 100644
index 3b4ee22..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
+++ /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

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

-package org.eclipse.update.internal.core;

-import java.net.*;

-

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

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

-

-/**

- * Site on the File System

- */

-public class SiteFileContentProvider extends SiteContentProvider {

-	

-	public static final String SITE_TYPE = "org.eclipse.update.core.file";	 //$NON-NLS-1$

-

-	/**

-	 * Constructor for FileSite

-	 */

-	public SiteFileContentProvider(URL url) {

-		super(url);

-	}

-

-			

-	/*

-	 * @see ISiteContentProvider#getArchiveReference(String)

-	 */

-	public URL getArchiveReference(String archiveId)  throws CoreException {

-		URL contentURL = null;

-		

-		contentURL = getArchiveURLfor(archiveId);

-		// if there is no mapping in the site.xml

-		// for this archiveId, use the default one

-		if (contentURL==null) {

-			return super.getArchiveReference(archiveId);

-		}

-		

-		return contentURL;

-	}

-

-	/**

-	 * return the URL associated with the id of the archive for this site

-	 * return null if the archiveId is null, empty or 

-	 * if teh list of archives on the site is null or empty

-	 * of if there is no URL associated with the archiveID for this site

-	 */

-	private URL getArchiveURLfor(String archiveId) {

-		URL result = null;

-		boolean found = false;

-

-		IArchiveReference[] siteArchives = getSite().getArchives();

-		if (siteArchives.length > 0) {

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

-				if (archiveId.trim().equalsIgnoreCase(siteArchives[i].getPath())) {

-					result = siteArchives[i].getURL();

-					found = true;

-					break;

-				}

-			}

-		}

-		return result;

-	}

-}

-

-


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
deleted file mode 100644
index 6be1b9c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
+++ /dev/null

@@ -1,387 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-

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

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

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

-import org.eclipse.update.internal.model.*;

-import org.xml.sax.*;

-

-public class SiteFileFactory extends BaseSiteFactory {

-

-	// private when parsing file system

-	private SiteFile site;

-

-

-	/*

-	 * @see ISiteFactory#createSite(URL,boolean)

-	 */

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

-	

-		Site site = null;

-		InputStream siteStream = null;

-		SiteModelFactory factory = this;

-	

-		try {

-			// if url points to a directory

-			// attempt to parse site.xml

-			String path = url.getFile();

-			File siteLocation = new File(path);

-			if (siteLocation.isDirectory()) {

-				url = siteLocation.toURL();

-				File siteXMLFile = new File(siteLocation, Site.SITE_XML);

-				if (siteXMLFile.exists()) {

-					siteStream = new FileInputStream(siteXMLFile);

-					site = (Site) factory.parseSite(siteStream);

-				} else {

-					// parse siteLocation

-					site = parseSite(siteLocation);

-				}

-			} else {

-				// we are not pointing to a directory

-				// attempt to parse the file

-				try {

-					URL resolvedURL = URLEncoder.encode(url);

-					siteStream = openStream(resolvedURL);

-					site = (Site) factory.parseSite(siteStream);

-				} catch (IOException e) {

-	

-					// attempt to parse parent directory

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

-					File parentDirectory = file.getParentFile();

-	

-					// do not create directory if it doesn't exist	[18318]

-					// instead hrow error					

-					if (parentDirectory != null && !parentDirectory.exists())

-						throw Utilities.newCoreException(Policy.bind("SiteFileFactory.DirectoryDoesNotExist", file.getAbsolutePath()), null);	//$NON-NLS-1$

-	

-					if (parentDirectory == null || !parentDirectory.isDirectory())

-						throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToObtainParentDirectory", file.getAbsolutePath()), null);	//$NON-NLS-1$

-	

-					site = parseSite(parentDirectory);

-	

-				}

-			}

-	

-			SiteContentProvider contentProvider = new SiteFileContentProvider(url);

-			site.setSiteContentProvider(contentProvider);

-			contentProvider.setSite(site);

-			site.resolve(url, url);

-	

-			// Do not set read only as may install in it

-			//site.markReadOnly();

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURL", url == null ? "" : url.toExternalForm()), e);	//$NON-NLS-1$ //$NON-NLS-2$

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToAccessSite"),ISite.SITE_ACCESS_EXCEPTION, e);//$NON-NLS-1$

-		} finally {

-			try {

-				if (siteStream != null)

-					siteStream.close();

-			} catch (IOException e) {

-			}

-		}

-		return site;

-	}

-	/**

-	 * Method parseSite.

-	 */

-	private Site parseSite(File directory) throws CoreException {

-

-		this.site = (SiteFile) createSiteMapModel();

-

-		if (!directory.exists())

-			throw Utilities.newCoreException(Policy.bind("SiteFileFactory.FileDoesNotExist", directory.getAbsolutePath()), null);//$NON-NLS-1$

-

-		File pluginPath = new File(directory, Site.DEFAULT_PLUGIN_PATH);

-

-		//PACKAGED

-		parsePackagedFeature(directory); // in case it contains JAR files

-

-		parsePackagedPlugins(pluginPath);

-

-		// INSTALLED	

-		parseInstalledFeature(directory);

-

-		parseInstalledPlugins(pluginPath);

-

-		return site;

-

-	}

-

-	/**

-	 * Method parseFeature.

-	 * @throws CoreException

-	 */

-	private void parseInstalledFeature(File directory) throws CoreException {

-

-		File featureDir = new File(directory, Site.DEFAULT_INSTALLED_FEATURE_PATH);

-		if (featureDir.exists()) {

-			String[] dir;

-			SiteFeatureReferenceModel featureRef;

-			URL featureURL;

-			File currentFeatureDir;

-			String newFilePath = null;

-

-			try {

-				// handle the installed featuresConfigured under featuresConfigured subdirectory

-				dir = featureDir.list();

-				for (int index = 0; index < dir.length; index++) {

-

-					// the URL must ends with '/' for the bundle to be resolved

-					newFilePath = dir[index] + (dir[index].endsWith("/") ? "/" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-					currentFeatureDir = new File(featureDir, newFilePath);

-					// check if feature.xml exists

-					File featureXMLFile = new File(currentFeatureDir, Feature.FEATURE_XML);

-					if (!featureXMLFile.exists()) {

-						UpdateCore.warn("Unable to find feature.xml in directory:" + currentFeatureDir); //$NON-NLS-1$

-					} else {

-						// PERF: remove code

-						//SiteFileFactory archiveFactory = new SiteFileFactory();

-						featureURL = currentFeatureDir.toURL();

-						featureRef = createFeatureReferenceModel();

-						featureRef.setSiteModel(site);

-						featureRef.setURLString(featureURL.toExternalForm());

-						featureRef.setType(ISite.DEFAULT_INSTALLED_FEATURE_TYPE);

-						((Site) site).addFeatureReferenceModel(featureRef);

-					}

-				}

-			} catch (MalformedURLException e) {

-				throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURLForFile", newFilePath), e);	//$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	* Method parseFeature.

-	* @throws CoreException

-	*/

-	private void parsePackagedFeature(File directory) throws CoreException {

-

-		// FEATURES

-		File featureDir = new File(directory, Site.DEFAULT_FEATURE_PATH);

-		if (featureDir.exists()) {

-			String[] dir;

-			SiteFeatureReferenceModel featureRef;

-			URL featureURL;

-			File currentFeatureFile;

-			String newFilePath = null;

-

-			try {

-				// only list JAR files

-				dir = featureDir.list(FeaturePackagedContentProvider.filter);

-				for (int index = 0; index < dir.length; index++) {

-

-					// check if the JAR file contains a feature.xml

-					currentFeatureFile = new File(featureDir, dir[index]);

-					JarContentReference ref = new JarContentReference("", currentFeatureFile); //$NON-NLS-1$

-					ContentReference result = null;

-					try {

-						result = ref.peek(Feature.FEATURE_XML, null, null);

-					} catch (IOException e) {

-						UpdateCore.warn("Exception retrieving feature.xml in file:" + currentFeatureFile, e); //$NON-NLS-1$

-					}

-					if (result == null) {

-						UpdateCore.warn("Unable to find feature.xml in file:" + currentFeatureFile); //$NON-NLS-1$

-					} else {

-						featureURL = currentFeatureFile.toURL();

-						// PERF: remove code

-						//SiteFileFactory archiveFactory = new SiteFileFactory();

-						featureRef = createFeatureReferenceModel();

-						featureRef.setSiteModel(site);

-						featureRef.setURLString(featureURL.toExternalForm());

-						featureRef.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);

-						site.addFeatureReferenceModel(featureRef);

-					}

-				}

-			} catch (MalformedURLException e) {

-				throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURLForFile", newFilePath), e);	//$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * Method parsePlugins.

-	 * 

-	 * look into each plugin/fragment directory, crack the plugin.xml open (or

-	 * fragment.xml ???) get id and version, calculate URL...

-	 * 

-	 * @throws CoreException

-	 */

-	private void parseInstalledPlugins(File pluginsDir) throws CoreException {

-		if (!pluginsDir.exists() || !pluginsDir.isDirectory()) {

-			return;

-		}

-		File[] dirs = pluginsDir.listFiles(new FileFilter() {

-			public boolean accept(File f) {

-				return f.isDirectory();

-			}

-		});

-		DefaultPluginParser parser = new DefaultPluginParser();

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

-			File pluginFile = new File(dirs[i], "META-INF/MANIFEST.MF"); //$NON-NLS-1$

-			InputStream in = null;

-			try {

-				BundleManifest bundleManifest = new BundleManifest(pluginFile);

-				if (bundleManifest.exists()) {

-					PluginEntry entry = bundleManifest.getPluginEntry();

-					addParsedPlugin(entry, dirs[i]);

-				} else {

-					if (!(pluginFile = new File(dirs[i], "plugin.xml")) //$NON-NLS-1$

-							.exists()) { //$NON-NLS-1$

-						pluginFile = new File(dirs[i], "fragment.xml"); //$NON-NLS-1$

-					}

-					if (pluginFile != null && pluginFile.exists()

-							&& !pluginFile.isDirectory()) {

-						in = new FileInputStream(pluginFile);

-						PluginEntry entry = parser.parse(in);

-						addParsedPlugin(entry, dirs[i]);

-					}

-				}

-			} catch (IOException e) {

-				String pluginFileString = (pluginFile == null)

-						? null

-						: pluginFile.getAbsolutePath();

-				throw Utilities.newCoreException(Policy.bind(

-						"SiteFileFactory.ErrorAccessing", pluginFileString), e); //$NON-NLS-1$

-			} catch (SAXException e) {

-				String pluginFileString = (pluginFile == null)

-						? null

-						: pluginFile.getAbsolutePath();

-				throw Utilities.newCoreException(Policy.bind(

-						"SiteFileFactory.ErrorParsingFile", pluginFileString), //$NON-NLS-1$

-						e);

-			} finally {

-				if (in != null){

-					try{

-						in.close();

-					} catch(IOException e){

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * tranform each Plugin and Fragment into an ArchiveReferenceModel

-	 * and a PluginEntry for the Site	 

-	 */

-	// PERF: removed intermediate Plugin object

-	private void addParsedPlugin(PluginEntry entry,File file) throws CoreException {

-

-		String location = null;

-		try {

-			if (entry != null) {

-

-				// create the plugin Entry

-				((Site) site).addPluginEntry(entry);

-

-				// Create the Site mapping ArchiveRef->PluginEntry

-				// the id of the archiveRef is plugins\<pluginid>_<ver>.jar as per the specs

-				// PERF: remove code

-				//SiteFileFactory archiveFactory = new SiteFileFactory();				

-				ArchiveReferenceModel archive = createArchiveReferenceModel();

-				String id = (entry.getVersionedIdentifier().toString());

-				String pluginID = Site.DEFAULT_PLUGIN_PATH + id + FeaturePackagedContentProvider.JAR_EXTENSION;

-				archive.setPath(pluginID);

-				location = file.toURL().toExternalForm();

-				archive.setURLString(location);

-				((Site) site).addArchiveReferenceModel(archive);

-

-				// TRACE				

-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

-					UpdateCore.debug("Added archive to site:" + pluginID + " pointing to: " + location); //$NON-NLS-1$ //$NON-NLS-2$

-				}

-			}

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURLForFile", location), e);	//$NON-NLS-1$

-		}

-	}

-

-	/**

-	 *  

-	 */

-	private void parsePackagedPlugins(File pluginDir) throws CoreException {

-		if (!pluginDir.exists()) {

-			return;

-		}

-		String[] dir = pluginDir.list(FeaturePackagedContentProvider.filter);

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

-			ContentReference ref = null;

-			String refString = null;

-			InputStream in = null;

-			try {

-				File file = new File(pluginDir, dir[i]);

-				JarContentReference jarReference = new JarContentReference(

-						null, file);

-				ref = jarReference.peek("META-INF/MANIFEST.MF", null, null); //$NON-NLS-1$

-				if (ref != null) {

-					in = ref.getInputStream();

-					BundleManifest manifest = new BundleManifest(in);

-					if (manifest.exists()) {

-						addParsedPlugin(manifest.getPluginEntry(), file);

-						continue;

-					}

-				}

-				ref = jarReference.peek("plugin.xml", null, null); //$NON-NLS-1$

-				if (ref == null) {

-					ref = jarReference.peek("fragment.xml", null, null); //$NON-NLS-1$

-				}

-				if (ref != null) {

-					in = ref.getInputStream();

-					PluginEntry entry = new DefaultPluginParser().parse(in);

-					addParsedPlugin(entry, file);

-				}

-			} catch (IOException e) {

-				try {

-					refString = (ref == null) ? null : ref.asURL()

-							.toExternalForm();

-				} catch (IOException ioe) {

-				}

-				throw Utilities.newCoreException(Policy.bind(

-						"SiteFileFactory.ErrorAccessing", refString), e);//$NON-NLS-1$

-			} catch (SAXException e) {

-				try {

-					refString = (ref == null) ? null : ref.asURL()

-							.toExternalForm();

-				} catch (IOException ioe) {

-				}

-				throw Utilities.newCoreException(Policy.bind(

-						"SiteFileFactory.ErrorParsingFile", refString), e); //$NON-NLS-1$

-			} finally {

-				if(in != null){

-					try{

-						in.close();

-					}catch(IOException ce){

-					}

-				}

-			}

-		}

-	}

-

-	/*

-	 * @see SiteModelFactory#createSiteMapModel()

-	 */

-	public SiteModel createSiteMapModel() {

-		return new SiteFile();

-	}

-

-	/*

-	 * @see SiteModelFactory#canParseSiteType(String)

-	 */

-	public boolean canParseSiteType(String type) {

-		return (super.canParseSiteType(type) || SiteFileContentProvider.SITE_TYPE.equalsIgnoreCase(type));

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
deleted file mode 100644
index 0b165ff..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.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.update.internal.core;

-import java.io.*;

-

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

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

-

-/**

- * Plugin Content Consumer on a Site

- */

-public class SiteFileNonPluginContentConsumer extends ContentConsumer {

-

-	private String path;

-	private boolean closed = false;

-

-	/*

-	 * Constructor 

-	 */

-	public SiteFileNonPluginContentConsumer(String featurePath) {

-		this.path = featurePath;

-	}

-

-	/*

-	 * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {

-

-		if (closed) {

-			UpdateCore.warn("Attempt to store in a closed SiteFileNonPluginContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-

-		InputStream inStream = null;

-		String featurePath = path;

-		String contentKey = contentReference.getIdentifier();

-		featurePath += contentKey;

-		try {

-			inStream = contentReference.getInputStream();

-			UpdateManagerUtils.copyToLocal(inStream, featurePath, null);

-			UpdateManagerUtils.checkPermissions(contentReference, featurePath); // 20305

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("GlobalConsumer.ErrorCreatingFile", featurePath), e); //$NON-NLS-1$

-		} finally {

-			if (inStream != null) {

-				try {

-					// close stream

-					inStream.close();

-				} catch (IOException e) {

-				}

-			}

-		}

-

-	}

-

-	/*

-	 * @see ISiteContentConsumer#close()

-	 */

-	public void close() {

-		if (closed) {

-			UpdateCore.warn("Attempt to close a closed SiteFileNonPluginContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-		closed = true;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePackedPluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePackedPluginContentConsumer.java
deleted file mode 100644
index fb3de3d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePackedPluginContentConsumer.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Plugin Content Consumer on a Site
- * for a plugin that will run from a jar
- */
-public class SiteFilePackedPluginContentConsumer extends ContentConsumer {
-
-	private IPluginEntry pluginEntry;
-	private ISite site;
-	private boolean closed = false;
-	private String jarPath;
-	private String tempPath;
-
-	/*
-	 * Constructor
-	 */
-	public SiteFilePackedPluginContentConsumer(IPluginEntry pluginEntry, ISite site) {
-		this.pluginEntry = pluginEntry;
-		this.site = site;
-	}
-
-	/*
-	 * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)
-	 */
-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
-		InputStream inStream = null;
-
-		if (closed) {
-			UpdateCore.warn("Attempt to store in a closed SiteFilePluginContentConsumer", new Exception()); //$NON-NLS-1$
-			return;
-		}
-
-		try {
-			URL newURL = new URL(site.getURL(), Site.DEFAULT_PLUGIN_PATH + pluginEntry.getVersionedIdentifier().toString() + ".jar"); //$NON-NLS-1$
-			inStream = contentReference.getInputStream();
-			jarPath = newURL.getFile().replace(File.separatorChar, '/');
-			File jarFile = new File(jarPath);
-			if (jarFile.exists()) {
-				throw Utilities.newCoreException(Policy.bind("UpdateManagerUtils.FileAlreadyExists", new Object[] { jarFile }), null); //$NON-NLS-1$
-			}
-			// error recovery
-			tempPath= ErrorRecoveryLog.getLocalRandomIdentifier(jarPath+".tmp"); //$NON-NLS-1$
-				ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.BUNDLE_JAR_ENTRY, tempPath);
-			//
-			UpdateManagerUtils.copyToLocal(inStream, tempPath, null);
-		} catch (IOException e) {
-			throw Utilities.newCoreException(Policy.bind("GlobalConsumer.ErrorCreatingFile", tempPath), e); //$NON-NLS-1$
-		} finally {
-			if (inStream != null) {
-				try {
-					// close stream
-					inStream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	/*
-	 * @see ISiteContentConsumer#close() 
-	 */
-	public void close() throws CoreException {
-
-		if (closed) {
-			UpdateCore.warn("Attempt to close a closed SiteFilePluginContentConsumer", new Exception()); //$NON-NLS-1$
-			return;
-		}
-
-		if (tempPath != null) {
-			// rename file 
-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.RENAME_ENTRY, tempPath);
-			File fileToRename = new File(tempPath);
-			boolean sucess = false;
-			if (fileToRename.exists()) {
-				File renamedFile = new File(jarPath);
-				sucess = fileToRename.renameTo(renamedFile);
-			}
-			if (!sucess) {
-				String msg = Policy.bind("ContentConsumer.UnableToRename", tempPath, jarPath); //$NON-NLS-1$
-				throw Utilities.newCoreException(msg, new Exception(msg));
-			}
-		}
-
-		if (site instanceof SiteFile)
-			 ((SiteFile) site).addPluginEntry(pluginEntry);
-		closed = true;
-	}
-
-	/*
-	 * 
-	 */
-	public void abort() throws CoreException {
-
-		if (closed) {
-			UpdateCore.warn("Attempt to abort a closed SiteFilePluginContentConsumer", new Exception()); //$NON-NLS-1$
-			return;
-		}
-
-		boolean sucess = true;
-
-		// delete plugin.jar
-		if (jarPath != null) {
-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.DELETE_ENTRY, jarPath);
-			File fileToRemove = new File(jarPath);
-
-			if (fileToRemove.exists()) {
-				sucess = fileToRemove.delete();
-			}
-		}
-
-		if (!sucess) {
-			String msg = Policy.bind("Unable to delete", jarPath); //$NON-NLS-1$
-			UpdateCore.log(msg, null);
-		}
-		closed = true;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
deleted file mode 100644
index 282f53b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

-

-/**

- * Plugin Content Consumer on a Site

- */

-public class SiteFilePluginContentConsumer extends ContentConsumer {

-

-	private IPluginEntry pluginEntry;

-	private ISite site;

-	private boolean closed = false;

-

-	// recovery

-	// temporary name to original name map

-	private Map renames = new HashMap(2);

-

-	// for abort

-	private List /*of path as String */

-	installedFiles;

-

-	/*

-	 * Constructor

-	 */

-	public SiteFilePluginContentConsumer(IPluginEntry pluginEntry, ISite site) {

-		this.pluginEntry = pluginEntry;

-		this.site = site;

-		installedFiles = new ArrayList();

-	}

-

-	/*

-	 * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)

-	 */

-	public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {

-		InputStream inStream = null;

-		String pluginPath = null;

-

-		if (closed) {

-			UpdateCore.warn("Attempt to store in a closed SiteFilePluginContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-

-		try {

-			URL newURL = new URL(site.getURL(), Site.DEFAULT_PLUGIN_PATH + pluginEntry.getVersionedIdentifier().toString());

-			pluginPath = newURL.getFile(); 

-			String contentKey = contentReference.getIdentifier();

-			inStream = contentReference.getInputStream();

-			pluginPath += pluginPath.endsWith(File.separator) ? contentKey : File.separator + contentKey;

-

-			// error recovery

-			String logEntry=null;

-			if ("plugin.xml".equals(contentKey)) { //$NON-NLS-1$

-				logEntry=ErrorRecoveryLog.PLUGIN_ENTRY;

-			} else if ("fragment.xml".equals(contentKey)) { //$NON-NLS-1$

-				logEntry=ErrorRecoveryLog.FRAGMENT_ENTRY;

-			} else if ("META-INF/MANIFEST.MF".equals(contentKey)) { //$NON-NLS-1$

-				logEntry=ErrorRecoveryLog.BUNDLE_MANIFEST_ENTRY;

-			}

-			if (logEntry!=null) {

-				String originalName = pluginPath.replace(File.separatorChar, '/');

-				File localFile = new File(originalName);

-				if (localFile.exists()) {

-					throw Utilities.newCoreException(Policy.bind("UpdateManagerUtils.FileAlreadyExists", new Object[] { localFile }), null); //$NON-NLS-1$

-				}

-				pluginPath = ErrorRecoveryLog.getLocalRandomIdentifier(pluginPath);

-				renames.put(pluginPath, originalName);

-				ErrorRecoveryLog.getLog().appendPath(logEntry, pluginPath);

-			}

-			//

-			UpdateManagerUtils.copyToLocal(inStream, pluginPath, null);

-			UpdateManagerUtils.checkPermissions(contentReference, pluginPath); // 20305

-			installedFiles.add(pluginPath);

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("GlobalConsumer.ErrorCreatingFile", pluginPath), e);//$NON-NLS-1$

-		} finally {

-			if (inStream != null) {

-				try {

-					// close stream

-					inStream.close();

-				} catch (IOException e) {

-				}

-			}

-		}

-	}

-

-	/*

-	 * @see ISiteContentConsumer#close() 

-	 */

-	public void close() throws CoreException {

-

-		if (closed) {

-			UpdateCore.warn("Attempt to close a closed SiteFilePluginContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-

-		for(Iterator it = renames.entrySet().iterator(); it.hasNext();){

-			// rename file 

-			Map.Entry entry = (Map.Entry)it.next();

-			String temporary = (String) entry.getKey();

-			String original = (String) entry.getValue();

-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.RENAME_ENTRY, temporary);

-			File fileToRename = new File(temporary);

-			boolean sucess = false;

-			if (fileToRename.exists()) {

-				File renamedFile = new File(original);

-				sucess = fileToRename.renameTo(renamedFile);

-			}

-			if (!sucess) {

-				String msg = Policy.bind("ContentConsumer.UnableToRename", temporary, original); //$NON-NLS-1$

-				throw Utilities.newCoreException(msg, new Exception(msg));

-			}

-		}

-

-		if (site instanceof SiteFile)

-			 ((SiteFile) site).addPluginEntry(pluginEntry);

-		closed = true;

-	}

-

-	/*

-	 * 

-	 */

-	public void abort() throws CoreException {

-

-		if (closed) {

-			UpdateCore.warn("Attempt to abort a closed SiteFilePluginContentConsumer", new Exception()); //$NON-NLS-1$

-			return;

-		}

-

-		boolean success = true;

-		// delete plugin manifests first

-		for(Iterator it = renames.values().iterator(); it.hasNext();){

-			String originalName = (String) it.next();

-

-			ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.DELETE_ENTRY, originalName);

-			File fileToRemove = new File(originalName);

-			if (fileToRemove.exists()) {

-				if(!fileToRemove.delete()){

-					String msg = Policy.bind("Unable to delete", originalName); //$NON-NLS-1$

-					UpdateCore.log(msg, null);	

-					success = false;

-				}

-			}

-		}

-

-		if (success) {

-			// remove the plugin files;

-			Iterator iter = installedFiles.iterator();

-			File featureFile = null;

-			while (iter.hasNext()) {

-				String path = (String) iter.next();

-				featureFile = new File(path);

-				UpdateManagerUtils.removeFromFileSystem(featureFile);

-			}

-

-			// remove the plugin directory if empty

-			try {

-				URL newURL = new URL(site.getURL(), Site.DEFAULT_PLUGIN_PATH + pluginEntry.getVersionedIdentifier().toString());

-				String pluginPath = newURL.getFile();

-				UpdateManagerUtils.removeEmptyDirectoriesFromFileSystem(new File(pluginPath));

-			} catch (MalformedURLException e) {

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

-			}

-		}

-		closed = true;

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
deleted file mode 100644
index ea7414e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
+++ /dev/null

@@ -1,495 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

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

-import org.eclipse.update.internal.model.*;

-

-/**

- * This class manages the configurations.

- */

-

-public class SiteLocal extends SiteLocalModel implements ILocalSite{

-

-	private ListenersList listeners = new ListenersList();

-	private SiteStatusAnalyzer siteStatusAnalyzer;

-	private boolean isTransient = false;

-

-	/*

-	 * Have new features been found during reconciliation

-	 */

-	public static boolean newFeaturesFound = false;

-

-	/*

-	 * initialize the configurations from the persistent model.

-	 * Set the reconciliation as non optimistic

-	 */

-	public static ILocalSite getLocalSite() throws CoreException {

-		return internalGetLocalSite();

-	}

-

-	/*

-	 *Internal call is reconciliation needs to be optimistic

-	 */

-	public static ILocalSite internalGetLocalSite() throws CoreException {

-	

-		SiteLocal localSite = new SiteLocal();

-	

-		// obtain platform configuration

-		IPlatformConfiguration currentPlatformConfiguration = ConfiguratorUtils.getCurrentPlatformConfiguration();

-		localSite.isTransient(currentPlatformConfiguration.isTransient());

-	

-		try {

-			URL configXML = currentPlatformConfiguration.getConfigurationLocation();

-			localSite.setLocationURLString(configXML.toExternalForm());

-			localSite.resolve(configXML, null);

-	

-			// Attempt to read previous state

-			parseLocalSiteFile(currentPlatformConfiguration, localSite);

-

-		} catch (MalformedURLException exception) {

-			throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToCreateURLFor", localSite.getLocationURLString() + " & " + CONFIG_FILE), exception); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	

-		return localSite;

-	}

-

-	/**

-	 * Create the localSite object

-	 */

-	private static boolean parseLocalSiteFile(IPlatformConfiguration platformConfig, SiteLocal localSite ) throws CoreException, MalformedURLException {

-

-		//attempt to parse the LocalSite.xml	

-//		URL resolvedURL = URLEncoder.encode(configXML);

-		try {

-//			InputStream in = UpdateCore.getPlugin().get(resolvedURL).getInputStream();

-			new SiteLocalParser(platformConfig, localSite);

-			return true;

-		} catch (Exception exception) {

-			return false;

-		}

-	}

-

-	/**

-	 * 

-	 */

-	private SiteLocal() {

-	}

-

-	/**

-	 * adds a new configuration to the LocalSite

-	 *  the newly added configuration is teh current one

-	 */

-	public void addConfiguration(IInstallConfiguration config) {

-		if (config != null) {

-			addConfigurationModel((InstallConfigurationModel) config);

-

-			trimHistoryToCapacity();

-

-			// set configuration as current		

-			if (getCurrentConfigurationModel() != null)

-				getCurrentConfigurationModel().setCurrent(false);

-			if (config instanceof InstallConfiguration)

-				 ((InstallConfiguration) config).setCurrent(true);

-

-			setCurrentConfigurationModel((InstallConfigurationModel) config);

-			((InstallConfigurationModel) config).markReadOnly();

-

-			// notify listeners

-			Object[] siteLocalListeners = listeners.getListeners();

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

-				((ILocalSiteChangedListener) siteLocalListeners[i]).currentInstallConfigurationChanged(config);

-			}

-		}

-

-	}

-

-	/*

-	 * 

-	 */

-	private void trimHistoryToCapacity() {

-		// check if we have to remove a configuration

-		// the first added is #0

-		while (getConfigurationHistory().length > getMaximumHistoryCount() &&

-				getConfigurationHistory().length > 1) {

-			// do not remove the first element in history, this is the original config

-			InstallConfigurationModel removedConfig = getConfigurationHistoryModel()[1];

-			if (removeConfigurationModel(removedConfig)) {

-

-				// DEBUG:

-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION) {

-					UpdateCore.debug("Removed configuration :" + removedConfig.getLabel()); //$NON-NLS-1$

-				}

-

-				// notify listeners

-				Object[] siteLocalListeners = listeners.getListeners();

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

-					((ILocalSiteChangedListener) siteLocalListeners[i]).installConfigurationRemoved((IInstallConfiguration) removedConfig);

-				}

-

-				//remove files

-				URL url = removedConfig.getURL();

-				UpdateManagerUtils.removeFromFileSystem(new File(url.getFile()));

-			}

-		}

-	}

-	/*

-	 * @see ILocalSite#addLocalSiteChangedListener(ILocalSiteChangedListener)

-	 */

-	public void addLocalSiteChangedListener(ILocalSiteChangedListener listener) {

-		synchronized (listeners) {

-			listeners.add(listener);

-		}

-	}

-

-	/*

-	 * @see ILocalSite#removeLocalSiteChangedListener(ILocalSiteChangedListener)

-	 */

-	public void removeLocalSiteChangedListener(ILocalSiteChangedListener listener) {

-		synchronized (listeners) {

-			listeners.add(listener);

-		}

-	}

-

-	/**

-	 * Saves the site into the config file.

-	 * @return true if changes restart is needed

-	 */

-	public boolean save() throws CoreException {

-

-		// Save the current configuration as

-		// the other are already saved

-		// and set runtim info for next startup

-		return ((InstallConfiguration) getCurrentConfiguration()).save();

-	}

-	

-//	/**

-//	 * Method createNewInstallConfiguration.

-//	 * @return IInstallConfiguration

-//	 */

-//	private IInstallConfiguration createNewInstallConfiguration() throws CoreException {

-//		InstallConfiguration newInstallConfig = createConfigurationSite(null);

-//		newInstallConfig.setTimeline(newInstallConfig.getCreationDate().getTime());

-//		return newInstallConfig;

-//	}

-

-

-	/**

-	 * @since 2.0

-	 * @deprecated This method should not be used. The current install configuration is to be used.

-	 */

-	public IInstallConfiguration cloneCurrentConfiguration() throws CoreException {

-		try {

-			// This method should be deprecated

-//		return getCurrentConfiguration();

-			return new InstallConfiguration(getCurrentConfiguration());

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException("Clonning current configuration", e);

-		}

-	}

-

-	/**

-	 * @since 2.0

-	 */

-	public void revertTo(IInstallConfiguration configuration, IProgressMonitor monitor, IProblemHandler handler) throws CoreException {

-

-		// create the activity 

-		//Start UOW ?

-		ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_REVERT);

-		activity.setLabel(configuration.getLabel());

-		activity.setDate(new Date());

-		IInstallConfiguration newConfiguration = null;

-

-		try {

-			// create a configuration

-			newConfiguration = cloneCurrentConfiguration();

-			newConfiguration.setLabel(configuration.getLabel());

-

-			// add to the stack which will set up as current

-			addConfiguration(newConfiguration);

-

-			// process delta

-			// the Configured featuresConfigured are the same as the old configuration

-			// the unconfigured featuresConfigured are the rest...

-			 ((InstallConfiguration) newConfiguration).revertTo(configuration, monitor, handler);

-

-			// everything done ok

-			activity.setStatus(IActivity.STATUS_OK);

-		} catch (CoreException e) {

-			// error

-			activity.setStatus(IActivity.STATUS_NOK);

-			throw e;

-		} catch (InterruptedException e) {

-			//user decided not to revert, do nothing

-			// because we didn't add the configuration to the history

-		} finally {

-			if (newConfiguration != null)

-				 ((InstallConfiguration) newConfiguration).addActivity(activity);

-		}

-

-	}

-

-	/**

-	 * @since 2.0

-	 * @deprecated

-	 */

-	public IInstallConfiguration addToPreservedConfigurations(IInstallConfiguration configuration) throws CoreException {

-		return null;

-//		InstallConfiguration newConfiguration = null;

-//		if (configuration != null) {

-//

-//			// create new configuration based on the one to preserve

-//			String newFileName = UpdateManagerUtils.getLocalRandomIdentifier(CONFIG_FILE, new Date());

-//			try {

-//				URL newFile = UpdateManagerUtils.getURL(getLocationURL(), newFileName, null);

-//				// pass the date onto teh name

-//				Date currentDate = configuration.getCreationDate();

-//				String name = configuration.getLabel();

-//				newConfiguration = new InstallConfiguration(configuration, newFile, name);

-//				// set the same date in the installConfig

-//				newConfiguration.setCreationDate(currentDate);

-//				newConfiguration.setTimeline(configuration.getTimeline());

-//			} catch (MalformedURLException e) {

-//				throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToCreateURLFor") + newFileName, e);

-//				//$NON-NLS-1$

-//			}

-//

-//			// activity

-//			ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_ADD_PRESERVED);

-//			activity.setLabel(configuration.getLabel());

-//			activity.setDate(new Date());

-//			activity.setStatus(IActivity.STATUS_OK);

-//			((InstallConfiguration) newConfiguration).addActivity(activity);

-////			((InstallConfiguration) newConfiguration).saveConfigurationFile(isTransient());

-//

-//			// add to the list			

-//			addPreservedInstallConfigurationModel(newConfiguration);

-//		}

-//		return newConfiguration;

-	}

-

-	/*

-	 * @see ILocalSite#getPreservedConfigurationFor(IInstallConfiguration)

-	 */

-	public IInstallConfiguration findPreservedConfigurationFor(IInstallConfiguration configuration) {

-

-		// based on time stamp for now

-		InstallConfigurationModel preservedConfig = null;

-		if (configuration != null) {

-			InstallConfigurationModel[] preservedConfigurations = getPreservedConfigurationsModel();

-			if (preservedConfigurations != null) {

-				for (int indexPreserved = 0; indexPreserved < preservedConfigurations.length; indexPreserved++) {

-					if (configuration.getCreationDate().equals(preservedConfigurations[indexPreserved].getCreationDate())) {

-						preservedConfig = preservedConfigurations[indexPreserved];

-						break;

-					}

-				}

-			}

-		}

-

-		return (IInstallConfiguration) preservedConfig;

-	}

-

-	/*

-	 * @see ILocalSite#getCurrentConfiguration()

-	 * LocalSiteModel#getCurrentConfigurationModel() may return null if

-	 * we just parsed LocalSite.xml

-	 */

-	public IInstallConfiguration getCurrentConfiguration() {

-		if (getCurrentConfigurationModel() == null) {

-			int index = 0;

-			if ((index = getConfigurationHistoryModel().length) == 0) {

-				return null;

-			} else {

-				InstallConfigurationModel config = getConfigurationHistoryModel()[index - 1];

-				config.setCurrent(true);

-				setCurrentConfigurationModel(config);

-			}

-		}

-		return (IInstallConfiguration) getCurrentConfigurationModel();

-	}

-

-	/*

-	 * @see ILocalSite#getPreservedConfigurations()

-	 */

-	public IInstallConfiguration[] getPreservedConfigurations() {

-		if (getPreservedConfigurationsModel().length == 0)

-			return new IInstallConfiguration[0];

-		return (IInstallConfiguration[]) getPreservedConfigurationsModel();

-	}

-

-	/*

-	 * @see ILocalSite#removeFromPreservedConfigurations(IInstallConfiguration)

-	 */

-	public void removeFromPreservedConfigurations(IInstallConfiguration configuration) {

-		if (removePreservedConfigurationModel((InstallConfigurationModel) configuration))

-			 ((InstallConfiguration) configuration).remove();

-	}

-

-	/*

-	 * @see ILocalSite#getConfigurationHistory()

-	 */

-	public IInstallConfiguration[] getConfigurationHistory() {

-		if (getConfigurationHistoryModel().length == 0)

-			return new IInstallConfiguration[0];

-		return (IInstallConfiguration[]) getConfigurationHistoryModel();

-	}

-

-

-	/**

-	 * Gets the isTransient.

-	 * @return Returns a boolean

-	 */

-	public boolean isTransient() {

-		return isTransient;

-	}

-

-	/**

-	 * Sets the isTransient.

-	 * @param isTransient The isTransient to set

-	 */

-	private void isTransient(boolean isTransient) {

-		this.isTransient = isTransient;

-	}

-

-	/**

-	 * if we are unable to parse the SiteLocal.xml

-	 * we will attempt to parse the file system

-	 */

-//	private static void recoverSiteLocal(URL url, SiteLocal site) throws CoreException, MalformedURLException {

-//

-//		if (url == null)

-//			throw Utilities.newCoreException(Policy.bind("SiteLocal.SiteUrlIsNull"),

-//			//$NON-NLS-1$

-//			null);

-//

-//		// parse site information

-//		site.setLabel(url.toExternalForm());

-//

-//		//stamp

-//		long stamp = 0L;

-//		site.setStamp(stamp);

-//

-//		// retrieve XML files

-//		File localXml = new File(url.getFile());

-//		if (localXml.exists()) {

-//			try {

-//				UpdateManagerUtils.removeFromFileSystem(localXml);

-//				UpdateCore.warn("Removed bad LocalSite.xml file:" + localXml);

-//			} catch (Exception e) {

-//				UpdateCore.warn("Unable to remove bad LocalSite.xml file:" + localXml, e);

-//			}

-//		}

-//

-//		File dir = localXml.getParentFile();

-//		File[] configFiles = dir.listFiles(new FilenameFilter() {

-//			public boolean accept(File dir, String name) {

-//				return (name.startsWith(DEFAULT_CONFIG_PREFIX) && name.endsWith("xml"));

-//			}

-//		});

-//		if (configFiles == null)

-//			configFiles = new File[0];

-//

-//		File[] preservedFiles = dir.listFiles(new FilenameFilter() {

-//			public boolean accept(File dir, String name) {

-//				return (name.startsWith(DEFAULT_PRESERVED_CONFIG_PREFIX) && name.endsWith("xml"));

-//			}

-//		});

-//		if (preservedFiles == null)

-//			preservedFiles = new File[0];

-//

-//		// history

-//		int history = 0;

-//		if (configFiles.length > 0) {

-//			history = configFiles.length;

-//		}

-//

-//		if (SiteLocalModel.DEFAULT_HISTORY > history)

-//			history = SiteLocalModel.DEFAULT_HISTORY;

-//		site.setMaximumHistoryCount(history);

-//

-//		// parse configuration information

-//		List validConfig = new ArrayList();

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

-//			URL configURL = configFiles[i].toURL();

-//			InstallConfigurationModel config = new BaseSiteLocalFactory().createInstallConfigurationModel();

-//			String relativeURL = UpdateManagerUtils.getURLAsString(url, configURL);

-//			config.setLocationURLString(relativeURL);

-//			config.resolve(configURL, url);

-//			config.setLabel(Utilities.format(config.getCreationDate()));

-//			validConfig.add(config);

-//		}

-//

-//		// add the currentConfig last

-//		// based on creation date

-//		if (validConfig.size() > 0) {

-//			Iterator iter = validConfig.iterator();

-//			InstallConfigurationModel currentConfig = (InstallConfigurationModel) iter.next();

-//			while (iter.hasNext()) {

-//				InstallConfigurationModel element = (InstallConfigurationModel) iter.next();

-//				Date currentConfigDate = currentConfig.getCreationDate();

-//				Date elementDate = element.getCreationDate();

-//				if (elementDate != null && elementDate.after(currentConfigDate)) {

-//					site.addConfigurationModel(currentConfig);

-//					currentConfig = element;

-//				} else {

-//					site.addConfigurationModel(element);

-//				}

-//			}

-//			site.addConfigurationModel(currentConfig);

-//		}

-//

-//		// parse preserved configuration information

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

-//			URL configURL = preservedFiles[i].toURL();

-//			InstallConfigurationModel config = new BaseSiteLocalFactory().createInstallConfigurationModel();

-//			String relativeURL = UpdateManagerUtils.getURLAsString(url, configURL);

-//			config.setLocationURLString(relativeURL);

-//			config.resolve(configURL, url);

-//			config.setLabel(Utilities.format(config.getCreationDate()));

-//			site.addPreservedInstallConfigurationModel(config);

-//		}

-//	}

-

-	/*

-	 * 

-	 */

-	private SiteStatusAnalyzer getSiteStatusAnalyzer() {

-		if (siteStatusAnalyzer == null)

-			siteStatusAnalyzer = new SiteStatusAnalyzer(this);

-		return siteStatusAnalyzer;

-	}

-

-	/*

-	 *  check if the Plugins of the feature are on the plugin path

-	 *  If all the plugins are on the plugin path, and the version match and there is no other version -> HAPPY

-	 *  If all the plugins are on the plugin path, and the version match and there is other version -> AMBIGUOUS

-	 *  If some of the plugins are on the plugin path, but not all -> UNHAPPY

-	 * 	Check on all ConfiguredSites

-	 */

-	public IStatus getFeatureStatus(IFeature feature) throws CoreException {

-		return getSiteStatusAnalyzer().getFeatureStatus(feature);

-	}

-	/**

-	 * @see org.eclipse.update.internal.model.SiteLocalModel#setMaximumHistoryCount(int)

-	 */

-	public void setMaximumHistoryCount(int history) {

-		super.setMaximumHistoryCount(history);

-		trimHistoryToCapacity();

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
deleted file mode 100644
index 30edeb0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
+++ /dev/null

@@ -1,462 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.configurator.*;
-
-/**
- * This class manages the reconciliation.
- */
-
-public class SiteReconciler extends ModelObject {
-
-	/**
-	 * 
-	 */
-	public SiteReconciler(SiteLocal siteLocal) {
-//		this.siteLocal = siteLocal;
-	}
-
-
-	/**
-	* 
-	*/
-	/*package */
-	URL resolveSiteEntry(IPlatformConfiguration.ISiteEntry newSiteEntry) throws CoreException {
-		URL resolvedURL = null;
-		try {
-			resolvedURL = Platform.resolve(newSiteEntry.getURL());
-		} catch (IOException e) {
-			throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToResolve", newSiteEntry.getURL().toExternalForm()), e);	//$NON-NLS-1$
-		}
-		return resolvedURL;
-	}
-
-
-	/**
-	 * Validate we have only one configured feature of a specific id
-	 * per configured site
-	 */
-	public static void checkConfiguredFeaturesOld(IConfiguredSite configuredSite) throws CoreException {
-
-		// NOT USED
-
-		ConfiguredSite cSite = (ConfiguredSite) configuredSite;
-		IFeatureReference[] configuredFeatures = cSite.getConfiguredFeatures();
-		ConfigurationPolicy cPolicy = cSite.getConfigurationPolicy();
-
-		// TRACE
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-			UpdateCore.debug("Compare features within :" + configuredSite.getSite().getURL()); //$NON-NLS-1$
-		}
-
-		for (int indexConfiguredFeatures = 0; indexConfiguredFeatures < configuredFeatures.length - 1; indexConfiguredFeatures++) {
-
-			IFeatureReference featureToCompare = configuredFeatures[indexConfiguredFeatures];
-
-			// within the configured site
-			// compare with the other configured features of this site
-			for (int restOfConfiguredFeatures = indexConfiguredFeatures + 1; restOfConfiguredFeatures < configuredFeatures.length; restOfConfiguredFeatures++) {
-				int result = compare(featureToCompare, configuredFeatures[restOfConfiguredFeatures]);
-				if (result != 0) {
-					if (result == 1) {
-						cPolicy.unconfigure(configuredFeatures[restOfConfiguredFeatures], true, false);
-					}
-					if (result == 2) {
-						cPolicy.unconfigure(featureToCompare, true, false);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * compare two feature references
-	 * returns 0 if the feature are different
-	 * returns 1 if the version of feature 1 is greater than the version of feature 2
-	 * returns 2 if opposite
-	 */
-	private static int compare(IFeatureReference featureRef1, IFeatureReference featureRef2) throws CoreException {
-
-		// TRACE
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-			UpdateCore.debug("Compare: " + featureRef1 + " && " + featureRef2); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		if (featureRef1 == null)
-			return 0;
-
-		IFeature feature1 = null;
-		IFeature feature2 = null;
-		try {
-			feature1 = featureRef1.getFeature(null);
-			feature2 = featureRef2.getFeature(null);
-		} catch (CoreException e) {
-			UpdateCore.warn(null, e);
-			return 0;
-		}
-
-		if (feature1 == null || feature2 == null) {
-			return 0;
-		}
-
-		VersionedIdentifier id1 = feature1.getVersionedIdentifier();
-		VersionedIdentifier id2 = feature2.getVersionedIdentifier();
-
-		if (id1 == null || id2 == null) {
-			return 0;
-		}
-
-		if (id1.getIdentifier() != null && id1.getIdentifier().equals(id2.getIdentifier())) {
-			PluginVersionIdentifier version1 = id1.getVersion();
-			PluginVersionIdentifier version2 = id2.getVersion();
-			if (version1 != null) {
-				if (version1.isGreaterThan(version2)) {
-					return 1;
-				} else {
-					return 2;
-				}
-			} else {
-				return 2;
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 * Validate the list of configured features eliminating extra
-	 * entries (if possible). Make sure we do not leave configured
-	 * nested features with "holes" (ie. unconfigured children)
-	 */
-	public static void checkConfiguredFeatures(IConfiguredSite configuredSite) {
-
-		// Note: if we hit errors in the various computation
-		// methods and throw a CoreException, we will not catch it
-		// in this method. Consequently we will not attempt to
-		// unconfigure any "extra" features because we would 
-		// likely get it wrong. The platform will run with extra features
-		// configured. The runtime will eliminate extra plugins based
-		// on runtime binding rules.
-
-		// determine "proposed" list of configured features
-		ConfiguredSite cSite = (ConfiguredSite) configuredSite;
-		// debug
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-			UpdateCore.debug("Validate configuration of site " + cSite.getSite().getURL()); //$NON-NLS-1$
-		}
-		IFeatureReference[] configuredRefs = cSite.getConfiguredFeatures();
-		ArrayList allPossibleConfiguredFeatures = new ArrayList();
-		for (int i = 0; i < configuredRefs.length; i++) {
-			try {
-				IFeature feature = configuredRefs[i].getFeature(null);
-				allPossibleConfiguredFeatures.add(feature);
-				// debug
-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-					UpdateCore.debug("   configured feature " + feature.getVersionedIdentifier().toString()); //$NON-NLS-1$
-				}
-			} catch (CoreException e) {
-				UpdateCore.warn("", e); //$NON-NLS-1$
-			}
-		}
-
-		// find top level features
-		ArrayList topFeatures = computeTopFeatures(allPossibleConfiguredFeatures);
-
-		// find non efix top level features
-		ArrayList topNonEfixFeatures = getNonEfixFeatures(topFeatures);
-
-		// expand non efix top level features (compute full nesting structures).
-		ArrayList configuredFeatures = expandFeatures(topNonEfixFeatures, configuredSite);
-
-		// retrieve efixes that patch enable feature
-		// they must be kept enabled
-		if (topFeatures.size() != topNonEfixFeatures.size()) {
-			Map patches = getPatchesAsFeature(allPossibleConfiguredFeatures);
-			if (!patches.isEmpty()) {
-				// calculate efixes to enable
-				List efixesToEnable = getPatchesToEnable(patches, configuredFeatures);
-				// add efies to keep enable
-				//add them to the enable list
-				for (Iterator iter = efixesToEnable.iterator(); iter.hasNext();) {
-					IFeature element = (IFeature) iter.next();
-					ArrayList expandedEfix = new ArrayList();
-					expandEfixFeature(element, expandedEfix, configuredSite);
-					configuredFeatures.addAll(expandedEfix);
-				}
-			}
-		}
-
-		// compute extra features
-		ArrayList extras = diff(allPossibleConfiguredFeatures, configuredFeatures);
-
-		// unconfigure extra features
-		ConfigurationPolicy cPolicy = cSite.getConfigurationPolicy();
-		for (int i = 0; i < extras.size(); i++) {
-			IFeature feature = (IFeature) extras.get(i);
-			IFeatureReference ref = cSite.getSite().getFeatureReference(feature);
-			try {
-				cPolicy.unconfigure(ref, true, false);
-				// debug
-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-					UpdateCore.debug("Unconfiguring \"extra\" feature " + feature.getVersionedIdentifier().toString()); //$NON-NLS-1$
-				}
-			} catch (CoreException e) {
-				UpdateCore.warn("", e); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/*
-	 *  
-	 */
-	private static ArrayList computeTopFeatures(ArrayList features) {
-		/* map of Feature by VersionedIdentifier */
-		Map topFeatures = new HashMap(features.size());
-		// start with the features passed in
-		for (Iterator it = features.iterator(); it.hasNext();) {
-			IFeature f = ((IFeature) it.next());
-			topFeatures.put(f.getVersionedIdentifier(), f);
-		}
-		// remove all features that nest in some other feature
-		for (Iterator it = features.iterator(); it.hasNext();) {
-			try {
-				IIncludedFeatureReference[] children = ((IFeature) it.next()).getIncludedFeatureReferences();
-				for (int j = 0; j < children.length; j++) {
-					try {
-						topFeatures.remove(children[j].getVersionedIdentifier());
-					} catch (CoreException e1) {
-						if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS)
-							UpdateCore.warn("", e1); //$NON-NLS-1$
-					}
-				}
-			} catch (CoreException e) {
-				UpdateCore.warn("", e); //$NON-NLS-1$
-			}
-		}
-		ArrayList list = new ArrayList();
-		list.addAll(topFeatures.values());
-		// debug
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-			UpdateCore.debug("Computed top-level features"); //$NON-NLS-1$
-			for (int i = 0; i < topFeatures.size(); i++) {
-				UpdateCore.debug("   " + ((IFeature) list.get(i)).getVersionedIdentifier().toString()); //$NON-NLS-1$
-			}
-		}
-		return list;
-	}
-
-	/*
-	 * 
-	 */
-	private static ArrayList expandFeatures(ArrayList features, IConfiguredSite configuredSite) {
-		ArrayList result = new ArrayList();
-
-		// expand all top level features
-		for (int i = 0; i < features.size(); i++) {
-			expandFeature((IFeature) features.get(i), result, configuredSite);
-		}
-
-		return result;
-	}
-
-	/*
-	 * 
-	 */
-	private static void expandFeature(IFeature feature, ArrayList features, IConfiguredSite configuredSite) {
-
-		// add feature
-		if (!features.contains(feature)) {
-			features.add(feature);
-			// debug
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-				UpdateCore.debug("Retaining configured feature " + feature.getVersionedIdentifier().toString()); //$NON-NLS-1$
-			}
-		}
-
-		// add nested children to the list
-		IIncludedFeatureReference[] children = null;
-		try {
-			children = feature.getIncludedFeatureReferences();
-		} catch (CoreException e) {
-			UpdateCore.warn("", e); //$NON-NLS-1$
-			return;
-		}
-
-		for (int j = 0; j < children.length; j++) {
-			IFeature child = null;
-			try {
-				child = children[j].getFeature(null);
-			} catch (CoreException e) {
-				if (!UpdateManagerUtils.isOptional(children[j]))
-					UpdateCore.warn("", e); //$NON-NLS-1$
-				// 25202 do not return right now, the peer children may be ok
-			}
-			if (child != null)
-				expandFeature(child, features, configuredSite);
-		}
-	}
-
-	/*
-	 * 
-	 */
-	private static ArrayList diff(ArrayList left, ArrayList right) {
-		ArrayList result = new ArrayList();
-
-		// determine difference (left "minus" right)
-		for (int i = 0; i < left.size(); i++) {
-			IFeature feature = (IFeature) left.get(i);
-			if (!right.contains(feature))
-				result.add(feature);
-		}
-		return result;
-	}
-
-	/*
-	 * get the list of enabled patches
-	 */
-	private static Map getPatchesAsFeature(ArrayList allConfiguredFeatures) {
-		// get all efixes and the associated patched features
-		Map patches = new HashMap();
-		if (allConfiguredFeatures != null) {
-			Iterator iter = allConfiguredFeatures.iterator();
-			while (iter.hasNext()) {
-				List patchedFeaturesID = new ArrayList();
-				IFeature element = (IFeature) iter.next();
-				// add the patched feature identifiers
-				for (int i = 0; i < element.getImports().length; i++) {
-					if (element.getImports()[i].isPatch()) {
-						VersionedIdentifier id = element.getImports()[i].getVersionedIdentifier();
-						if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER)
-							UpdateCore.debug("Found patch " + element + " for feature identifier " + id); //$NON-NLS-1$ //$NON-NLS-2$
-						patchedFeaturesID.add(id);
-					}
-				}
-
-				if (!patchedFeaturesID.isEmpty()) {
-					patches.put(element, patchedFeaturesID);
-				}
-			}
-		}
-
-		return patches;
-	}
-
-	/*
-	 * retruns the list of pathes-feature who patch enabled features
-	 */
-	private static List getPatchesToEnable(Map efixes, ArrayList configuredFeatures) {
-
-		ArrayList enabledVersionedIdentifier = new ArrayList();
-		Iterator iter = configuredFeatures.iterator();
-		while (iter.hasNext()) {
-			IFeature element = (IFeature) iter.next();
-			enabledVersionedIdentifier.add(element.getVersionedIdentifier());
-		}
-
-		// loop through the patches
-		List result = new ArrayList();
-		iter = efixes.keySet().iterator();
-		while (iter.hasNext()) {
-			boolean toEnable = false;
-			IFeature efixFeature = (IFeature) iter.next();
-			List patchedFeatures = (List) efixes.get(efixFeature);
-			// loop through the 'patched features identifier' the for this patch
-			// see if it the patch patches at least one enable feature
-			Iterator patchedFeaturesIter = patchedFeatures.iterator();
-			while (patchedFeaturesIter.hasNext() && !toEnable) {
-				VersionedIdentifier patchedFeatureID = (VersionedIdentifier) patchedFeaturesIter.next();
-				if (enabledVersionedIdentifier.contains(patchedFeatureID)) {
-					toEnable = true;
-				}
-			}
-
-			if (!toEnable) {
-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER)
-				UpdateCore.debug("The Patch " + efixFeature + " does not patch any enabled features: it will be disabled"); //$NON-NLS-1$ //$NON-NLS-2$
-			} else {
-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER)
-					UpdateCore.debug("The patch " + efixFeature + " will be enabled."); //$NON-NLS-1$ //$NON-NLS-2$
-				result.add(efixFeature);
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * returns the feature that are not patches
-	 */
-	private static ArrayList getNonEfixFeatures(ArrayList topFeatures) {
-		Map efixFeatures = getPatchesAsFeature(topFeatures);
-		Set keySet = efixFeatures.keySet();
-		if (keySet == null || keySet.isEmpty())
-			return topFeatures;
-
-		Iterator iter = topFeatures.iterator();
-		ArrayList result = new ArrayList();
-		while (iter.hasNext()) {
-			IFeature element = (IFeature) iter.next();
-			if (!keySet.contains(element)) {
-				result.add(element);
-			}
-		}
-		return result;
-	}
-
-
-
-
-	/*
-	 * only enable non-efix children recursively
-	 */
-	private static void expandEfixFeature(IFeature feature, ArrayList features, IConfiguredSite configuredSite) {
-
-		// add feature
-		if (!features.contains(feature)) {
-			features.add(feature);
-			// debug
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
-				UpdateCore.debug("Retaining configured feature " + feature.getVersionedIdentifier().toString()); //$NON-NLS-1$
-			}
-		}
-
-		// add nested children to the list
-		IIncludedFeatureReference[] children = null;
-		try {
-			children = feature.getIncludedFeatureReferences();
-		} catch (CoreException e) {
-			UpdateCore.warn("", e); //$NON-NLS-1$
-			return;
-		}
-
-		for (int j = 0; j < children.length; j++) {
-			IFeature child = null;
-			try {
-				child = children[j].getFeature(null);
-			} catch (CoreException e) {
-				if (!children[j].isOptional())
-					UpdateCore.warn("", e); //$NON-NLS-1$
-				// 25202 do not return right now, the peer children may be ok
-			}
-			if (child != null){
-				if (!UpdateCore.isPatch(child))
-					expandEfixFeature(child, features, configuredSite);
-			}
-		}
-	}	
-	
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
deleted file mode 100644
index 4491006..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
+++ /dev/null

@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.*;
-
-/**
- * This class manages the configurations.
- */
-
-public class SiteStatusAnalyzer {
-
-	private static List allConfiguredFeatures; /*VersionedIdentifier */
-	private SiteLocal siteLocal;
-
-	/**
-	 * 
-	 */
-	public SiteStatusAnalyzer(SiteLocal siteLocal) {
-		this.siteLocal = siteLocal;
-	}
-
-	/**
-	 * manages the versionedIdentifier and location of parsed plugins
-	 */
-	public class PluginIdentifier {
-		private VersionedIdentifier id;
-		private String label;
-		private boolean isFragment = false;
-
-		public PluginIdentifier(VersionedIdentifier id, String label, boolean fragment) {
-			this.id = id;
-			this.label = label;
-			this.isFragment = fragment;
-		}
-
-		public VersionedIdentifier getVersionedIdentifier() {
-			return id;
-		}
-
-		public boolean isFragment() {
-			return isFragment;
-		}
-
-		public String getLabel() {
-			return label;
-		}
-	}
-	/*
-	 *  check if the Plugins of the feature are on the plugin path
-	 *  If all the plugins are on the plugin path, and the version match and there is no other version -> HAPPY
-	 *  If all the plugins are on the plugin path, and the version match and there is other version -> AMBIGUOUS
-	 *  If some of the plugins are on the plugin path, but not all -> UNHAPPY
-	 * 	Check on all ConfiguredSites
-	 */
-	private IStatus getStatus(IFeature feature) {
-
-		// validate site
-		ISite featureSite = feature.getSite();
-		if (featureSite == null) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
-				UpdateCore.debug("Cannot determine status of feature:" + feature.getLabel() + ". Site is NULL."); //$NON-NLS-1$ //$NON-NLS-2$
-			String msg = Policy.bind("SiteLocal.UnableToDetermineFeatureStatusSiteNull", new Object[] { feature.getURL()}); //$NON-NLS-1$
-			return createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null);
-		}
-
-		// validate configured site		
-		ConfiguredSite cSite = (ConfiguredSite) featureSite.getCurrentConfiguredSite();
-		if (cSite == null) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
-				UpdateCore.warn("Cannot determine status of feature: " + feature.getLabel() + ". Configured Site is NULL."); //$NON-NLS-1$ //$NON-NLS-2$
-			String msg = Policy.bind("SiteLocal.UnableToDetermineFeatureStatusConfiguredSiteNull", new Object[] { feature.getURL()}); //$NON-NLS-1$
-			return createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null);
-		}
-
-		// check if disable, if so return
-		IFeatureReference ref = cSite.getSite().getFeatureReference(feature);
-		if (ref != null) {
-			if (!cSite.getConfigurationPolicy().isConfigured(ref))
-				return createStatus(IStatus.OK, IFeature.STATUS_DISABLED, "", null); //$NON-NLS-1$
-		} else {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
-				UpdateCore.warn("Unable to find reference for feature " + feature + " in site " + cSite.getSite().getURL()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		// check if broken
-		IStatus status = cSite.getBrokenStatus(feature);
-		if (status.getSeverity() != IStatus.OK) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
-				UpdateCore.debug("Feature broken:" + feature.getLabel() + ".Site:" + cSite.toString()); //$NON-NLS-1$ //$NON-NLS-2$
-			return status;
-		}
-
-		// check ambiguous against registry [17015]
-		IPluginEntry[] featuresEntries = feature.getPluginEntries();
-		return status(featuresEntries);
-	}
-
-	/*
-	 *  check if the Plugins of the feature are on the plugin path
-	 *  If all the plugins are on the plugin path, and the version match and there is no other version -> HAPPY
-	 *  If all the plugins are on the plugin path, and the version match and there is other version -> AMBIGUOUS
-	 *  If some of the plugins are on the plugin path, but not all -> UNHAPPY
-	 * 	Check on all ConfiguredSites
-	 */
-	public IStatus getFeatureStatus(IFeature feature) throws CoreException {
-
-		IFeature childFeature = null;
-		IStatus childStatus;
-
-		IFeatureReference[] children = feature.getIncludedFeatureReferences();
-
-		// consider disable
-		// check the current feature
-		String msg = Policy.bind("SiteLocal.FeatureDisable"); //$NON-NLS-1$
-		int code = IFeature.STATUS_DISABLED;
-		IStatus featureStatus = getStatus(feature);
-		MultiStatus multiTemp = new MultiStatus(featureStatus.getPlugin(), code, msg, null);
-		if (featureStatus.getSeverity() == IStatus.ERROR) {
-			if (featureStatus.isMultiStatus()) {
-				multiTemp.addAll(featureStatus);
-			} else {
-				multiTemp.add(featureStatus);
-			}
-		}
-		// preserve the worse code through the method (self assesment + children assessment)
-		if (featureStatus.getCode() > code)
-			code = featureStatus.getCode();
-
-		// do not check children if feature is disable
-		if (!(code == IFeature.STATUS_DISABLED)) {
-			for (int i = 0; i < children.length; i++) {
-				if (!UpdateManagerUtils.isOptional(children[i])) {
-					try {
-						childFeature = children[i].getFeature(null);
-					} catch (CoreException e) {
-						if (!UpdateManagerUtils.isOptional(children[i]))
-							UpdateCore.warn("Error retrieving feature:" + children[i]); //$NON-NLS-1$
-					}
-
-					if (childFeature == null) {
-						UpdateCore.warn("getFeatureStatus: Feature is null for:" + children[i]); //$NON-NLS-1$
-						// Unable to find children feature, broken
-						Object featureAsPrintableObject = children[i].getURL();
-						featureAsPrintableObject = children[i].getVersionedIdentifier();
-						String msg1 = Policy.bind("SiteLocal.NestedFeatureUnavailable", new Object[] { featureAsPrintableObject }); //$NON-NLS-1$
-						multiTemp.add(createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg1, null));
-						if (IFeature.STATUS_UNHAPPY > code)
-							code = IFeature.STATUS_UNHAPPY;
-					} else {
-						childStatus = getFeatureStatus(childFeature);
-						// do not add the status, add the children status as getFeatureStatus
-						// returns a multiStatus 
-						if (childStatus.getCode() == IFeature.STATUS_DISABLED) {
-							VersionedIdentifier versionID = childFeature.getVersionedIdentifier();
-							String featureVer = (versionID == null) ? "" : versionID.getVersion().toString(); //$NON-NLS-1$
-							String msg1 = Policy.bind("SiteLocal.NestedFeatureDisable", childFeature.getLabel(), featureVer); //$NON-NLS-1$
-							multiTemp.add(createStatus(IStatus.ERROR, childStatus.getCode(), msg1, null));
-							if (IFeature.STATUS_UNHAPPY > code)
-								code = IFeature.STATUS_UNHAPPY;
-						}
-						if (childStatus.getSeverity() != IStatus.OK) {
-							VersionedIdentifier versionID = childFeature.getVersionedIdentifier();
-							String featureVer = (versionID == null) ? "" : versionID.getVersion().toString(); //$NON-NLS-1$
-							String msg1 = Policy.bind("SiteLocal.NestedFeatureUnHappy", childFeature.getLabel(), featureVer); //$NON-NLS-1$
-							multiTemp.add(createStatus(IStatus.ERROR, childStatus.getCode(), msg1, null));
-							if (childStatus.getCode() > code)
-								code = childStatus.getCode();
-						}
-					}
-				}
-			}
-		}
-
-		// set message
-		switch (code) {
-			case IFeature.STATUS_HAPPY :
-				msg = Policy.bind("SiteLocal.FeatureHappy"); //$NON-NLS-1$
-				break;
-			case IFeature.STATUS_UNHAPPY :
-				msg = Policy.bind("SiteLocal.FeatureUnHappy"); //$NON-NLS-1$
-				break;
-			case IFeature.STATUS_AMBIGUOUS :
-				msg = Policy.bind("SiteLocal.FeatureAmbiguous"); //$NON-NLS-1$
-				break;
-			case IFeature.STATUS_DISABLED :
-				msg = Policy.bind("SiteLocal.FeatureDisable"); //$NON-NLS-1$
-				break;
-			default :
-				msg = Policy.bind("SiteLocal.FeatureStatusUnknown"); //$NON-NLS-1$
-				break;
-		}
-		MultiStatus multi = new MultiStatus(featureStatus.getPlugin(), code, msg, null);
-		multi.addAll(multiTemp);
-		return multi;
-	}
-
-	/*
-	 * compute the status based on getStatus() rules 
-	 */
-	private IStatus status(IPluginEntry[] featurePlugins) {
-		VersionedIdentifier featurePluginID;
-
-		String happyMSG = Policy.bind("SiteLocal.FeatureHappy"); //$NON-NLS-1$
-		String ambiguousMSG = Policy.bind("SiteLocal.FeatureAmbiguous"); //$NON-NLS-1$
-		IStatus featureStatus = createStatus(IStatus.OK, IFeature.STATUS_HAPPY, "", null); //$NON-NLS-1$
-		MultiStatus multi = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_AMBIGUOUS, ambiguousMSG, null);
-		PackageAdmin pkgAdmin = UpdateCore.getPlugin().getPackageAdmin();
-		
-		// is Ambigous if we find a plugin from the feature
-		// with a different version and not the one we are looking
-		for (int i = 0; i < featurePlugins.length; i++) {
-			MultiStatus tempmulti = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_AMBIGUOUS, ambiguousMSG, null);
-			featurePluginID = featurePlugins[i].getVersionedIdentifier();
-			boolean found = false;
-			
-			String singleVersionRange = '[' + featurePluginID.getVersion().toString() + ',' + featurePluginID.getVersion().toString() + ']';
-			Bundle[] bundles = pkgAdmin.getBundles(featurePluginID.getIdentifier(), singleVersionRange);
-			if (bundles != null && bundles.length == 1) {
-				found = true;
-				continue;
-			}
-			
-			// Check if there is another feature with this plugin (but different version)
-			// log it
-			bundles = pkgAdmin.getBundles(featurePluginID.getIdentifier(), null);
-			for (int j=0; bundles != null && j<bundles.length; j++ ) {
-				String bundleVersion = (String)bundles[j].getHeaders().get(Constants.BUNDLE_VERSION);
-				IFeature feature = getFeatureForId(new VersionedIdentifier(bundles[j].getSymbolicName(), bundleVersion ));
-				String msg = null;
-				if (feature == null) {
-					Object[] values = new Object[] {bundles[j].getSymbolicName(), featurePluginID.getVersion(), bundleVersion};
-					msg = Policy.bind("SiteLocal.TwoVersionSamePlugin1", values); //$NON-NLS-1$
-				} else {
-					String label = feature.getLabel();
-					String featureVersion = feature.getVersionedIdentifier().getVersion().toString();
-					Object[] values = new Object[] { bundles[j].getSymbolicName(), featurePluginID.getVersion(), bundleVersion, label, featureVersion };
-					msg = Policy.bind("SiteLocal.TwoVersionSamePlugin2", values); //$NON-NLS-1$
-				}
-
-				UpdateCore.warn("Found another version of the same plugin on the path:" + bundles[j].getSymbolicName() + " " + bundleVersion); //$NON-NLS-1$ //$NON-NLS-2$
-				tempmulti.add(createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null));
-			}
-	
-
-			// if we haven't found the exact plugin, add the children
-			// of tempMulti (i,e the other we found) 
-			// if we have no children, we have a problem as a required plugin is not there at all
-			if (!found) {
-				if (tempmulti.getChildren().length > 0) {
-					multi.addAll(tempmulti);
-				} else {
-					if (multi.getCode() != IFeature.STATUS_UNHAPPY) {
-						String unhappyMSG = Policy.bind("SiteLocal.FeatureUnHappy"); //$NON-NLS-1$
-						MultiStatus newMulti = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_UNHAPPY, unhappyMSG, null);
-						newMulti.addAll(multi);
-						multi = newMulti;
-					}
-					String msg = Policy.bind("SiteLocal.NoPluginVersion", featurePluginID.getIdentifier()); //$NON-NLS-1$
-					multi.add(createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg, null));
-				}
-			}
-		}
-
-		if (!multi.isOK())
-			return multi;
-
-		// we return happy as we consider the isBroken verification has been done
-		return createStatus(IStatus.OK, IFeature.STATUS_HAPPY, happyMSG, null);
-	}
-	/*
-	 * creates a Status
-	 */
-	private IStatus createStatus(int statusSeverity, int statusCode, String msg, Exception e) {
-		String id = UpdateCore.getPlugin().getBundle().getSymbolicName();
-
-		StringBuffer completeString = new StringBuffer(""); //$NON-NLS-1$
-		if (msg != null)
-			completeString.append(msg);
-		if (e != null) {
-			completeString.append("\r\n["); //$NON-NLS-1$
-			completeString.append(e.toString());
-			completeString.append("]\r\n"); //$NON-NLS-1$
-		}
-		return new Status(statusSeverity, id, statusCode, completeString.toString(), e);
-	}
-
-
-	/*
-	 * returns all the configured fetaures
-	 */
-	private IFeature[] getAllConfiguredFeatures() {
-		if (allConfiguredFeatures == null) {
-
-			allConfiguredFeatures = new ArrayList();
-			IConfiguredSite[] allConfiguredSites = siteLocal.getCurrentConfiguration().getConfiguredSites();
-
-			for (int i = 0; i < allConfiguredSites.length; i++) {
-				IFeatureReference[] refs = allConfiguredSites[i].getConfiguredFeatures();
-				IFeature feature = null;
-				for (int j = 0; j < refs.length; j++) {
-					feature = null;
-					try {
-						feature = refs[j].getFeature(null);
-					} catch (CoreException e) {
-					}
-					if (feature != null) {
-						allConfiguredFeatures.add(feature);
-					}
-				}
-			}
-		}
-
-		IFeature[] features = new IFeature[allConfiguredFeatures.size()];
-		if (allConfiguredFeatures.size() > 0) {
-			allConfiguredFeatures.toArray(features);
-		}
-		return features;
-	}
-
-	/*
-	 * returns the Feature that declares this versionedIdentifier or null if none found
-	 */
-	private IFeature getFeatureForId(VersionedIdentifier id) {
-
-		if (id == null)
-			return null;
-
-		IFeature[] allFeatures = getAllConfiguredFeatures();
-		IFeature currentFeature = null;
-		IPluginEntry[] allPlugins = null;
-		IPluginEntry currentPlugin = null;
-		for (int i = 0; i < allFeatures.length; i++) {
-			currentFeature = allFeatures[i];
-			allPlugins = currentFeature.getPluginEntries();
-			for (int j = 0; j < allPlugins.length; j++) {
-				currentPlugin = allPlugins[j];
-				if (id.equals(currentPlugin.getVersionedIdentifier()))
-					return currentFeature;
-			}
-		}
-		return null;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
deleted file mode 100644
index 2006129..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-import java.util.*;

-

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

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

-

-/**

- * 

- */

-public final class SiteTypeFactory {

-	

-

-	/**

-	 * extension point ID

-	 */

-	public static final String SIMPLE_EXTENSION_ID = "siteTypes";	 //$NON-NLS-1$

-	

-

-	private static SiteTypeFactory inst;

-	

-	private Map factories;

-

-	/**

-	 * hide ctr 

-	 */

-	private SiteTypeFactory() {

-	}

-

-	public static SiteTypeFactory getInstance() {

-		if (inst == null)

-			inst = new SiteTypeFactory();

-		return inst;

-	}

-

-

-	/**

-	 * return the factory for the type

-	 */

-	public ISiteFactory getFactory(String type) throws CoreException {

-			//

-			Object instance = getFactories().get(type);

-			if (instance==null) {

-				instance = createFactoryFor(type);

-				getFactories().put(type,instance);

-			}

-			return (ISiteFactory) instance;

-	}

-

-	/**

-	 * 

-	 */

-	private ISiteFactory createFactoryFor(String type) throws CoreException {

-		ISiteFactory result = null;

-		

-		String pluginID = UpdateCore.getPlugin().getBundle().getSymbolicName();

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IConfigurationElement[] elements = registry.getConfigurationElementsFor(pluginID,SIMPLE_EXTENSION_ID,type);

-		if (elements==null || elements.length==0){

-			throw Utilities.newCoreException(Policy.bind("SiteTypeFactory.UnableToFindSiteFactory",type),null); //$NON-NLS-1$

-		} else {

-			IConfigurationElement element = elements[0];

-			result = (ISiteFactory)element.createExecutableExtension("class"); //$NON-NLS-1$

-		}

-		return result;

-	}

-

-	/**

-	 * Gets the actories.

-	 * @return Returns a Map

-	 */

-	private Map getFactories() {

-		if (factories==null) factories = new HashMap();

-			return factories;

-	}

-

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
deleted file mode 100644
index 2985ee4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.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.internal.core;

-

-import java.net.*;

-

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

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

-

-/**

- * 

- */

-public class SiteURLContentProvider extends SiteContentProvider {

-	

-	public static final String SITE_TYPE = "org.eclipse.update.core.http"; //$NON-NLS-1$

-

-	/**

-	 * Constructor for HTTPSite

-	 */

-	public SiteURLContentProvider(URL url) {

-		super(url);

-	}

-	

-	/*

-	 * @see ISiteContentProvider#getArchiveReference(String)

-	 */

-	public URL getArchiveReference(String archiveId)  throws CoreException {

-		URL contentURL = null;

-		

-		contentURL = getArchiveURLfor(archiveId);

-		// if there is no mapping in the site.xml

-		// for this archiveId, use the default one

-		if (contentURL==null) {

-			return super.getArchiveReference(archiveId);

-		}

-		

-		return contentURL;

-	}

-

-	/**

-	 * return the URL associated with the id of teh archive for this site

-	 * return null if the archiveId is null, empty or 

-	 * if teh list of archives on the site is null or empty

-	 * of if there is no URL associated with the archiveID for this site

-	 */

-	private URL getArchiveURLfor(String archiveId) {

-		URL result = null;

-		boolean found = false;

-

-		IArchiveReference[] siteArchives = getSite().getArchives();

-		if (siteArchives.length > 0) {

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

-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)

-					UpdateCore.debug("GetArchiveURL for:"+archiveId+" compare to "+siteArchives[i].getPath()); //$NON-NLS-1$ //$NON-NLS-2$

-				if (archiveId.trim().equalsIgnoreCase(siteArchives[i].getPath())) {

-					result = siteArchives[i].getURL();

-					found = true;

-					break;

-				}

-			}

-		}

-		return result;

-	}

-

-

-

-	}

-

-


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
deleted file mode 100644
index 2eecbfd..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.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.internal.core;

-import java.io.*;

-import java.net.*;

-

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

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

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

-

-public class SiteURLFactory extends BaseSiteFactory implements ISiteFactoryExtension {

-	

-	/*

-	 * For backward compatibility.

-	 */

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

-		return createSite(url, null);

-	}

-	/*

-	 * @see ISiteFactory#createSite(URL, boolean)

-	 * 

-	 * the URL can be of the following form

-	 * 1 protocol://...../

-	 * 2 protocol://.....

-	 * 3 protocol://..../site.xml

-	 * 

-	 * 1 If the file of the file of teh url ends with '/', attempt to open the stream.

-	 * if it fails, add site.xml and attempt to open the stream

-	 * 

-	 * 2 attempt to open the stream

-	 * 	fail

-	 * 		add '/site.xml' and attempt to open the stream

-	 * 	sucess

-	 * 		attempt to parse, if it fails, add '/site.xml' and attempt to open teh stream

-	 * 

-	 * 3 open the stream	 

-	 */

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

-		Site site = null;

-		InputStream siteStream = null;

-	

-		try {

-			SiteURLContentProvider contentProvider = new SiteURLContentProvider(url);

-	

-			URL resolvedURL = URLEncoder.encode(url);

-			Response response = UpdateCore.getPlugin().get(resolvedURL);

-			UpdateManagerUtils.checkConnectionResult(response, resolvedURL);

-			siteStream = response.getInputStream(monitor);

-			// the stream can be null if the user cancels the connection

-			if (siteStream==null) return null;

-

-			SiteModelFactory factory = this;

-			site = (Site) factory.parseSite(siteStream);

-	

-			site.setSiteContentProvider(contentProvider);

-			contentProvider.setSite(site);

-			site.resolve(url, url);

-			site.markReadOnly();

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteURLFactory.UnableToCreateURL", url == null ? "" : url.toExternalForm()), e);	//$NON-NLS-1$ //$NON-NLS-2$

-		} catch (IOException e) {

-			throw Utilities.newCoreException(Policy.bind("SiteURLFactory.UnableToAccessSiteStream", url == null ? "" : url.toExternalForm()), ISite.SITE_ACCESS_EXCEPTION, e);	//$NON-NLS-1$ //$NON-NLS-2$

-		} finally {

-			if (siteStream != null) {

-				try {

-					siteStream.close();

-				} catch (IOException e) {

-				}

-			}

-		}

-		return site;

-	}

-

-	/*

-	 * @see SiteModelFactory#canParseSiteType(String)

-	 */

-	public boolean canParseSiteType(String type) {

-		return (super.canParseSiteType(type) || SiteURLContentProvider.SITE_TYPE.equalsIgnoreCase(type));

-	}

-

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
deleted file mode 100644
index 3697250..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.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.internal.core;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * 
- */
-public class TargetFeature extends Feature {
-
-
-	/**
-	 * The content consumer of the DefaultFeature
-	 */
-	private IFeatureContentConsumer contentConsumer;
-	
-
-	/**
-	 * Constructor for TargetFeature.
-	 */
-	public TargetFeature() {
-		super();
-	}
-
-	/**
-	 * Sets the content Consumer
-	 */
-	public void setContentConsumer(IFeatureContentConsumer contentConsumer) {
-		this.contentConsumer = contentConsumer;
-		contentConsumer.setFeature(this);
-	}
-
-	/*
-	 * @see IFeature#getFeatureContentConsumer()
-	 */
-	public IFeatureContentConsumer getFeatureContentConsumer() throws CoreException {
-		if (this.contentConsumer == null) {
-			throw Utilities.newCoreException( Policy.bind("Feature.NoFeatureContentConsumer", getURL().toExternalForm()), null); //$NON-NLS-1$
-		}
-		return contentConsumer;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
deleted file mode 100644
index 37ae672..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-

-

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

-/**

- * Encodes a <code>URL</code> into an <code>ASCII</code> readable

- * <code>URL</code> that is safe for transport. Encoded

- * <code>URL</code>s can be decoded using the <code>URLDecoder</code>.

- *

- * @see URLDecoder

- */

-public final class URLEncoder {

-	/**

-	 * Prevents instances from being created.

-	 */

-	private URLEncoder() {

-	}

-	/**

-	 * Encodes the given file and reference parts of a <code>URL</code> into

-	 * an <code>ASCII</code> readable <code>String</code> that is safe for

-	 * transport. Returns the result.

-	 *

-	 * @return the result of encoding the given file and reference parts of

-	 *         a <code>URL</code> into an <code>ASCII</code> readable

-	 *         <code>String</code> that is safe for transport

-	 */

-	public static String encode(String file, String query, String ref) {

-		StringBuffer buf = new StringBuffer();

-		StringTokenizer tokenizer = new StringTokenizer(file, "/", true); //$NON-NLS-1$

-

-		while (tokenizer.hasMoreTokens()) {

-			String token = tokenizer.nextToken();

-			if (token.equals("/")) { //$NON-NLS-1$

-				buf.append(token);

-			} else {

-				buf.append(encodeSegment(token));

-			}

-		}

-

-		if (query != null){

-			buf.append('?');

-			buf.append(query);

-		}

-

-		if (ref != null) {

-			buf.append('#');

-			buf.append(encodeSegment(ref));

-		}

-

-		return buf.toString();

-	}

-	/**

-	 * Encodes the given <code>URL</code> into an <code>ASCII</code>

-	 * readable <code>URL</code> that is safe for transport. Returns the

-	 * result.

-	 *

-	 * @return the result of encoding the given <code>URL</code> into an

-	 *         <code>ASCII</code> readable <code>URL</code> that is safe for

-	 *         transport

-	 */

-	public static URL encode(URL url) throws MalformedURLException {

-		// encode the path not the file as the URL may contain a query

-		String file = url.getPath();

-		String query = url.getQuery();

-		String ref = url.getRef();

-

-		URL result =  new URL(url.getProtocol(), url.getHost(), url.getPort(), encode(file, query, ref));

-		return result;

-	}

-	private static String encodeSegment(String segment) {

-		

-		// if we find a '%' in the string, consider the URL to be already encoded

-		if (segment.indexOf('%')!=-1) return segment;

-		

-		StringBuffer result = new StringBuffer(segment.length());

-

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

-			char c = segment.charAt(i);

-			if (mustEncode(c)) {

-				byte[] bytes = null;

-				try {

-					bytes = new Character(c).toString().getBytes("UTF8"); //$NON-NLS-1$

-				} catch (UnsupportedEncodingException e) {

-					Assert.isTrue(false, e.getMessage());

-				}

-				for (int j = 0; j < bytes.length; ++j) {

-					result.append('%');

-					result.append(Integer.toHexString((bytes[j] >> 4) & 0x0F));

-					result.append(Integer.toHexString(bytes[j] & 0x0F));

-				}

-			} else {

-				result.append(c);

-			}

-		}

-

-		return result.toString();

-	}

-	private static boolean mustEncode(char c) {

-		if (c >= 'a' && c <= 'z') {

-			return false;

-		}

-

-		if (c >= 'A' && c <= 'Z') {

-			return false;

-		}

-

-		if (c >= '0' && c <= '9') {

-			return false;

-		}

-

-		if (c >= '\'' && c <= '.') {

-			return false;

-		}

-

-		if (c == '!' || c == '$' || c == '_') {

-			return false;

-		}

-

-		// needed otherwise file:///c:/file/ becomes file:///C%3a/file/

-		if (c ==':'){

-			return false;

-		}

-		return true;

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java
deleted file mode 100644
index 6b1d9b5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.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.update.internal.core;
- 
-import java.net.*;
-
-
-
-/**
- * 
- * 
- */
-public class URLKey {
-
-	private URL url;
-	
-	/**
-	 * Constructor for URLKey.
-	 */
-	public URLKey(URL url) {
-		super();
-		this.url = url;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-			if (obj == null) {
-				return false;
-			}
-
-			if (this == obj) {
-				return true;
-			}
-
-			if (obj instanceof URLKey) {
-				return equals(((URLKey) obj).getURL());
-			}
-
-			if (!(obj instanceof URL)) {
-				return false;
-			}
-
-			URL url2 = (URL)obj;
-			if (url == url2) {
-				return true;
-			}
-
-			return UpdateManagerUtils.sameURL(url,url2);
-	}
-
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return url.hashCode();
-	}
-
-	/**
-	 * Returns the url.
-	 * @return URL
-	 */
-	public URL getURL() {
-		return url;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
deleted file mode 100644
index 4c1c587..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
+++ /dev/null

@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configurator.*;
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.*;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UpdateCore extends Plugin {
-
-	// debug options
-	public static boolean DEBUG;
-	public static boolean DEBUG_SHOW_INSTALL;
-	public static boolean DEBUG_SHOW_PARSING;
-	public static boolean DEBUG_SHOW_WARNINGS;
-	public static boolean DEBUG_SHOW_CONFIGURATION;
-	public static boolean DEBUG_SHOW_TYPE;
-	public static boolean DEBUG_SHOW_WEB;
-	public static boolean DEBUG_SHOW_IHANDLER;
-	public static boolean DEBUG_SHOW_RECONCILER;
-
-	// preference keys
-	private static final String PREFIX = "org.eclipse.update.core"; //$NON-NLS-1$
-	public static final String P_HISTORY_SIZE = PREFIX + ".historySize"; //$NON-NLS-1$
-	public static final String P_CHECK_SIGNATURE = PREFIX + ".checkSignature"; //$NON-NLS-1$
-	public static final String P_UPDATE_VERSIONS = PREFIX + ".updateVersions"; //$NON-NLS-1$
-	public static final String EQUIVALENT_VALUE = "equivalent"; //$NON-NLS-1$
-	public static final String COMPATIBLE_VALUE = "compatible"; //$NON-NLS-1$
-	
-	public static int DEFAULT_HISTORY = 100;//Integer.MAX_VALUE;
-	
-	//The shared instance.
-	private static UpdateCore plugin;
-
-	//log
-	private static UpdateManagerLogWriter log;
-	private static final String LOG_FILE="install.log"; //$NON-NLS-1$
-	
-	//Connection manager
-	private ConnectionThreadManager connectionManager;
-
-	public static String HTTP_PROXY_HOST = "org.eclipse.update.core.proxy.host"; //$NON-NLS-1$
-	public static String HTTP_PROXY_PORT = "org.eclipse.update.core.proxy.port"; //$NON-NLS-1$
-	public static String HTTP_PROXY_ENABLE = "org.eclipse.update.core.proxy.enable"; //$NON-NLS-1$
-
-	// bundle data
-	private BundleContext context;
-	private ServiceTracker pkgAdminTracker;
-	
-	/**
-	 * The constructor.
-	 */
-	public UpdateCore() {
-		plugin = this;
-	}
-	
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UpdateCore getPlugin() {
-		return plugin;
-	}
-	
-	/**
-	 * Returns the manager that manages URL connection threads.
-	 */
-	public ConnectionThreadManager getConnectionManager() {
-		if (connectionManager==null)
-			connectionManager = new ConnectionThreadManager();
-		return connectionManager;
-	}
-
-	private boolean getBooleanDebugOption(String flag, boolean dflt) {
-		String result = Platform.getDebugOption(flag);
-		if (result == null)
-			return dflt;
-		else
-			return result.trim().equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-
-	/**
-	 * dumps a String in the trace
-	 */
-	public static void debug(String s) {
-		StringBuffer msg = new StringBuffer();
-		msg.append(getPlugin().toString());
-		msg.append("^"); //$NON-NLS-1$
-		msg.append(Integer.toHexString(Thread.currentThread().hashCode()));
-		msg.append(" "); //$NON-NLS-1$
-		msg.append(s);
-		System.out.println(msg.toString());
-	}
-	
-	/**
-	 * Dumps a String in the log if WARNING is set to true
-	 */
-	public static void warn(String s) {
-		if (DEBUG && DEBUG_SHOW_WARNINGS) {
-			if (s!=null){
-				s="WARNING: "+s; //$NON-NLS-1$
-			}
-			log(s, null); 
-		}
-	}
-
-	/**
-	 * Dumps an exception in the log if WARNING is set to true
-	 * 
-	 * @param s log string
-	 * @param e exception to be logged
-	 * @since 2.0
-	 */
-	public static void warn(String s, Throwable e) {
-		if (DEBUG && DEBUG_SHOW_WARNINGS){
-			if (s!=null){
-				s="UPDATE MANAGER INFO: "+s; //$NON-NLS-1$
-			}
-			log(s,e);
-		}
-	}
-			
-	/**
-	 * Logs a status
-	 */
-	public static void log(IStatus status){
-		UpdateCore.getPlugin().getLog().log(status);		
-	}
-	
-	/**
-	 * Logs an error
-	 */
-	public static void log(Throwable e){		
-		log("",e); //$NON-NLS-1$
-	}	
-	
-	/**
-	 * Logs a string and an  error
-	 */
-	public static void log(String msg, Throwable e){
-		IStatus status = null;
-		if (e instanceof CoreException) 
-			status = ((CoreException)e).getStatus();
-		else 
-			status = Utilities.newCoreException(msg,e).getStatus();		
-		if (status!=null)
-			log(status);
-	}		
-	/*
-	 * Method log.
-	 * @param newConfiguration
-	 */
-	public static void log(IInstallConfiguration newConfiguration) {
-		if (log!=null)
-			log.log(newConfiguration);
-	}
-
-	/*
-	 * Get update log location relative to platform configuration
-	 */
-	private static File getInstallLogFile() throws IOException {
-		
-		IPlatformConfiguration config = ConfiguratorUtils.getCurrentPlatformConfiguration();		
-		URL configurationLocation = config.getConfigurationLocation();
-		if (configurationLocation==null){
-			warn("Unable to retrieve location for update manager log file"); //$NON-NLS-1$
-			return null;
-		}
-//		URL configLocation = Platform.resolve(configurationLocation);
-		File updateStateLocation = null;
-
-		if ("file".equalsIgnoreCase(configurationLocation.getProtocol())) { //$NON-NLS-1$
-			File path = new File(configurationLocation.getFile());
-			updateStateLocation = new File(path.getParentFile(), LOG_FILE);
-		}
-		return updateStateLocation;
-	}
-
-	/**
-	 * Sends the GET request to the server and returns the server's
-	 * response.
-	 *
-	 * @param url the URL to open on the server
-	 * @return the server's response
-	 * @throws IOException if an I/O error occurs. Reasons include:
-	 * <ul>
-	 * <li>The client is closed.
-	 * <li>The client could not connect to the server
-	 * <li>An I/O error occurs while communicating with the server
-	 * <ul>
-	 */
-	public Response get(URL url) throws IOException {
-		//Request request = null;
-		Response response = null;
-		
-		if ("file".equals(url.getProtocol())) { //$NON-NLS-1$
-			response = new FileResponse(url);
-		} else if (url != null && url.getProtocol().startsWith("http")) { //$NON-NLS-1$
-			response = new HttpResponse(url);
-		} else {
-			response = new OtherResponse(url);
-		}
-		
-		/*else {
-			try {
-				request = new Request("GET", url, null);
-				response = client.invoke(request);
-			} finally {
-				if (request != null) {
-					try {
-						request.close();
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-			}
-		}*/
-		return response;
-	}
-	
-	/*
-	 * Returns true if the feature is a patch
-	 */
-	public static boolean isPatch(IFeature candidate) {
-		IImport[] imports = candidate.getImports();
-
-		for (int i = 0; i < imports.length; i++) {
-			IImport iimport = imports[i];
-			if (iimport.isPatch())
-				return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		this.context = context;
-
-		Policy.localize("org.eclipse.update.internal.core.messages"); //$NON-NLS-1$
-		DEBUG = getBooleanDebugOption("org.eclipse.update.core/debug", false); //$NON-NLS-1$
-
-		if (DEBUG) {
-			DEBUG_SHOW_WARNINGS = getBooleanDebugOption("org.eclipse.update.core/debug/warning", false); //$NON-NLS-1$
-			DEBUG_SHOW_PARSING = getBooleanDebugOption("org.eclipse.update.core/debug/parsing", false); //$NON-NLS-1$
-			DEBUG_SHOW_INSTALL = getBooleanDebugOption("org.eclipse.update.core/debug/install", false); //$NON-NLS-1$
-			DEBUG_SHOW_CONFIGURATION = getBooleanDebugOption("org.eclipse.update.core/debug/configuration", false); //$NON-NLS-1$
-			DEBUG_SHOW_TYPE = getBooleanDebugOption("org.eclipse.update.core/debug/type", false); //$NON-NLS-1$
-			DEBUG_SHOW_WEB = getBooleanDebugOption("org.eclipse.update.core/debug/web", false); //$NON-NLS-1$
-			DEBUG_SHOW_IHANDLER = getBooleanDebugOption("org.eclipse.update.core/debug/installhandler", false); //$NON-NLS-1$
-			DEBUG_SHOW_RECONCILER = getBooleanDebugOption("org.eclipse.update.core/debug/reconciler", false); //$NON-NLS-1$
-		}
-		
-		//
-		try {
-			File logFile = getInstallLogFile();
-			if (logFile!=null)
-				log = new UpdateManagerLogWriter(logFile);
-		} catch (IOException e){
-			warn("",e); //$NON-NLS-1$
-		}
-		
-		SiteManager.setHttpProxyInfo(
-			getPluginPreferences().getBoolean(HTTP_PROXY_ENABLE),
-			getPluginPreferences().getString(HTTP_PROXY_HOST),
-			getPluginPreferences().getString(HTTP_PROXY_PORT));
-	}
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		
-		JarContentReference.shutdown(); // make sure we are not leaving jars open
-		Utilities.shutdown(); // cleanup temp area
-		if (log!=null)
-			log.shutdown();
-		if (connectionManager!=null)
-			connectionManager.shutdown();
-		
-		this.context = null;
-		if (pkgAdminTracker != null) {
-			pkgAdminTracker.close();
-			pkgAdminTracker = null;
-		}
-	}
-	
-	BundleContext getBundleContext() {
-		return context;
-	}
-	
-	PackageAdmin getPackageAdmin() {
-		if (pkgAdminTracker == null) {
-			pkgAdminTracker = new ServiceTracker(context, PackageAdmin.class.getName(), null);
-			pkgAdminTracker.open();
-		}
-		return (PackageAdmin)pkgAdminTracker.getService();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
deleted file mode 100644
index ff4b662..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
+++ /dev/null

@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-
-
-/**
- * A log writer that writes update manager log entries.  
- */
-public class UpdateManagerLogWriter {
-	private File logFile = null;
-	private Writer log = null;
-
-	private static final String CONFIGURATION = "!CONFIGURATION"; //$NON-NLS-1$
-	private static final String ACTIVITY = "!ACTIVITY"; //$NON-NLS-1$
-
-	private static final String SUCCESS = "success"; //$NON-NLS-1$
-	private static final String FAILURE = "failure"; //$NON-NLS-1$
-
-	private static final String FEATURE_INSTALL = "feature-install"; //$NON-NLS-1$
-	private static final String FEATURE_REMOVE = "feature-remove"; //$NON-NLS-1$
-	private static final String SITE_INSTALL = "site-install"; //$NON-NLS-1$
-	private static final String SITE_REMOVE = "site-remove"; //$NON-NLS-1$
-	private static final String UNCONFIGURE = "feature-disable"; //$NON-NLS-1$
-	private static final String CONFIGURE = "feature-enable"; //$NON-NLS-1$
-	private static final String REVERT = "revert"; //$NON-NLS-1$
-	private static final String RECONCILIATION = "reconciliation"; //$NON-NLS-1$
-	private static final String PRESERVED = "preserve-configuration"; //$NON-NLS-1$	
-	private static final String UNKNOWN = "unknown"; //$NON-NLS-1$	
-
-	private static final String LINE_SEPARATOR;
-
-	static {
-		String s = System.getProperty("line.separator"); //$NON-NLS-1$
-		LINE_SEPARATOR = s == null ? "\n" : s; //$NON-NLS-1$
-	}
-
-	/*
-	 * 
-	 */
-	public UpdateManagerLogWriter(File file) {
-		this.logFile = file;
-		UpdateCore.warn("UPDATE MANAGER LOG Location: "+file.getAbsolutePath()); //$NON-NLS-1$
-
-		// If the file does not exist, prime it with the sites in the exisiting config
-		if (!file.exists())
-			initLog();
-	}
-	
-	/*
-	 * Initializes the log with the original configuration
-	 */
-	private void initLog() {
-		try {
-			IPlatformConfiguration runtimeConfig = ConfiguratorUtils.getCurrentPlatformConfiguration();
-			IPlatformConfiguration.ISiteEntry[] sites = runtimeConfig.getConfiguredSites();
-			ConfigurationActivity[] activities = new ConfigurationActivity[sites.length];
-			for (int i=0; i<sites.length; i++) {
-				activities[i] = new ConfigurationActivity(IActivity.ACTION_SITE_INSTALL);
-				activities[i].setLabel(Platform.asLocalURL(sites[i].getURL()).toExternalForm());
-				activities[i].setDate(new Date());
-				activities[i].setStatus(IActivity.STATUS_OK);
-			}
-			Date date = new Date(runtimeConfig.getChangeStamp());
-			safeWriteConfiguration(date, activities);
-		} catch (Exception e) {
-			// silently ignore errors
-		}
-	}
-
-	/*
-	 * 
-	 */
-	private void closeLogFile() throws IOException {
-		try {
-			if (log != null) {
-				log.flush();
-				log.close();
-			}
-		} finally {
-			log = null;
-		}
-	}
-	
-	/*
-	 * 
-	 */
-	public void log(IInstallConfiguration installConfig) {
-		safeWriteConfiguration(installConfig.getCreationDate(), installConfig.getActivities());
-	}
-	
-	
-	/*
-	 * 
-	 */
-	private void openLogFile() {
-		try {
-			log = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile.getAbsolutePath(), true), "UTF-8")); //$NON-NLS-1$
-		} catch (IOException e) {
-			// there was a problem opening the log file so log to the console
-			log = logForStream(System.err);
-		}
-	}
-	
-    /*
-     * 
-     */
-	private String getFormattedDate(Date date) {
-		try {
-			DateFormat formatter = new SimpleDateFormat("MMM dd, yyyy kk:mm:ss.SS"); //$NON-NLS-1$
-			return formatter.format(date);
-		} catch (Exception e) {
-			// If there were problems writing out the date, ignore and
-			// continue since that shouldn't stop us from losing the rest
-			// of the information
-		}
-		return Long.toString(System.currentTimeMillis());
-	}
-	
-	/*
-	 * 
-	 */
-	private Writer logForStream(OutputStream output) {
-		try {
-			return new BufferedWriter(new OutputStreamWriter(output, "UTF-8")); //$NON-NLS-1$
-		} catch (UnsupportedEncodingException e) {
-			return new BufferedWriter(new OutputStreamWriter(output));
-		}
-	}
-	
-	
-	/*
-	 * Shuts down the update manager log.
-	 */
-	public synchronized void shutdown() {
-		try {
-			if (logFile != null) {
-				closeLogFile();
-				logFile = null;
-			} else {
-				if (log != null) {
-					Writer old = log;
-					log = null;
-					old.flush();
-					old.close();
-				}
-			}
-		} catch (IOException e) {
-			//we've shutdown the log, so not much else we can do!
-			e.printStackTrace();
-		}
-	}
-
-	/*
-	 * 
-	 */
-	private synchronized void safeWriteConfiguration(Date date, IActivity[] activities) {
-		// thread safety: (Concurrency003)
-		if (logFile != null)
-			openLogFile();
-		if (log == null)
-			log = logForStream(System.err);
-		try {
-			try {
-				write(date, activities);
-			} finally {
-				if (logFile != null)
-					closeLogFile();
-				else
-					log.flush();
-			}
-		} catch (Exception e) {
-			System.err.println("An exception occurred while writing to the update manager 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(date, activities);
-				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;
-		}
-	}
-	
-
-	/*
-	 * !CONFIGURATION <label>
-	 */
-	private void write(Date date, IActivity[] activities) throws IOException {
-		writeln();
-		write(CONFIGURATION);
-		writeSpace();	
-		write(String.valueOf(date.getTime()));
-		writeSpace();
-		write(date.toString());
-		writeln();
-		for (int i = 0; i < activities.length; i++) {
-			write(activities[i]);
-		}				
-	}
-
-	/*
-	 * !ACTIVITY <date> <target> <action> <status>
-	 */
-	private void write(IActivity activity) throws IOException {
-		write(ACTIVITY);
-		writeSpace();	
-		write(String.valueOf(activity.getDate().getTime()));
-		writeSpace();
-		write(getFormattedDate(activity.getDate()));
-		writeSpace();
-		write(activity.getLabel());
-		writeSpace();
-		write(getAction(activity.getAction()));
-		writeSpace();
-		write((activity.getStatus()==IActivity.STATUS_OK)?SUCCESS:FAILURE);
-		writeln();		
-	}
-
-	/*
-	 * 
-	 */
-	private String getAction(int i) {
-		switch (i) {
-			case IActivity.ACTION_FEATURE_INSTALL :
-				return FEATURE_INSTALL;
-			case IActivity.ACTION_FEATURE_REMOVE :
-				return FEATURE_REMOVE;
-			case IActivity.ACTION_SITE_INSTALL :
-				return SITE_INSTALL;
-			case IActivity.ACTION_SITE_REMOVE :
-				return SITE_REMOVE;
-			case IActivity.ACTION_UNCONFIGURE :
-				return UNCONFIGURE;
-			case IActivity.ACTION_CONFIGURE :
-				return CONFIGURE;
-			case IActivity.ACTION_REVERT :
-				return REVERT;
-			case IActivity.ACTION_RECONCILIATION :
-				return RECONCILIATION;
-			case IActivity.ACTION_ADD_PRESERVED :
-				return PRESERVED;
-							
-			default :
-				return UNKNOWN+" ["+i+"]"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-
-	/*
-	 * 
-	 */
-	private void writeln() throws IOException {
-		write(LINE_SEPARATOR);
-	}
-	
-	/*
-	 * 
-	 */
-	private void write(String message) throws IOException {
-		if (message != null)
-			log.write(message);
-	}
-	
-	/*
-	 * 
-	 */
-	private void writeSpace() throws IOException {
-		write(" "); //$NON-NLS-1$
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
deleted file mode 100644
index c948335..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
+++ /dev/null

@@ -1,950 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.core;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

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

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

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

-import org.osgi.framework.*;

-import org.osgi.service.packageadmin.*;

-

-/**

- * 

- */

-public class UpdateManagerUtils {

-

-	private static boolean OS_UNIX = org.eclipse.osgi.service.environment.Constants.OS_HPUX

-			.equals(Platform.getOS())

-			|| org.eclipse.osgi.service.environment.Constants.OS_AIX

-					.equals(Platform.getOS())

-			|| org.eclipse.osgi.service.environment.Constants.OS_LINUX

-					.equals(Platform.getOS())

-			|| org.eclipse.osgi.service.environment.Constants.OS_SOLARIS

-					.equals(Platform.getOS());

-	private static FragmentEntry[] noFragments = new FragmentEntry[0];

-	private static Map table;

-

-	static {

-		table = new HashMap();

-		table.put("compatible", new Integer(IImport.RULE_COMPATIBLE)); //$NON-NLS-1$

-		table.put("perfect", new Integer(IImport.RULE_PERFECT)); //$NON-NLS-1$

-		table.put("equivalent", new Integer(IImport.RULE_EQUIVALENT)); //$NON-NLS-1$

-		table.put("greaterOrEqual", new Integer(IImport.RULE_GREATER_OR_EQUAL)); //$NON-NLS-1$

-	}

-

-	private static Writer writer;

-	// manage URL to File

-	private static Map urlFileMap;

-

-	private static Map localFileFragmentMap;

-	private static Stack bufferPool;

-	private static final int BUFFER_SIZE = 4096; // 4kbytes

-	private static final int INCREMENT_SIZE = 10240; // 10kbytes

-	/**

-	 * return the urlString if it is a absolute URL

-	 * otherwise, return the default URL if the urlString is null

-	 * The defaultURL may point ot a file, create a file URL then

-	 * if the urlString or the default URL are relatives, prepend the rootURL to it

-	 */

-	public static URL getURL(URL rootURL, String urlString, String defaultURL) throws MalformedURLException {

-		URL url = null;

-

-		// if no URL , provide Default

-		if (urlString == null || urlString.trim().equals("")) { //$NON-NLS-1$

-

-			// no URL, no default, return right now...

-			if (defaultURL == null || defaultURL.trim().equals("")) //$NON-NLS-1$

-				return null;

-			else

-				urlString = defaultURL;

-		}

-

-		// URL can be relative or absolute	

-		if (urlString.startsWith("/") && urlString.length() > 1) //$NON-NLS-1$

-			urlString = urlString.substring(1);

-		try {

-			url = new URL(urlString);

-		} catch (MalformedURLException e) {

-			// the url is not an absolute URL

-			// try relative

-			url = new URL(rootURL, urlString);

-		}

-

-		return url;

-	}

-

-	/**

-	 * return a relative String to rootURL 

-	 * if url contains rootURL so

-	 * new URL(rootURL, resultString) == url

-	 * 

-	 */

-	public static String getURLAsString(URL rootURL, URL url) {

-		String result = null;

-

-		if (rootURL == null) {

-			return (url == null) ? null : url.toString();

-		}

-

-		// if no URL , return null

-		if (url != null) {

-

-			result = url.toExternalForm();

-

-			if (rootURL.getHost() != null && !rootURL.getHost().equals(url.getHost()))

-				return result;

-

-			if (rootURL.getProtocol() != null && !rootURL.getProtocol().equals(url.getProtocol()))

-				return result;

-

-			if (rootURL.getPort() != url.getPort())

-				return result;

-

-			String rootURLFileString = rootURL.getFile();

-			rootURLFileString = rootURLFileString.replace(File.separatorChar, '/');

-			if (!rootURLFileString.endsWith("/")) {

-				int index = rootURLFileString.lastIndexOf('/');

-				if (index != -1) {

-					rootURLFileString = rootURLFileString.substring(0, index);

-				}

-			}

-			String urlFileString = url.getFile();

-

-			if (urlFileString.startsWith(rootURLFileString)) {

-				result = urlFileString.substring(rootURLFileString.length());

-				result = result.replace(File.separatorChar, '/');

-			} else {

-				// we need to check the following

-				// file:/C:/ and file:C:/

-				if ("file".equalsIgnoreCase(url.getProtocol())) {

-					File rootFile = new File(rootURLFileString);

-					File urlFile = new File(urlFileString);

-

-					File relativePath = urlFile;

-					while (relativePath != null && !rootFile.equals(relativePath.getParentFile())) {

-						relativePath = relativePath.getParentFile();

-					}

-

-					if (relativePath == null) {

-						UpdateCore.warn("Cannot calculate relative path");

-						return url.toString();

-					} else {

-						String relativeRootString = relativePath.getParentFile().getAbsolutePath();

-						String fullString = urlFile.getAbsolutePath();

-						if (!fullString.startsWith(relativeRootString)) {

-							UpdateCore.warn("Full path:" + fullString + " does not start with " + relativeRootString);

-							return url.toString();

-						} else {

-							String returnString = fullString.substring(relativeRootString.length() + 1);

-							if (urlFile.isDirectory())

-								returnString += File.separator;

-							// we lost the last slash when tranforming in File

-							returnString = returnString.replace(File.separatorChar, '/');

-							return returnString;

-						}

-

-					}

-

-				} else {

-					result = url.toString();

-				}

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * returns a translated String

-	 */

-	public static String getResourceString(String infoURL, ResourceBundle bundle) {

-		String result = null;

-		if (infoURL != null) {

-			result = Platform.getResourceString(UpdateCore.getPlugin().getBundle(), infoURL, bundle);

-		}

-		return result;

-	}

-

-	/**

-	 * 

-	 */

-	public static URL copyToLocal(InputStream sourceContentReferenceStream, String localName, InstallMonitor monitor) throws MalformedURLException, IOException, InstallAbortedException {

-		URL result = null;

-		// create the Dir if they do not exist

-		// get the path from the File to resolve File.separator..

-		// do not use the String as it may contain URL like separator

-		File localFile = new File(localName);

-		int index = localFile.getPath().lastIndexOf(File.separator);

-		if (index != -1) {

-			File dir = new File(localFile.getPath().substring(0, index));

-			if (!dir.exists())

-				dir.mkdirs();

-		}

-

-		// transfer the content of the File

-		if (!localFile.isDirectory()) {

-			OutputStream localContentReferenceStream = new FileOutputStream(localFile);

-			try {

-				Utilities.copy(sourceContentReferenceStream, localContentReferenceStream, monitor);

-			} finally {

-				try {

-					localContentReferenceStream.close();

-				} catch (IOException e){}

-			}

-		}

-		result = localFile.toURL();

-		return result;

-	}

-

-	/*

-	 * [20305] need to slam permissions for executable libs on some

-	 * platforms. This is a temporary fix

-	 */

-	public static void checkPermissions(ContentReference ref, String filePath) {

-

-		if (ref.getPermission() != 0) {

-			UpdateCore.warn("Change permission for " + filePath + " to " + ref.getPermission());

-			// FIXME: change the code to use JNI

-		}

-

-		if (filePath != null && OS_UNIX && ref.getPermission() != 0) {

-			// add execute permission on shared libraries 20305

-			// do not remove write permission 20896

-			// chmod a+x *.sl

-			try {

-				Process pr = Runtime.getRuntime().exec(new String[] { "chmod", "a+x", filePath });

-				Thread chmodOutput = new StreamConsumer(pr.getInputStream());

-				chmodOutput.setName("chmod output reader");

-				chmodOutput.start();

-				Thread chmodError = new StreamConsumer(pr.getErrorStream());

-				chmodError.setName("chmod error reader");

-				chmodError.start();

-			} catch (IOException ioe) {

-			}

-

-		}

-	}

-

-	/**

-	 * Returns a random file name for the local system

-	 * attempt to conserve the extension if there is a '.' in the path

-	 * and no File.Seperator after the '.'

-	 * 

-	 * \a\b\c.txt -> c987659385.txt

-	 * c.txt -> c3854763.txt

-	 * c	-> c953867549

-	 */

-	public static String getLocalRandomIdentifier(String remotePath, Date date) {

-		int dotIndex = remotePath.lastIndexOf(".");	//$NON-NLS-1$

-		int fileIndex = remotePath.lastIndexOf(File.separator);

-		// if there is a separator after the dot

-		// do not consider it as an extension

-		String ext = (dotIndex != -1 && fileIndex < dotIndex) ? remotePath.substring(dotIndex) : ""; //$NON-NLS-1$

-		// the name is the string between the separator and the dot

-		// if there is no separator, it is the string up to the dot		

-		// if there is no dot, go to the end of the string 

-		if (fileIndex == -1)

-			fileIndex = 0;

-		if (dotIndex == -1)

-			dotIndex = remotePath.length();

-		// if I have a separator and no dot: /a/b/c -> c

-		// if my separator is the last /a/b/c/, fileIndex and dotIndex are the same, so it will return the default temp name

-		String name = (fileIndex < dotIndex) ? remotePath.substring(fileIndex, dotIndex) : "Eclipse_Update_TMP_"; //$NON-NLS-1$

-		String result = name + date.getTime() + ext;

-		return result;

-	}

-

-	/**

-	 * remove a file or directory from the file system.

-	 * used to clean up install

-	 */

-	public static void removeFromFileSystem(File file) {

-		if (!file.exists())

-			return;

-

-		if (file.isDirectory()) {

-			String[] files = file.list();

-			if (files != null) // be careful since file.list() can return null

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

-					removeFromFileSystem(new File(file, files[i]));

-		}

-

-		if (!file.delete()) {

-			String msg = Policy.bind("UpdateManagerUtils.UnableToRemoveFile", file.getAbsolutePath());	//$NON-NLS-1$ //$NON-NLS-2$

-			UpdateCore.log(msg, new Exception());

-		}

-	}

-

-	/**

-	 * remove all the empty directories recursively

-	 * used to clean up install

-	 */

-	public static void removeEmptyDirectoriesFromFileSystem(File file) {

-		if (!file.isDirectory())

-			return;

-

-		String[] files = file.list();

-		if (files != null) { // be careful since file.list() can return null

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

-				removeEmptyDirectoriesFromFileSystem(new File(file, files[i]));

-			}

-		}

-		if (!file.delete()) {

-			String msg = Policy.bind("UpdateManagerUtils.UnableToRemoveFile", file.getAbsolutePath());	//$NON-NLS-1$ //$NON-NLS-2$

-			UpdateCore.log(msg, new Exception());

-		}

-	}

-

-	/**

-	 * Returns the plugin entries that are in source array and

-	 * not in target array

-	 */

-	public static IPluginEntry[] diff(IPluginEntry[] sourceArray, IPluginEntry[] targetArray) { // No pluginEntry to Install, return Nothing to instal

-		if (sourceArray == null || sourceArray.length == 0) {

-			return new IPluginEntry[0];

-		} // No pluginEntry installed, Install them all

-		if (targetArray == null || targetArray.length == 0) {

-			return sourceArray;

-		} // if a IPluginEntry from sourceArray is NOT in

-		// targetArray, add it to the list

-		List list1 = Arrays.asList(targetArray);

-		List result = new ArrayList(0);

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

-			if (!list1.contains(sourceArray[i]))

-				result.add(sourceArray[i]);

-		}

-

-		IPluginEntry[] resultEntry = new IPluginEntry[result.size()];

-		if (result.size() > 0)

-			result.toArray(resultEntry);

-		return resultEntry;

-	}

-

-	/**

-	 * Returns the parent URL of the given URL, or <code>null</code> if the

-	 * given URL is the root.

-	 * <table>

-	 * <caption>Example</caption>

-	 * <tr>

-	 *   <th>Given URL</th>

-	 *   <th>Parent URL</th>

-	 * <tr>

-	 *   <td>"http://hostname/"</td>

-	 *   <td>null</td>

-	 * <tr>

-	 *   <td>"http://hostname/folder/file</td>

-	 *   <td>"http://hostname/folder/</td>

-	 * </table>

-	 *

-	 * @param url a URL

-	 * @return    the parent of the given URL

-	 */

-	public static URL getParent(URL url) {

-		String file = url.getFile();

-		int len = file.length();

-		if (len == 0 || len == 1 && file.charAt(0) == '/')

-			return null;

-		int lastSlashIndex = -1;

-		for (int i = len - 2; lastSlashIndex == -1 && i >= 0; --i) {

-			if (file.charAt(i) == '/')

-				lastSlashIndex = i;

-		}

-		if (lastSlashIndex == -1)

-			file = "";

-		else

-			file = file.substring(0, lastSlashIndex + 1);

-		try {

-			url = new URL(url.getProtocol(), url.getHost(), url.getPort(), file);

-		} catch (MalformedURLException e) {

-			Assert.isTrue(false, e.getMessage());

-		}

-		return url;

-	}

-

-	/**

-	 * 

-	 */

-	public static URL asDirectoryURL(URL url) throws MalformedURLException {

-		//url = URLEncoder.encode(url);

-		String path = url.getFile();

-		if (!path.endsWith("/")) {

-			int index = path.lastIndexOf('/');

-			if (index != -1)

-				path = path.substring(0, index + 1);

-			// ignore any ref in original URL

-			url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);

-		}

-		return url;

-	}

-

-	/*

-	 * Compares two URL for equality

-	 * Return false if one of them is null

-	 */

-	public static boolean sameURL(URL url1, URL url2) {

-

-		if (url1 == null || url2 == null)

-			return false;

-		if (url1 == url2)

-			return true;

-		if (url1.equals(url2))

-			return true;

-

-		// check if URL are file: URL as we may

-		// have 2 URL pointing to the same featureReference

-		// but with different representation

-		// (i.e. file:/C;/ and file:C:/)

-		if (!"file".equalsIgnoreCase(url1.getProtocol()))

-			return false;

-		if (!"file".equalsIgnoreCase(url2.getProtocol()))

-			return false;

-

-		File file1 = getFileFor(url1);//new File(url1.getFile());

-		File file2 = getFileFor(url2);

-

-		if (file1 == null)

-			return false;

-

-		return (file1.equals(file2));

-	}

-	

-	/*

-	 * Method getFileFor.

-	 * @param url1

-	 * @return File

-	 */

-	private static File getFileFor(URL url1) {

-		if (urlFileMap == null) urlFileMap = new HashMap();

-		if (urlFileMap.get(url1)!=null) return (File)urlFileMap.get(url1);

-		File newFile = new File(url1.getFile());

-		urlFileMap.put(url1,newFile);

-		return newFile; 

-	}

-

-	/*

-	 * returns the list of FeatureReference that are parent of 

-	 * the Feature or an empty array if no parent found.

-	 * @param onlyOptional if set to <code>true</code> only return parents that consider the feature optional

-	 * @param child

-	 * @param possiblesParent

-	 */

-	public static IFeatureReference[] getParentFeatures(IFeature childFeature, IFeatureReference[] possiblesParent, boolean onlyOptional) throws CoreException {

-

-		if (childFeature == null)

-			return new IFeatureReference[0];

-

-		List parentList = new ArrayList();

-		IIncludedFeatureReference[] children = null;

-		IFeature compareFeature = null;

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

-			try {

-				IFeature possibleParentFeature = possiblesParent[i].getFeature(null);

-				if (possibleParentFeature != null) {

-					children = possibleParentFeature.getIncludedFeatureReferences();

-					for (int j = 0; j < children.length; j++) {

-						try {

-							compareFeature = children[j].getFeature(null);

-						} catch (CoreException e) {

-							UpdateCore.warn("", e);

-						}

-						if (childFeature.equals(compareFeature)) {

-							if (onlyOptional) {

-								if (UpdateManagerUtils.isOptional(children[j])) {

-									parentList.add(possiblesParent[i]);

-								} else {

-									UpdateCore.warn("Feature :" + children[j] + " not optional. Not included in parents list.");

-								}

-							} else {

-								parentList.add(possiblesParent[i]);

-							}

-						}

-					}

-				}

-			} catch (CoreException e) {

-				UpdateCore.warn("", e);

-			}

-		}

-

-		IFeatureReference[] parents = new IFeatureReference[0];

-		if (parentList.size() > 0) {

-			parents = new IFeatureReference[parentList.size()];

-			parentList.toArray(parents);

-		}

-		return parents;

-	}

-

-	/*

-	 * returns the list of Features that are parent of 

-	 * the Feature or an empty array if no parent found

-	 * @param onlyOptional if set to <code>true</code> only return parents that consider the feature optional

-	 * @param child

-	 * @param possiblesParent

-	 */

-	public static IFeatureReference[] getParentFeatures(IFeatureReference child, IFeatureReference[] possiblesParent, boolean onlyOptional) throws CoreException {

-

-		if (child == null)

-			return new IFeatureReference[0];

-

-		IFeature childFeature = null;

-		try {

-			childFeature = child.getFeature(null);

-		} catch (CoreException e) {

-			UpdateCore.warn(null, e);

-		}

-

-		if (childFeature == null)

-			return new IFeatureReference[0];

-

-		return getParentFeatures(childFeature, possiblesParent, onlyOptional);

-	}

-

-	/*

-	 * If the return code of the HTTP connection is not 200 (OK)

-	 * thow an IO exception

-	 * 

-	 */

-	public static void checkConnectionResult(Response response,URL url) throws IOException {

-		// did the server return an error code ?

-			int result = response.getStatusCode();

-

-			if (result != IStatusCodes.HTTP_OK) {

-				String serverMsg = response.getStatusMessage();

-				throw new IOException(Policy.bind("ContentReference.HttpNok", new Object[] { new Integer(result), serverMsg, url })); //$NON-NLS-1$						

-			}

-	}

-

-	public static class StreamConsumer extends Thread {

-		InputStream is;

-		byte[] buf;

-		public StreamConsumer(InputStream inputStream) {

-			super();

-			this.setDaemon(true);

-			this.is = inputStream;

-			buf = new byte[512];

-		}

-		public void run() {

-			try {

-				int n = 0;

-				while (n >= 0)

-					n = is.read(buf);

-			} catch (IOException ioe) {

-			}

-		}

-	}

-

-	/**

-	 * Return the optional children to install

-	 * The optional features to install may not all be direct children 

-	 * of the feature.

-	 * Also include non-optional features

-	 * 

-	 * @param children all the nested features

-	 * @param optionalfeatures optional features to install

-	 * @return IFeatureReference[]

-	 */

-	public static IFeatureReference[] optionalChildrenToInstall(IFeatureReference[] children, IFeatureReference[] optionalfeatures) {

-

-		List optionalChildrenToInstall = new ArrayList();

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

-			IFeatureReference optionalFeature = children[i];

-			if (!UpdateManagerUtils.isOptional(optionalFeature)) {

-				optionalChildrenToInstall.add(optionalFeature);

-			} else {

-				for (int j = 0; j < optionalfeatures.length; j++) {

-					if (optionalFeature.equals(optionalfeatures[j])) {

-						optionalChildrenToInstall.add(optionalFeature);

-						break;

-					}

-				}

-			}

-		}

-

-		IFeatureReference[] result = new IFeatureReference[optionalChildrenToInstall.size()];

-		if (optionalChildrenToInstall.size() > 0) {

-			optionalChildrenToInstall.toArray(result);

-		}

-

-		return result;

-	}

-

-	/**

-	 * returns the mapping of matching rules

-	 * the default returns perfect

-	 * 

-	 * @since 2.0.2

-	 */

-	public static int getMatchingRule(String rule) {

-		if (rule == null)

-			return IImport.RULE_PERFECT;

-		int ruleInt = ((Integer) table.get(rule)).intValue();

-		if (ruleInt == IImport.RULE_NONE)

-			return IImport.RULE_PERFECT;

-		return ruleInt;

-	}

-	

-	/**

-	 * returns the mapping of matching id rules

-	 * the default returns perfect

-	 * 

-	 * @since 2.0.2

-	 */

-	public static int getMatchingIdRule(String rule) {

-		if (rule!=null && rule.equalsIgnoreCase("prefix"))

-			return IImport.RULE_PREFIX;

-		return IImport.RULE_PERFECT;

-	}

-	

-	/**

-	 * Method isOptional.

-	 * @param featureReference

-	 * @return boolean

-	 */

-	public static boolean isOptional(IFeatureReference featureReference) {

-		if (featureReference==null) return false;

-		if (featureReference instanceof IIncludedFeatureReference){

-			return ((IIncludedFeatureReference)featureReference).isOptional();

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 */

-	public static boolean isValidEnvironment(IPlatformEnvironment candidate) {

-		if (candidate==null) return false;

-		String os = candidate.getOS();

-		String ws = candidate.getWS();

-		String arch = candidate.getOSArch();

-		String nl = candidate.getNL();

-		if (os!=null && !isMatching(os, SiteManager.getOS())) return false;

-		if (ws!=null && !isMatching(ws, SiteManager.getWS())) return false;

-		if (arch!=null && !isMatching(arch, SiteManager.getOSArch())) return false;

-		if (nl!=null && !isMatchingLocale(nl, SiteManager.getNL())) return false;

-		return true;

-	}

-

-	/**

-	 * 

-	 */	

-	private static boolean isMatching(String candidateValues, String siteValues) {

-		if (siteValues==null) return false;

-		if ("*".equalsIgnoreCase(candidateValues)) return true;

-		siteValues = siteValues.toUpperCase();		

-		StringTokenizer stok = new StringTokenizer(candidateValues, ",");

-		while (stok.hasMoreTokens()) {

-			String token = stok.nextToken().toUpperCase();

-			if (siteValues.indexOf(token)!=-1) return true;

-		}

-		return false;

-	}

-	

-	/**

-	 * 

-	 */	

-	private static boolean isMatchingLocale(String candidateValues, String locale) {

-		if (locale==null) return false;

-		if ("*".equalsIgnoreCase(candidateValues)) return true;

-		

-		locale = locale.toUpperCase();

-		candidateValues = candidateValues.toUpperCase();	

-		StringTokenizer stok = new StringTokenizer(candidateValues, ",");

-		while (stok.hasMoreTokens()) {

-			String candidate = stok.nextToken();

-			if (locale.indexOf(candidate) == 0)

-				return true;

-			if (candidate.indexOf(locale) == 0)

-				return true;

-		}

-		return false;

-	}

-

-	

-/**

- * write XML file

- */

-public static class Writer {

-

-	private PrintWriter w;

-	private OutputStream out;

-	private OutputStreamWriter outWriter;

-	private BufferedWriter buffWriter;

-	private String encoding;

-

-	/*

-	 * 

-	 */

-	private Writer() {

-		super();

-	}

-	

-	public void init(File file, String encoding) throws FileNotFoundException, UnsupportedEncodingException{

-		this.encoding = encoding;

-		out = new FileOutputStream(file);

-		outWriter = new OutputStreamWriter(out, encoding); //$NON-NLS-1$

-		buffWriter = new BufferedWriter(outWriter);

-		w = new PrintWriter(buffWriter);

-	}

-

-	

-	/*

-	 * 

-	 */

-	public void write(IWritable element) {

-		w.println("<?xml version=\"1.0\" encoding=\""+encoding+"\"?>"); //$NON-NLS-1$

-		w.println(""); //$NON-NLS-1$

-		w.println("<!-- File written by Update manager 2.0 -->"); //$NON-NLS-1$

-		w.println("<!-- comments in this file are not preserved -->"); //$NON-NLS-1$

-		w.println(""); //$NON-NLS-1$

-		 ((IWritable) element).write(0, w);

-		close();

-	}

-	

-	/*

-	 * 

-	 */

-	 public void close(){

-	 		w.close();

-	 }

-

-	/*

-	 * 

-	 */

-	private static void appendEscapedChar(StringBuffer buffer, char c) {

-		String replacement = getReplacement(c);

-		if (replacement != null) {

-			buffer.append('&');

-			buffer.append(replacement);

-			buffer.append(';');

-		} else {

-			if ((c >= ' ' && c <= 0x7E) || c == '\n' || c == '\r' || c == '\t') {

-				buffer.append(c);

-			} else {

-				buffer.append("&#"); //$NON-NLS-1$

-				buffer.append(Integer.toString(c));

-				buffer.append(';');

-			}

-		}

-	}

-

-	/*

-	 * 

-	 */

-	public static String xmlSafe(String s) {

-		StringBuffer result = new StringBuffer(s.length() + 10);

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

-			appendEscapedChar(result, s.charAt(i));

-		return result.toString();

-	}

-	

-	/*

-	 * 

-	 */

-	private static String getReplacement(char c) {

-		// Encode special XML characters into the equivalent character references.

-		// These five are defined by default for all XML documents.

-		switch (c) {

-			case '<' :

-				return "lt"; //$NON-NLS-1$

-			case '>' :

-				return "gt"; //$NON-NLS-1$

-			case '"' :

-				return "quot"; //$NON-NLS-1$

-			case '\'' :

-				return "apos"; //$NON-NLS-1$

-			case '&' :

-				return "amp"; //$NON-NLS-1$

-		}

-		return null;

-	}

-}

-	public static Writer getWriter(File file,String encoding) throws FileNotFoundException, UnsupportedEncodingException {

-		if (writer==null) writer = new Writer();

-		writer.init(file,encoding);

-		return writer;

-	}

-	

-	public static boolean isSameTimestamp(URL url, long timestamp) {	

-		try {

-			URL resolvedURL = URLEncoder.encode(url);

-			Response response = UpdateCore.getPlugin().get(resolvedURL);

-			long remoteLastModified = response.getLastModified();

-			// 2 seconds tolerance, as some OS's may round up the time stamp

-			// to the closest second. For safety, we make it 2 seconds.

-			return Math.abs(remoteLastModified - timestamp)/1000 <= 2;

-		} catch (MalformedURLException e) {

-			return false;

-		} catch (IOException e) {

-			return false;

-		}

-	}

-	/**

-	 * The file is associated with a lookup key.

-	 * @param key optional lookup key, or <code>null</code>.

-	 * @param temp the local working file

-	 */

-	public synchronized static void mapLocalFileFragment(String key, FileFragment temp) {

-		// create file association 

-		if (key != null) {

-			if (localFileFragmentMap == null)

-				localFileFragmentMap = new HashMap();

-			localFileFragmentMap.put(key, temp);

-		}

-	}

-

-	/**

-	 * The file is associated with a lookup key.

-	 * @param key optional lookup key, or <code>null</code>.

-	 */

-	public synchronized static void unMapLocalFileFragment(String key) {

-		// remove file association 

-		if (key != null && localFileFragmentMap !=null) {

-			localFileFragmentMap.remove(key);

-		}

-	}

-	

-	/**

-	 * Returns a previously cached local file (in temporary area) matching the

-	 * specified key. 

-	 * 

-	 * @param key lookup key

-	 * @return cached file, or <code>null</code>.

-	 */

-	public static synchronized FileFragment lookupLocalFileFragment(String key) {

-		if (localFileFragmentMap == null)

-			return null;

-		return (FileFragment) localFileFragmentMap.get(key);

-	}

-	

-	/**

-	 * Copies specified input stream to the output stream. Neither stream

-	 * is closed as part of this operation.

-	 * 

-	 * @param is input stream

-	 * @param os output stream

-	 * @param monitor progress monitor

-     * @param expectedLength - if > 0, the number of bytes from InputStream will be verified

-	 * @@return the offset in the input stream where copying stopped. Returns -1 if end of input stream is reached.

-	 * @since 2.0

-	 */

-	public static long copy(InputStream is, OutputStream os, InstallMonitor monitor, long expectedLength) {

-		byte[] buf = getBuffer();

-		long offset=0;

-		try {

-			int len = is.read(buf);

-			int nextIncrement = 0;

-			while (len != -1) {

-				os.write(buf, 0, len);

-					offset += len;

-				if (monitor != null) {

-					nextIncrement += len;

-					// update monitor periodically

-					if (nextIncrement >= INCREMENT_SIZE){ 	

-						monitor.incrementCount(nextIncrement);

-						nextIncrement = 0;

-					}

-					if (monitor.isCanceled()) {

-						return offset;

-					}

-				}

-				if (expectedLength > 0 && offset == expectedLength) {

-					// everything read do not return offset, otherwise trying

-					// to read again from this offset will result in HTTP 416

-					break;

-				}

-				

-				len = is.read(buf);

-			}

-			if (nextIncrement > 0 && monitor != null)

-				monitor.incrementCount(nextIncrement);

-			if(expectedLength>0 && offset!=expectedLength)

-				throw new IOException("InputStream ended after "+ offset +" bytes (expected "+expectedLength+").");

-			return -1;

-		} catch(IOException e){

-			// Log the actual error, as this is no longer

-			// passed up the calling stack

-			UpdateCore.log("UpdateManagerUtils.copy(): " + offset, e);

-			return offset;

-		} finally {

-			freeBuffer(buf);

-		}

-	}

-

-	public static class CopyException extends Exception {

-		Exception rootException;

-		int bytesCopied;

-

-		/**

-		 * 

-		 */

-		public CopyException(Exception rootException, int bytesCopied) {

-			super();

-			this.rootException= rootException;

-			this.bytesCopied=bytesCopied;

-		}

-		/**

-		 * Instance of IOException or InstallAbortedException

-		 * @return

-		 */

-		public Exception getRootException(){

-			return rootException;

-		}

-		public int getBytesCopied(){

-			return bytesCopied;

-		}

-

-	}

-	

-	private static synchronized byte[] getBuffer() {

-		if (bufferPool == null) {

-			return new byte[BUFFER_SIZE];

-		}

-

-		try {

-			return (byte[]) bufferPool.pop();

-		} catch (EmptyStackException e) {

-			return new byte[BUFFER_SIZE];

-		}

-	}

-

-	private static synchronized void freeBuffer(byte[] buf) {

-		if (bufferPool == null)

-			bufferPool = new Stack();

-		bufferPool.push(buf);

-	}

-	

-	

-	/**

-	 * Returns a list of fragments. Zero length if no fragments.

-	 * @param bundle the bundle to get fragments for

-	 */

-	public static FragmentEntry[] getFragments(Bundle bundle) {

-		PackageAdmin pkgAdmin = UpdateCore.getPlugin().getPackageAdmin();

-		Bundle[] fragmentBundles = pkgAdmin.getFragments(bundle);

-		if (fragmentBundles == null) 

-			return noFragments;

-		

-		FragmentEntry[] fragments = new FragmentEntry[fragmentBundles.length];

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

-			fragments[i] = new FragmentEntry((String) fragmentBundles[i]

-					.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME),

-					(String) fragmentBundles[i].getHeaders().get(

-							Constants.BUNDLE_VERSION), Platform

-							.getResourceString(fragmentBundles[i],

-									(String) fragmentBundles[i].getHeaders()

-											.get(Constants.BUNDLE_VERSION)),

-					fragmentBundles[i].getLocation());

-		}

-		return fragments;	

-	}

-}


diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdatePreferencesInitializer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdatePreferencesInitializer.java
deleted file mode 100644
index b7175dc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdatePreferencesInitializer.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-
-/**
- * Class to initialize the preferences for the Update core plugin.
- */
-public class UpdatePreferencesInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * Default constructor
-	 */
-	public UpdatePreferencesInitializer() {
-		super();
-	}
-
-	/**
-	 * Initializes the default preferences settings for this plug-in.
-	 * <p>
-	 * This method is called sometime after the preference store for this
-	 * plug-in is created. Default values are never stored in preference
-	 * stores; they must be filled in each time. This method provides the
-	 * opportunity to initialize the default values.
-	 * </p>
-	 * <p>
-	 * The default implementation of this method does nothing. A subclass that needs
-	 * to set default values for its preferences must reimplement this method.
-	 * Default values set at a later point will override any default override
-	 * settings supplied from outside the plug-in (product configuration or
-	 * platform start up).
-	 * </p>
-	 */
-	public void initializeDefaultPreferences() {
-		Plugin plugin = UpdateCore.getPlugin();
-		plugin.getPluginPreferences().setDefault(UpdateCore.P_CHECK_SIGNATURE, true);		
-		plugin.getPluginPreferences().setDefault(UpdateCore.P_HISTORY_SIZE, UpdateCore.DEFAULT_HISTORY);
-		plugin.getPluginPreferences().setDefault(UpdateCore.P_UPDATE_VERSIONS, UpdateCore.EQUIVALENT_VALUE);
-		
-		// If proxy host and port are set as system properties, use them as defaults
-		String proxyHost = System.getProperty("http.proxyHost"); //$NON-NLS-1$
-		if (proxyHost != null && proxyHost.trim().length() > 0) {
-			String proxyPort = System.getProperty("http.proxyPort"); //$NON-NLS-1$
-			if (proxyPort == null || proxyPort.trim().length() == 0)
-				proxyPort = "80"; //$NON-NLS-1$
-			plugin.getPluginPreferences().setDefault(UpdateCore.HTTP_PROXY_ENABLE, true);
-			plugin.getPluginPreferences().setDefault(UpdateCore.HTTP_PROXY_HOST, proxyHost);
-			plugin.getPluginPreferences().setDefault(UpdateCore.HTTP_PROXY_PORT, proxyPort);
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
deleted file mode 100644
index 88f928f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.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.internal.core;
-import java.io.*;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.model.*;
-
-/**
- * Default implementation of a IVolume
- */
-public class Volume extends ModelObject implements IVolume {
-
-	private long size;
-	private int type;
-	private String label;
-	private File root;
-
-	/**
-	 * Constructor for Volume.
-	 */
-	public Volume(File root,String label,int type,long size) {
-		super();
-		this.root = root;
-		this.label = label;
-		this.type = type;
-		this.size = size;
-	}
-
-	/**
-	 * @see IVolume#getFreeSpace()
-	 */
-	public long getFreeSpace() {
-		return size;
-	}
-
-	/**
-	 * @see IVolume#getLabel()
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * @see IVolume#getType()
-	 */
-	public int getType() {
-		return type;
-	}
-
-	/**
-	 * @see IVolume#getFile()
-	 */
-	public File getFile() {
-		return root;
-	}
-
-	public Object getAdapter(Class arg0) {
-		return null;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
deleted file mode 100644
index 0bf37c8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
+++ /dev/null

@@ -1,324 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# Install Update Core Properties File
-# 
-
-BaseSiteFactory.CannotRetriveParentDirectory=Unable to retrieve parent directory for URL \"{0}\".
-BaseSiteFactory.CannotEncodeURL= Unable to encode URL \"{0}\".
-
-ContentReference.UnableToCreateInputStream= Unable to create an input stream for the reference \"{0}\".
-ContentReference.UnableToReturnReferenceAsFile= Unable to return reference \"{0}\" as File.
-ContentReference.UnableToReturnReferenceAsURL= Unable to return reference \"{0}\" as URL.
-ContentReference.HttpNok= Server returned HTTP response code: \"{0} {1}\" for URL: {2}.
-ContentReference.FileDoesNotExist=The file \"{0}\" does not exist on the file system.
-
-Feature.SiteAlreadySet= Internal Error: Site already set for the feature \"{0}\".
-Feature.TaskInstallFeatureFiles= Installing feature files: 
-Feature.TaskInstallPluginFiles= Installing plug-in \"{0}\" files:
-Feature.TaskInstallNonPluginsFiles= Installing non-plug-in files: 
-Feature.NoContentProvider= Internal Error. The feature \"{0}\" does not have a content provider.
-Feature.NoFeatureContentConsumer= Internal Error. The Feature \"{0}\" does not have a content consumer.
-Feature.NoURL= Unknown URL.
-Feature.FeatureVersionToString= Feature: \"{0}\" Version: \"{1}\".
-Feature.InstallationCancelled= Installation has been cancelled by the User.
-Feature.UnableToInitializeFeatureReference= Unable to initialize feature reference for versioned identifier \"{0}\".
-
-FeatureContentProvider.Downloading= Downloading:
-FeatureContentProvider.UnableToRetrieve= Unable to retrieve remote reference \"{0}\".
-FeatureContentProvider.UnableToCreate= Unable to create local file \"{0}\".
-FeatureContentProvider.ExceptionDownloading = An exception occured while downloading feature from \"{0}\".
-
-InstallHandler.unableToCreateHandler = Unable to create custom install handler for feature \"{0}\".
-InstallHandler.notFound = Custom install handler required by feature \"{0}\" was not found.
-InstallHandler.invalidHandler = Feature \"{0}\" contains invalid custom install handler.
-InstallHandler.callException = Error reported by custom install handler for feature \"{0}\".
-InstallHandler.deactivated = Custom install handler for feature \"{0}\" deactivated due to errors.
-InstallHandler.error = Unable to complete action for feature \"{0}\" due to errors.
-
-InstallMonitor.DownloadSize = ({0}K bytes)
-InstallMonitor.DownloadSizeLong = ({0}K of {1}K bytes)
-
-Reconciler.appNotFound = Application \"{0}\" not found.
-
-JarContentReference.Unpacking= Unpacking:
-
-Site.CannotSaveSiteInto= Cannot save Site information into the File: \"{0}\".
-Site.CannotFindCategory= Unable to find category: \"{0}\" in Site: \"{1}\".
-Site.NoCategories= The Site does not contain any categories.
-Site.NoContentProvider= Internal Error. Content Provider not set for Site: \"{0}\".
-
-VersionedIdentifier.IdOrVersionNull= Internal Error. Unable to create an Identifier. The unique identifier or the version is null or empty: unique identifier=\"{0}\" version=\"{1}\".
-
-SiteFile.CannotRemovePlugin= Unable to remove plug-in: \"{0}\" from Site: \"{1}\".
-SiteFile.CannotRemoveFeature= Unable to remove feature: \"{0}\" from Site: \"{1}\".
-SiteFile.UnableToCreateURL= Unable to create URL for location \"{0}\".
-SiteFile.Removing= Removing: 
-
-SiteFileFactory.UnableToCreateURL= Internal Error. Unable to create URL from \"{0}\".
-SiteFileFactory.UnableToAccessSite= Unable to access Site stream.
-SiteFileFactory.DirectoryDoesNotExist=The directory \"{0}\" does not exist on the file system.
-
-DefaultFeatureParser.NoFeatureTag= Error parsing feature stream. Unable to find root element \"feature\" in the stream.
-DefaultFeatureParser.WrongParsingStack= Internal Error parsing feature stream. Unexpected Parsing Stack: \"{0}\"
-DefaultFeatureParser.UnknownElement= Error parsing feature stream. Unknown element \"{0}\" in parsing state \"{1}\". Check the validity of the XML file.
-DefaultFeatureParser.TooManyURLtag= Error parsing feature stream. There is more than one \"URL\" element in the XML stream. There should be only one.
-DefaultFeatureParser.UnknownStartState= Internal Error parsing feature stream. Unknown start state \"{0}\".
-DefaultFeatureParser.IdOrVersionInvalid= Error parsing feature stream. The unique identifier or the version is null or empty for the State: \"{2}\": unique identifier=\"{0}\" version=\"{1}\".
-DefaultFeatureParser.MissingId= Error parsing feature stream. The \"id\" tag of the element \"{0}\" is null or empty. Value is required.
-DefaultFeatureParser.ParsingStackBackToInitialState= Internal Error parsing feature stream. Parsing stack back to Initial State.
-DefaultFeatureParser.ElementAlreadySet= Error parsing feature stream. Element: \"{0}\" already set for the feature.
-DefaultFeatureParser.StateIncludeWrongElement= Error parsing feature stream. State: \"{0}\" should not include Element \"{1}\".
-DefaultFeatureParser.RequireStateWithoutImportElement=Error parsing feature stream. State: \"require\" must include at least an \"import\" element.
-DefaultFeatureParser.MissingPatchVersion=Error parsing feature stream. Attribute "version" of the element "import" must be set when "patch" is set to "true".
-DefaultFeatureParser.wrongMatchForPatch=Error parsing feature stream. When attribute "patch" of the element "import" is set to "true", the only valid value for the "match" attribute is "perfect". 
-DefaultFeatureParser.patchWithPlugin=Error parsing feature stream. Attribute "patch" can only be used for features.
-DefaultFeatureParser.MultiplePatchImports=Error parsing feature stream. State: "require" must not contain more than one "import" element with the attribute "patch" set to "true".
-DefaultFeatureParser.UnknownEndState= Internal Error parsing feature stream. Unknown end state \"{0}\".
-DefaultFeatureParser.ErrorParsing= Error Parsing feature stream. Error: \"{0}\"
-DefaultFeatureParser.ErrorlineColumnMessage= Error Parsing feature stream. Element \"{0}\" line: \"{1}\" column:\"{2}\". Error: \"{3}\".
-DefaultFeatureParser.ErrorParsingFeature= Error Parsing feature stream.
-DefaultFeatureParser.UnknownState= Unknown State \"{0}\".
-DefaultFeatureParser.NoLicenseText= Error parsing feature stream. State: \"license\" must include some text.
-
-# 2.0.2
-DefaultFeatureParser.PluginAndFeatureId=One Import statement is incorrect: Both feature and plug-in ID are either null or specified.
-
-SiteContentProvider.ErrorCreatingURLForArchiveID= Internal Error. Unable to create URL for Archive Identifier \"{0}\" on Site \"{1}\".
-
-DefaultSiteParser.NoSiteTag= Error parsing site stream. Unable to find root element \"site\" in the stream.
-DefaultSiteParser.WrongParsingStack= Internal Error parsing site stream. Unexpected Parsing Stack: \"{0}\"
-DefaultSiteParser.UnknownElement= Error parsing site stream. Unknown element \"{0}\" in parsing state \"{1}\". Check the validity of the XML file.
-DefaultSiteParser.UnknownStartState= Internal Error parsing site stream. Unknown start state \"{0}\".
-DefaultSiteParser.Missing= Error parsing site stream. The \"{0}\" tag of the element \"{1}\" is null or empty. Value is required.
-DefaultSiteParser.ParsingStackBackToInitialState= Internal Error parsing site stream. Parsing stack back to Initial State.
-DefaultSiteParser.ElementAlreadySet= Error parsing site stream. Element: \"{0}\" already set for the Site.
-DefaultSiteParser.CategoryAlreadySet= Error parsing site stream. Element: \"{0}\": \"{1}\" already set for the Site.
-DefaultSiteParser.UnknownEndState= Internal Error parsing site stream. Unknown end state \"{0}\".
-DefaultSiteParser.ErrorParsing= Error Parsing site stream. Error: \"{0}\"
-DefaultSiteParser.ErrorlineColumnMessage= Error Parsing site stream. Element \"{0}\" line: \"{1}\" column:\"{2}\". Error: \"{3}\".
-DefaultSiteParser.ErrorParsingSite= Error Parsing site stream.
-DefaultSiteParser.UnknownState= Unknown State \"{0}\".
-DefaultSiteParser.InvalidXMLStream= The XML stream is not a valid default \"site.xml\" file. The root tag is not site.
-
-ModelObject.ModelReadOnly= Internal Error. The Model Object is read-only.
-
-SiteModelObject.ErrorParsingSiteStream= Error parsing site stream.
-SiteModelObject.ErrorAccessingSiteStream= Error accessing site stream.
-
-InstallConfiguration.ParsingErrorDuringCreation= Internal Error parsing \"{0}\": \"{1}\".
-InstallConfiguration.ErrorDuringFileAccess= Error accessing file: \"{0}\".
-
-Parser.UnableToCreateURL= Internal Error parsing stream. Check the validity of the URLs.
-Parser.InternalError= Error Parsing Stream. An internal error occurred. \"{0}\".
-Parser.UnableToResolveURL= Internal Error parsing stream. Unable to resolve URL \"{0}\".
-
-InstallConfigurationParser.FeatureReferenceNoURL= Error Parsing Stream. A feature reference element does not have a URL tag. Value is required.
-
-FeatureExecutableContentProvider.FileDoesNotExist= The file \"{0}\" does not exist.
-FeatureExecutableContentProvider.InvalidDirectory= The path \"{0}\" is not a valid directory.
-FeatureExecutableContentProvider.UnableToCreateURLFor=Unable to create a URL for \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrieveArchive=Error retrieving the archive entry: \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrieveNonPluginEntry=Error retrieving the non-plug-in entry: \"{0}\". 
-FeatureExecutableContentProvider.UnableToRetrieveFeatureEntry=Error retrieving feature entry content reference: \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrievePluginEntry =Error retrieving the plug-in entry: \"{0}\". 
-
-ConfiguredSite.NonInstallableSite= You cannot install in the site \"{0}\". It is considered non updateable.
-ConfiguredSite.NullFeatureToInstall= Internal Error. The feature to be installed is null.
-ConfiguredSite.NonUninstallableSite= You cannot uninstall from the site \"{0}\". It is considered non updateable.
-ConfiguredSite.NoSite= No Site
-ConfiguredSite.CannotFindFeatureToUnconfigure= Internal Error. Unable to disable feature \"{0}\" on site \"{1}\". Cannot find feature.
-ConfiguredSite.CannotFindFeatureToConfigure= Internal Error. Unable to enable feature \"{0}\". Cannot find feature. 
-ConfiguredSite.CannotFindPluginEntry= Unable to retrieve Plug-in Entry \"{0}\" on site \"{1}\". Cannot find plug-in entry. Do you want to Continue ?
-ConfiguredSite.MissingPluginsBrokenFeature= Plug-in \"{0}\" version \"{1}\" referenced by this feature is missing.
-ConfiguredSite.UnableToRemoveConfiguredFeature= Unable to remove a enabled feature: \"{0}\" You must disable the feature first.
-ConfiguredSite.UnableToFindFeature= Unable to Find the feature \"{0}\" on this site.
-ConfiguredSite.SiteURLNull=The Site URL is null.
-ConfiguredSite.NonLocalSite=The Site is not on the local file system. Cannot validate. 
-ConfiguredSite.NotSameProductId=The site cannot be modified by this product. It is already associated with product: \"{0}\".
-ConfiguredSite.ContainedInAnotherSite=This site is contained in another site: \"{0}\".
-ConfiguredSite.ReadOnlySite=The site is marked as read only.
-ConfiguredSite.UnableResolveURL= Internal Error. Unable to resolve URL \"{0}\".
-ConfiguredSite.UnableToAccessSite= Internal Error. Unable to access platform site \"{0}\".
-
-FeatureFactory.CreatingError= Error creating feature \"{0}\".
-FeatureModelFactory.ErrorAccesingFeatureStream= Error accessing feature stream.
-
-FeatureExecutableFactory.NullURL= Error creating feature. The URL used to create the feature is null.
-FeatureExecutableFactory.CannotCreateURL= Error creating feature. Unable to create URL for \"{0}\".
-
-FeaturePackagedContentProvider.NoManifestFile= Unable to retrieve \"{0}\" in feature located at \"{1}\". 
-FeaturePackagedContentProvider.NoFeature= No feature
-FeaturePackagedContentProvider.FileDoesNotExist= The File \"{0}\" does not exist.
-FeaturePackagedContentProvider.InvalidDirectory= The directory \"{0}\" is not a valid directory.
-FeaturePackagedContentProvider.ErrorRetrieving= Error retrieving \"{0}\".
-FeaturePackagedContentProvider.ContentReferenceString= from \"{0}\"
-FeaturePackagedContentProvider.URLString= located at \"{0}\"
-
-FeatureReference.UnableToResolveURL= Internal Error: Unable to resolve model using URL: \"{0}\".
-
-FeatureTypeFactory.UnableToFindFeatureFactory= Unable to find a feature factory for the extension id \"{0}\". 
-
-InstallConfiguration.UnableToSaveConfiguration= Unable to save configuration in \"{0}\".
-InstallConfiguration.UnableToEncodeConfiguration= Unable to encode configuration in \"{0}\".
-InstallConfiguration.UnableToCreateURL= Unable to create URL from \"{0}\".
-InstallConfiguration.UnableToCast= Internal Error. The Configuration Site object is not a subclass of ConfiguredSiteModel
-InstallConfiguration.UnableToSavePlatformConfiguration=Unable to save platform configuration in \"{0}\".
-InstallConfiguration.AlreadyNativelyLinked=The site is already linked.
-InstallConfiguration.AlreadyProductSite=The location is already a product site.
-InstallConfiguration.NotAnExtensionSite=The site cannot be linked to. It is not an extension site.
-
-InternalSiteManager.UnableToCreateSiteWithType= Extension Error. The Site Factory of type \"{0}\" cannot access the Site \"{1}\".
-InternalSiteManager.UnableToAccessURL= Unable to access \"{0}\".
-InternalSiteManager.UnableToCreateURL= Unable to create URL from \"{0}\".
-InternalSiteManager.UnableToParseURL= Unable to parse the stream \"{0}\".
-InternalSiteManager.FailedRetryAccessingSite= Failed retry accessing site using default installed format instead of default packaged format.
-InternalSiteManager.ConnectingToSite = Connecting To Site...
-
-SiteReconciler.UnableToFindInstallDeltaFactory= Internal Error: Unable to find factory to display changes. Open the Update Manager manually.
-
-Policy.NoMessageAvailable= No message available.
-Policy.MissingMessage= Missing message: \"{0}\".
-Policy.Missing= missing \"{0}\".
-
-GlobalConsumer.ErrorCreatingFile= Unable to create file \"{0}\".
-
-SiteFileContentConsumer.UnableToCreateURL= Unable to create URL from \"{0}\".
-SiteFileContentConsumer.UnableToCreateURLForFile= Unable to create URL for the file \"{0}\".
-
-ContentConsumer.UnableToRename = Internal Error. Unable to rename \"{0}\" to \"{1}\".
-
-SiteFileFactory.UnableToRetriveSite= Unable retrieve this Site from a directory. The URL should point to a file instead.
-SiteFileFactory.UnableToObtainParentDirectory= Unable obtain the parent directory from the file \"{0}\".
-SiteFileFactory.FileDoesNotExist= Unable to access site \"{0}\". The directory does not exist.
-SiteFileFactory.UnableToCreateURLForFile= Unable to create URL from \"{0}\".
-SiteFileFactory.ErrorParsingFile= Unable to parse file \"{0}\".
-SiteFileFactory.ErrorAccessing= Unable to access file \"{0}\".
-
-SiteTypeFactory.UnableToFindSiteFactory= Unable to find a site factory for the extension id \"{0}\". 
-
-UpdateManagerUtils.UnableToRemoveFile= Unable to remove \"{0}\" from the file system.
-UpdateManagerUtils.FileAlreadyExists= Unable to create \"{0}\" on the file system. File already exists.
-
-SiteLocal.ErrorParsingSavedState= Error during parsing of the configuration saved state \"{0}\".
-SiteLocal.UnableToCreateURLFor= Unable to create URL from \"{0}\".
-SiteLocal.UnableToAccessFile= Unable to access file \"{0}\".
-SiteLocal.UnableToSaveStateIn= Unable to persist configurations into \"{0}\".
-SiteLocal.UnableToEncodeConfiguration= Unable to encode configurations into \"{0}\".
-SiteLocal.UnableToResolve= Internal Error. Unable to resolve \"{0}\".
-SiteLocal.UnableToRetrieveRWArea= Internal Error. Unable to retrieve location to write metadata.
-SiteLocal.SiteUrlIsNull= Internal Error: URL of local site is null.
-SiteLocal.UnableToDetermineFeatureStatusSiteNull=Unable to determine status of feature\"{0}\" The site is NULL.
-SiteLocal.TwoVersionSamePlugin1=Plug-in: \"{0}\" version: \"{1}\" referenced by this feature is not included at runtime. Runtime includes plug-in version \"{2}\".
-SiteLocal.TwoVersionSamePlugin2=Plug-in: \"{0}\" version: \"{1}\" referenced by this feature is not included at runtime. Runtime includes plug-in version \"{2}\" supplied by feature \"{3}\" version \"{4}\".
-SiteLocal.FeatureUnHappy=The feature is not configured properly.
-SiteLocal.FeatureHappy=The feature is configured properly.
-SiteLocal.FeatureAmbiguous=The feature may not be configured properly.
-SiteLocal.NestedFeatureUnHappy=Included feature \"{0}\" version \"{1}\" contains problems.
-SiteLocal.NestedFeatureUnavailable=Included feature \"{0}\" is missing.
-SiteLocal.NoPluginVersion=No plug-in: \"{0}\" included at runtime.
-
-#202
-SiteLocal.UnableToDetermineFeatureStatusConfiguredSiteNull=Unable to determine status of feature\"{0}\" The Configured Site is NULL.
-SiteLocal.FeatureDisable=The feature is disabled.
-SiteLocal.FeatureStatusUnknown=Unknown state.
-SiteLocal.NestedFeatureDisable=Included feature \"{0}\" version \"{1}\" is disabled.
-SiteLocal.NullFeature=The feature is null.
-SiteLocal.WrongURL=A URL of an Originating site is not valid.
-
-SiteReconciler.UnableToSaveStateIn= Unable to persist delta change into \"{0}\".
-SiteReconciler.UnableToEncodeConfiguration= Unable to encode delta change into \"{0}\".
-
-SiteURLFactory.UnableToCreateURL= Internal Error. Unable to create a URL from \"{0}\".
-SiteURLFactory.UnableToAccessSiteStream= Unable to access Site stream: \"{0}\"
-
-JarVerifier.Verify= Verifying: \"{0}\"
-JarVerifier.UnableToFindEncryption= Unable to find algorithm to verify integrity of KeyStore \"{0}\".
-JarVerifier.UnableToLoadCertificate= Unable to load one or multiples certificates in the KeyStore \"{0}\".
-JarVerifier.UnableToFindProviderForKeystore= Unable to find provider for the KeyStore type \"{0}\".
-JarVerifier.KeyStoreNotLoaded= Internal Error. KeyStore not Initialized/Loaded.
-JarVerifier.UnableToAccessJar= Unable to access JAR file \"{0}\".
-JarVerifier.InvalidFile= The File \"{0}\" is not a valid JAR file. It does not contain a Manifest.
-JarVerifier.InvalidJar= The File \"{0}\" is not a valid JAR file.
-
-JarVerificationResult.ValidBetween= Valid between \"{0}\" and \"{1}\".
-JarVerificationResult.ExpiredCertificate= * EXPIRED CERTIFICATE *
-JarVerificationResult.CertificateNotYetValid= * CERTIFICATE NOT YET VALID *
-JarVerificationResult.CertificateValid= Valid certificate.
-
-JarVerificationService.UnsucessfulVerification=Verification of feature unsuccessful. Installation cancelled.
-JarVerificationService.CancelInstall=Installation cancelled.
-
-UpdateManagerUtils.UnableToLog=Unable to access error recovery log file: \"{0}\".
-
-ConfigurationPolicy.UnableToDisable= Unable to disable feature \"{0}\".
-ConfigurationPolicy.ParentIsEnable= The parent feature: \"{0}\" is enable.
-
-ConnectionThreadManager.tooManyConnections = There are too many network connections still active. \
-If you are experiencing network problems, try again later. If the error persists, restart the \
-application.
-ConnectionThreadManager.unresponsiveURL = Still waiting for response: {0}
-
-IncludedFeatureReference.featureUninstalled= Feature {0} is uninstalled.
-
-
-# Properties moved mostly from the ui plugin
-
-ActivityConstraints.warning=The current configuration contains errors and this operation can have unpredictable results.
-ActivityConstraints.rootMessage = Requested operation cannot be performed because it would invalidate the current configuration. See details for more information.
-ActivityConstraints.rootMessageInitial = Current configuration contains errors that are not corrected by the requested operation and more errors would be introduced. See details for more information.
-ActivityConstraints.beforeMessage = ----- Current configuration problems -----
-ActivityConstraints.afterMessage = ----- Configuration problems after the operation -----
-ActivityConstraints.platform = Resulting configuration does not contain the platform.
-ActivityConstraints.primary = Resulting configuration does not contain the primary feature.
-ActivityConstaints.prereq.plugin = plug-in
-ActivityConstaints.prereq.feature = feature
-ActivityConstraints.prereq = requires {0} "{1}".
-ActivityConstraints.prereqPerfect = requires {0} "{1} ({2})".
-ActivityConstraints.prereqEquivalent = requires {0} "{1} ({2})", or equivalent.
-ActivityConstraints.prereqCompatible = requires {0} "{1} ({2})", or compatible.
-ActivityConstraints.prereqGreaterOrEqual = requires {0} "{1} ({2})", or later version.
-ActivityConstraints.os = operating system does not match current environment.
-ActivityConstraints.ws = windowing system does not match current environment.
-ActivityConstraints.arch = platform architecture does not match current environment.
-ActivityConstraints.cycle = definition contains a nested features cycle: {0}_{1}prereq
-ActivityConstraints.conflict = Update conflict detected (see details). Please deselect this update and try again.
-ActivityConstraints.childMessage = {0} ({1}) {2}
-ActivityConstraints.optionalChild = Feature included in another feature cannot be enabled if the parent is disabled. Enable the parent first.
-ActivityConstraints.patchUnconfigure = is a patch and cannot be directly disabled. Use 'Revert' to restore \
-the last configuration before the patch was installed.
-ActivityConstraints.patchUnconfigureBackup = is a patch and cannot be directly disabled. Use 'Revert' to restore \
-configuration "{0}" in Saved Configurations.
-ActivityConstraints.timeline = Cannot revert to "{0}" because it is not compatible with the current configuration.
-ActivityConstraints.exclusive = must be processed separately from other features.
-ActivityConstraints.noLicense = does not have a valid license agreement.
-ActivityConstraints.readOnly = The site is not updateable: {0}.
-ActivityConstraints.platformModified = Platform configuration has been modified outside this program. A restart is recommended.
-
-DuplicateConflictsDialog.conflict = Version {0} in {1}
-
-
-UpdateManager.savedConfig = {0} backup
-
-OperationsManager.error.unable={0}: unable to locate configuration site
-OperationsManager.error.old= {0}: Error while updating the old feature version
-OperationsManager.installing=Initializing...
-OperationsManager.error.uninstall= {0} : Error while uninstalling feature
-
-Search.networkProblems=Network connection problems encountered during search.
-MissingFeature.id=unknown
-MissingFeature.desc.unknown=This feature reference cannot be resolved.
-MissingFeature.desc.optional=This feature is referenced as optional and is currently not installed.
-MissingFeature.provider=Unknown
-
-InstallConfiguration.location.exists = Site already exists.
-
-InstallLogParser.errors = Errors generated while parsing installation history file.
-

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorCommand.java
deleted file mode 100644
index dee690b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorCommand.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.mirror;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.standalone.*;
-
-/**
- * Mirrors a remote site locally.
- */
-public class MirrorCommand extends ScriptedCommand {
-
-	private String featureId;
-	private String featureVersion;
-	private String fromSiteUrl;
-	private String toSiteDir;
-	private String mirrorURL;
-	private MirrorSite mirrorSite;
-
-	public MirrorCommand(
-		String featureId,
-		String featureVersion,
-		String fromSiteUrl,
-		String toSiteDir,
-		String mirrorUrl) {
-		this.featureId = featureId;
-		this.featureVersion = featureVersion;
-		this.fromSiteUrl = fromSiteUrl;
-		this.toSiteDir = toSiteDir;
-		this.mirrorURL = mirrorUrl;
-	}
-
-	/**
-	 * true if success
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		if (!validateParameters()) {
-			return false;
-		}
-
-		try {
-			if (getMirrorSite() == null)
-				return false;
-
-			URL remoteSiteUrl = new URL(fromSiteUrl);
-			ISite remoteSite =
-				SiteManager.getSite(remoteSiteUrl, new NullProgressMonitor());
-
-			ISiteFeatureReference featureReferencesToMirror[] =
-				findFeaturesToMirror(remoteSite);
-			if (featureReferencesToMirror.length == 0) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(
-					Utilities.newCoreException(
-						"No matching features found on " + remoteSiteUrl + ".",
-						null));
-				return false;
-			}
-
-			mirrorSite.mirrorAndExpose(
-				remoteSite,
-				featureReferencesToMirror,
-				null,
-				mirrorURL);
-			return true;
-		} catch (MalformedURLException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		} catch (CoreException ce) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(ce);
-			return false;
-		} finally {
-			JarContentReference.shutdown();
-		}
-	}
-	private boolean validateParameters() {
-		if (fromSiteUrl == null || fromSiteUrl.length() <= 0) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(
-				Utilities.newCoreException("from parameter is missing.", null));
-			return false;
-		}
-		try {
-			new URL(fromSiteUrl);
-		} catch (MalformedURLException mue) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(
-				Utilities.newCoreException("from must be a valid URL", null));
-			return false;
-		}
-		if (toSiteDir == null || toSiteDir.length() <= 0) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(
-				Utilities.newCoreException("to parameter is missing.", null));
-			return false;
-		}
-		return true;
-	}
-	private MirrorSite getMirrorSite()
-		throws MalformedURLException, CoreException {
-		// Create mirror site
-		if (mirrorSite == null) {
-			if (toSiteDir != null) {
-				MirrorSiteFactory factory = new MirrorSiteFactory();
-				System.out.print("Analyzing features already mirrored ...");
-				try {
-					mirrorSite =
-						(MirrorSite) factory.createSite(new File(toSiteDir));
-				} catch (InvalidSiteTypeException iste) {
-				}
-				System.out.println("  Done.");
-			}
-			if (mirrorSite == null) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(
-					Utilities.newCoreException(
-						"Mirror site at " + toSiteDir + " cannot be accessed.",
-						null));
-				return null;
-			}
-		}
-		return mirrorSite;
-
-	}
-	/**
-	 * Returns subset of feature references on remote site
-	 * as specified by optional featureId and featureVersion
-	 * parameters
-	 * @param remoteSite
-	 * @return ISiteFeatureReference[]
-	 * @throws CoreException
-	 */
-	private ISiteFeatureReference[] findFeaturesToMirror(ISite remoteSite)
-		throws CoreException {
-		ISiteFeatureReference remoteSiteFeatureReferences[] =
-			remoteSite.getRawFeatureReferences();
-		SiteFeatureReferenceModel existingFeatureModels[] =
-			mirrorSite.getFeatureReferenceModels();
-		Collection featureReferencesToMirror = new ArrayList();
-
-		PluginVersionIdentifier featureVersionIdentifier = null;
-
-		if (featureId == null) {
-			System.out.println(
-				"Parameter feature not specified.  All features on the remote site will be mirrored.");
-		}
-		if (featureVersion == null) {
-			System.out.println(
-				"Parameter version not specified.  All versions of features on the remote site will be mirrored.");
-		} else {
-			featureVersionIdentifier =
-				new PluginVersionIdentifier(featureVersion);
-		}
-		for (int i = 0; i < remoteSiteFeatureReferences.length; i++) {
-			VersionedIdentifier remoteFeatureVersionedIdentifier =
-				remoteSiteFeatureReferences[i].getVersionedIdentifier();
-
-			if (featureId != null
-				&& !featureId.equals(
-					remoteFeatureVersionedIdentifier.getIdentifier())) {
-				// id does not match
-				continue;
-			}
-			if (featureVersionIdentifier != null
-				&& !featureVersionIdentifier.isPerfect(
-					remoteFeatureVersionedIdentifier.getVersion())) {
-				// version does not match
-				continue;
-			}
-
-			for (int e = 0; e < existingFeatureModels.length; e++) {
-				if (existingFeatureModels[e]
-					.getVersionedIdentifier()
-					.equals(remoteFeatureVersionedIdentifier)) {
-					System.out.println(
-						"Feature "
-							+ remoteFeatureVersionedIdentifier
-							+ " already mirrored and exposed.");
-					// feature already mirrored and exposed in site.xml
-					continue;
-				}
-			}
-
-			// Check feature type
-			String type =
-				((SiteFeatureReference) remoteSiteFeatureReferences[i])
-					.getType();
-			if (type != null
-				&& !ISite.DEFAULT_PACKAGED_FEATURE_TYPE.equals(type)) {
-				// unsupported
-				throw Utilities.newCoreException(
-					"Feature "
-						+ remoteFeatureVersionedIdentifier
-						+ " is of type "
-						+ type
-						+ ".  Only features of type "
-						+ ISite.DEFAULT_PACKAGED_FEATURE_TYPE
-						+ " are supported.",
-					null);
-			}
-
-			featureReferencesToMirror.add(remoteSiteFeatureReferences[i]);
-			System.out.println(
-				"Feature "
-					+ remoteSiteFeatureReferences[i].getVersionedIdentifier()
-					+ " will be mirrored.");
-		}
-		return (ISiteFeatureReference[]) featureReferencesToMirror.toArray(
-			new ISiteFeatureReference[featureReferencesToMirror.size()]);
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSite.java
deleted file mode 100644
index dc682da..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSite.java
+++ /dev/null

@@ -1,749 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.mirror;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.standalone.*;
-
-/**
- * Local mirror site.  Read/Write
- */
-public class MirrorSite extends Site {
-	private final static String INDENT = "   ";
-	private SiteModelFactory factory;
-	/**
-	 * plugin entries 
-	 */
-	private Collection downloadedPluginEntries = new ArrayList();
-	private Collection downloadedFeatureReferenceModels = new ArrayList();
-	public MirrorSite(SiteModelFactory factory) {
-		this.factory = factory;
-	}
-
-	/**
-	 * Mirrors the specified features and listed optional features on this site.
-	 * @see ISite#install(IFeature, IVerificationListener, IProgressMonitor)
-	 * @param mirrorSiteUrl external URL of the mirror site or null;
-	 * if parameter is provided policy fragment will be generated
-	 * @exception CoreException
-	 */
-	public void mirrorAndExpose(
-		ISite remoteSite,
-		ISiteFeatureReference[] sourceFeatureRefs,
-		IFeatureReference[] optionalfeatures,
-		String mirrorSiteUrl)
-		throws CoreException {
-
-		mirrorAndExposeFeatures(
-			remoteSite,
-			sourceFeatureRefs,
-			optionalfeatures);
-
-		System.out.println(
-			"Installing features finished. Updating categories ...");
-		updateCategories(remoteSite);
-		System.out.println(
-			"Updating categories finished. Updating site description ...");
-		updateDescription(remoteSite);
-		System.out.println(
-			"Updating site description finished. Saving site.xml ...");
-		save();
-		if (mirrorSiteUrl != null) {
-			generateUpdatePolicy(mirrorSiteUrl);
-		}
-	}
-	private void mirrorAndExposeFeatures(
-		ISite remoteSite,
-		ISiteFeatureReference[] sourceFeatureRefs,
-		IFeatureReference[] optionalfeatures)
-		throws CoreException {
-
-		// Features that failed will be retried once again
-		Collection failedFeatures = new ArrayList();
-		for (int i = 0; i < sourceFeatureRefs.length; i++) {
-			try {
-				IFeature sourceFeature =
-					sourceFeatureRefs[i].getFeature(new NullProgressMonitor());
-				SiteFeatureReferenceModel featureRef =
-					mirrorFeature(
-						remoteSite,
-						sourceFeature,
-						optionalfeatures,
-						1);
-				// Set categories of the new feature
-				ICategory remoteCategories[] =
-					sourceFeatureRefs[i].getCategories();
-				for (int j = 0; j < remoteCategories.length; j++) {
-					featureRef.addCategoryName(remoteCategories[j].getName());
-				}
-
-				addFeatureReferenceModel(remoteSite, featureRef);
-			} catch (CoreException ce) {
-				failedFeatures.add(sourceFeatureRefs[i]);
-			}
-		}
-
-		// do we need to retry?
-		if (failedFeatures.size() > 0) {
-			sourceFeatureRefs =
-				(ISiteFeatureReference[]) failedFeatures.toArray(
-					new ISiteFeatureReference[failedFeatures.size()]);
-		} else {
-			return;
-		}
-
-		for (int i = 0; i < sourceFeatureRefs.length; i++) {
-			IFeature sourceFeature =
-				sourceFeatureRefs[i].getFeature(new NullProgressMonitor());
-			SiteFeatureReferenceModel featureRef =
-				mirrorFeature(remoteSite, sourceFeature, optionalfeatures, 1);
-			// Set categories of the new feature
-			ICategory remoteCategories[] = sourceFeatureRefs[i].getCategories();
-			for (int j = 0; j < remoteCategories.length; j++) {
-				featureRef.addCategoryName(remoteCategories[j].getName());
-			}
-
-			addFeatureReferenceModel(remoteSite, featureRef);
-		}
-	}
-
-	/**
-	 * Install the specified feature and listed optional features on this site.
-	 * @see ISite#install(IFeature, IVerificationListener, IProgressMonitor)
-	 * @exception CoreException
-	 */
-	private SiteFeatureReferenceModel mirrorFeature(
-		ISite remoteSite,
-		IFeature sourceFeature,
-		IFeatureReference[] optionalfeatures,
-		int indent)
-		throws CoreException {
-		String tab = "";
-		for (int i = 0; i < indent; i++)
-			tab += " ";
-		System.out.println(
-			tab
-				+ "Mirroring feature "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		SiteFeatureReferenceModel existingFeatures[] =
-			getDownloadedFeatureReferenceModels();
-		for (int e = 0; e < existingFeatures.length; e++) {
-			if (existingFeatures[e]
-				.getVersionedIdentifier()
-				.equals(sourceFeature.getVersionedIdentifier())) {
-				System.out.println(
-					tab
-						+ "Feature "
-						+ sourceFeature.getVersionedIdentifier()
-						+ " already exists.  Skipping downloading.");
-				return existingFeatures[e];
-			}
-		}
-
-		final IFeatureContentProvider provider =
-			sourceFeature.getFeatureContentProvider();
-		System.out.println(
-			tab
-				+ "Getting plugin entries for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		final IPluginEntry[] sourceFeaturePluginEntries =
-			sourceFeature.getPluginEntries();
-
-		// determine list of plugins to install
-		// find the intersection between the plugin entries already contained
-		// on the target site, and plugin entries packaged in source feature
-
-		IPluginEntry[] pluginsToInstall =
-			UpdateManagerUtils.diff(
-				sourceFeaturePluginEntries,
-				getDownloadedPluginEntries());
-
-		System.out.println(
-			tab
-				+ "Getting non plugin entries for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		final INonPluginEntry[] nonPluginsToInstall =
-			sourceFeature.getRawNonPluginEntries();
-
-		System.out.println(
-			tab
-				+ "Getting included features for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		IFeatureReference[] children =
-			sourceFeature.getRawIncludedFeatureReferences();
-		if (optionalfeatures != null) {
-			children =
-				UpdateManagerUtils.optionalChildrenToInstall(
-					children,
-					optionalfeatures);
-		}
-
-		System.out.println(
-			tab
-				+ "Downloading feature archives for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// download feature archives
-		provider.getFeatureEntryArchiveReferences(null);
-
-		System.out.println(
-			tab
-				+ "Downloading plug-in archives for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// download plugin archives
-		for (int i = 0; i < pluginsToInstall.length; i++) {
-			provider.getPluginEntryArchiveReferences(pluginsToInstall[i], null);
-		}
-
-		System.out.println(
-			tab
-				+ "Downloading non plug-in archives for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// download non-plugin archives
-		for (int i = 0; i < nonPluginsToInstall.length; i++) {
-			provider.getNonPluginEntryArchiveReferences(
-				nonPluginsToInstall[i],
-				null);
-		}
-
-		System.out.println(
-			tab
-				+ "Installing child features for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// install child features first
-		for (int i = 0; i < children.length; i++) {
-			IFeature childFeature = children[i].getFeature(null);
-			mirrorFeature(
-				remoteSite,
-				childFeature,
-				optionalfeatures,
-				indent + 1);
-		}
-
-		System.out.println(
-			tab
-				+ "Storing plug-in archives for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// store plugins' archives
-		for (int i = 0; i < pluginsToInstall.length; i++) {
-			ContentReference[] references =
-				provider.getPluginEntryArchiveReferences(
-					pluginsToInstall[i],
-					null);
-			storePluginArchive(references[0]);
-			addDownloadedPluginEntry(pluginsToInstall[i]);
-		}
-
-		System.out.println(
-			tab
-				+ "Storing non plug-in archives for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// store non plugins' archives
-		for (int i = 0; i < nonPluginsToInstall.length; i++) {
-			ContentReference[] references =
-				provider.getNonPluginEntryArchiveReferences(
-					nonPluginsToInstall[i],
-					null);
-			for (int r = 0; r < references.length; r++) {
-				storeNonPluginArchive(
-					sourceFeature.getVersionedIdentifier(),
-					references[r]);
-			}
-		}
-
-		System.out.println(
-			tab
-				+ "Storing feature archives for "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " ...");
-		// store feature archive
-		ContentReference[] references =
-			provider.getFeatureEntryArchiveReferences(null);
-		storeFeatureArchive(references[0]);
-
-		System.out.println(
-			tab
-				+ "Adding feature "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " to model ...");
-
-		// add feature model to site model
-		SiteFeatureReferenceModel featureRef =
-			factory.createFeatureReferenceModel();
-		featureRef.setSiteModel(this);
-		//featureRef.setURLString(featureURL.toExternalForm());
-		featureRef.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		featureRef.setFeatureIdentifier(
-			sourceFeature.getVersionedIdentifier().getIdentifier());
-		featureRef.setFeatureVersion(
-			sourceFeature.getVersionedIdentifier().getVersion().toString());
-		addDownloadedFeatureReferenceModel(featureRef);
-
-		System.out.println(
-			tab
-				+ "Mirroring feature "
-				+ sourceFeature.getVersionedIdentifier()
-				+ " finished.");
-		return featureRef;
-
-	}
-	/**
-	 * Adds a feature reference model to this site,
-	 * and exposes in site.xml if remote site exposes given feature.
-	 */
-	public void addFeatureReferenceModel(
-		ISite remoteSite,
-		SiteFeatureReferenceModel featureReference) {
-		// check if remote site exposes this feature
-		ISiteFeatureReference remoteFeatures[] =
-			remoteSite.getRawFeatureReferences();
-		for (int i = 0; i < remoteFeatures.length; i++) {
-			ISiteFeatureReference remoteFeatureRef = remoteFeatures[i];
-			try {
-				if (remoteFeatureRef
-					.getVersionedIdentifier()
-					.equals(featureReference.getVersionedIdentifier())) {
-					addFeatureReferenceModel(featureReference);
-				}
-			} catch (CoreException ce) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(ce);
-			}
-		}
-		save();
-		System.out.println(
-			"Feature "
-				+ featureReference.getVersionedIdentifier()
-				+ " added to site.xml.");
-	}
-	/**
-	 * Adds feature model to site model, removing old feature
-	 */
-	public void addFeatureReferenceModel(SiteFeatureReferenceModel featureReference) {
-		SiteFeatureReferenceModel[] existingModels =
-			getFeatureReferenceModels();
-		for (int j = 0; j < existingModels.length; j++) {
-			if (existingModels[j]
-				.getVersionedIdentifier()
-				.equals(featureReference.getVersionedIdentifier())) {
-				super.removeFeatureReferenceModel(existingModels[j]);
-			}
-		}
-		super.addFeatureReferenceModel(featureReference);
-	}
-
-	/**
-	 * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)
-	 */
-	private void storeFeatureArchive(ContentReference contentReference)
-		throws CoreException {
-		InputStream inStream = null;
-		String featurePath = null;
-
-		try {
-			URL newURL =
-				new URL(
-					this.getURL(),
-					Site.DEFAULT_INSTALLED_FEATURE_PATH
-						+ contentReference.getIdentifier()
-						+ ".jar");
-			featurePath = newURL.getFile();
-			inStream = contentReference.getInputStream();
-			UpdateManagerUtils.copyToLocal(inStream, featurePath, null);
-		} catch (IOException e) {
-			throw Utilities.newCoreException(
-				"Error occurred while creating "+ featurePath+" file.",
-				e);
-		} finally {
-			if (inStream != null) {
-				try {
-					inStream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-
-	}
-	/**
-	* @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)
-	*/
-	private void storePluginArchive(ContentReference contentReference)
-		throws CoreException {
-
-		InputStream inStream = null;
-		String pluginPath = null;
-		try {
-			URL newURL = new URL(getURL(), contentReference.getIdentifier());
-			pluginPath = newURL.getFile();
-			inStream = contentReference.getInputStream();
-			UpdateManagerUtils.copyToLocal(inStream, pluginPath, null);
-		} catch (IOException e) {
-			throw Utilities.newCoreException(
-			"Error occurred while creating "+ pluginPath+" file.",
-				e);
-		} finally {
-			if (inStream != null) {
-				try {
-					inStream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	private void storeNonPluginArchive(
-		VersionedIdentifier featureVersionedIdentifier,
-		ContentReference contentReference)
-		throws CoreException {
-
-		InputStream inStream = null;
-		File nonPluginArchivePath = null;
-		try {
-			URL newDirURL =
-				new URL(
-					getURL(),
-					Site.DEFAULT_INSTALLED_FEATURE_PATH
-						+ "/"
-						+ featureVersionedIdentifier);
-			File dir = new File(newDirURL.getFile());
-			dir.mkdirs();
-			inStream = contentReference.getInputStream();
-			nonPluginArchivePath =
-				new File(dir, contentReference.getIdentifier());
-			UpdateManagerUtils.copyToLocal(
-				inStream,
-				nonPluginArchivePath.getAbsolutePath(),
-				null);
-		} catch (IOException e) {
-			throw Utilities.newCoreException(
-			"Error occurred while creating "+ nonPluginArchivePath.getAbsolutePath()+" file."
-				,e);
-		} finally {
-			if (inStream != null) {
-				try {
-					inStream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	private void save() {
-		FileOutputStream fos = null;
-		try {
-			URL siteURL = new URL(this.getURL(), "site.xml");
-			fos = new FileOutputStream(new File(siteURL.getFile()));
-			OutputStreamWriter outWriter = new OutputStreamWriter(fos, "UTF-8");
-			PrintWriter writer = new PrintWriter(outWriter);
-			save(writer);
-			writer.flush();
-		} catch (IOException ioe) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(
-				Utilities.newCoreException(
-					"Site XML could not be saved.",
-					ioe));
-		} finally {
-			if (fos != null) {
-				try {
-					fos.close();
-				} catch (IOException ioe2) {
-				}
-			}
-		}
-	}
-	private void save(PrintWriter writer) {
-		writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		//writer.println("<!DOCTYPE site SYSTEM \"dtd/site.dtd\">");
-		writeSite("", writer);
-	}
-
-	private void writeSite(String indent, PrintWriter writer) {
-		writer.print(indent + "<site");
-		String indent2 = indent + INDENT;
-		// default type
-		//writeIfDefined(indenta, writer, "type", getType());
-		// stored relative to site.xml
-		//writeIfDefined(indenta, writer, "url", getURL());
-		writer.println(">");
-		URLEntryModel description = getDescriptionModel();
-		if (description != null) {
-			writer.println();
-			writeDescription(indent2, writer, description);
-			writer.println();
-		}
-		writeFeatures(indent2, writer);
-		writeCategories(indent2, writer);
-		writer.println(indent + "</site>");
-	}
-	private void writeFeatures(String indent, PrintWriter writer) {
-		SiteFeatureReferenceModel[] featureReferenceModels =
-			getFeatureReferenceModels();
-		for (int i = 0; i < featureReferenceModels.length; i++) {
-			writer.print(indent);
-			writer.print("<feature");
-			writer.print(
-				" url=\"features/"
-					+ featureReferenceModels[i].getFeatureIdentifier()
-					+ "_"
-					+ featureReferenceModels[i].getFeatureVersion()
-					+ ".jar\"");
-			writer.print(
-				" id=\""
-					+ featureReferenceModels[i].getFeatureIdentifier()
-					+ "\"");
-			writer.print(
-				" version=\""
-					+ featureReferenceModels[i].getFeatureVersion()
-					+ "\"");
-			writer.println(">");
-
-			String[] categoryNames =
-				featureReferenceModels[i].getCategoryNames();
-			for (int cn = 0; cn < categoryNames.length; cn++) {
-				writer.print(indent + INDENT);
-				writer.println(
-					"<category name=\"" + categoryNames[cn] + "\" />");
-
-			}
-
-			writer.print(indent);
-			writer.println("</feature>");
-			writer.println();
-		}
-	}
-	private void writeCategories(String indent, PrintWriter writer) {
-		CategoryModel[] categoryModels = getCategoryModels();
-		if (categoryModels.length <= 0) {
-			return;
-		}
-		for (int i = 0; i < categoryModels.length; i++) {
-			writer.print(indent);
-			writer.print("<category-def");
-			writer.print(
-				" name=\""
-					+ categoryModels[i].getName()
-					+ "\" label=\""
-					+ categoryModels[i].getLabel()
-					+ "\"");
-			writer.println(">");
-			writeDescription(
-				indent + INDENT,
-				writer,
-				categoryModels[i].getDescriptionModel());
-			writer.print(indent);
-			writer.println("</category-def>");
-			writer.println();
-		}
-	}
-	private void writeDescription(
-		String indent,
-		PrintWriter writer,
-		URLEntryModel urlEntryModel) {
-		String url = urlEntryModel.getURLString();
-		String text = urlEntryModel.getAnnotationNonLocalized();
-		if (url == null && text == null && text.length() <= 0) {
-			return;
-		}
-		writer.print(indent);
-		writer.print("<description");
-		if (url != null)
-			writer.print(" url=\"" + url + "\"");
-		if (text == null || text.length() <= 0) {
-			writer.println(" />");
-		} else {
-			writer.println(">");
-			if (text != null) {
-				writer.println(
-					indent + INDENT + UpdateManagerUtils.Writer.xmlSafe(text));
-			}
-			writer.println(indent + "</description>");
-		}
-	}
-	/**
-	 * Adds a plugin entry 
-	 * Either from parsing the file system or 
-	 * installing a feature
-	 * 
-	 * We cannot figure out the list of plugins by reading the Site.xml as
-	 * the archives tag are optionals
-	 */
-	public void addDownloadedPluginEntry(IPluginEntry pluginEntry) {
-		downloadedPluginEntries.add(pluginEntry);
-	}
-
-	private IPluginEntry[] getDownloadedPluginEntries() {
-		return (IPluginEntry[]) downloadedPluginEntries.toArray(
-			new IPluginEntry[downloadedPluginEntries.size()]);
-	}
-	/**
-	 * Adds a plugin entry 
-	 * Either from parsing the file system or 
-	 * installing a feature
-	 * 
-	 * We cannot figure out the list of plugins by reading the Site.xml as
-	 * the archives tag are optionals
-	 */
-	public void addDownloadedFeatureReferenceModel(SiteFeatureReferenceModel featureModel) {
-		downloadedFeatureReferenceModels.add(featureModel);
-	}
-
-	private SiteFeatureReferenceModel[] getDownloadedFeatureReferenceModels() {
-		return (
-			SiteFeatureReferenceModel[]) downloadedFeatureReferenceModels
-				.toArray(
-			new SiteFeatureReferenceModel[downloadedFeatureReferenceModels
-				.size()]);
-	}
-	/**
-	 * Checks if mirror site contains a feature with given ID and version
-	 * @param featureRefModel
-	 * @return true if such feature exists
-	 */
-	/*private boolean contains(SiteFeatureReferenceModel featureRefModel) {
-		ISiteFeatureReference featureRefs[] = getRawFeatureReferences();
-		for (int i = 0; i < featureRefs.length; i++) {
-			try {
-				if (featureRefs[i]
-					.getVersionedIdentifier()
-					.equals(featureRefModel.getVersionedIdentifier())) {
-					return true;
-				}
-			} catch (CoreException ce) {
-				ce.printStackTrace();
-			}
-		}
-		return false;
-	}*/
-
-	/**
-	 * Updates description of this site
-	 * from description of the remote site.
-	 */
-	private void updateDescription(ISite remoteSite) {
-		IURLEntry urlEntry = remoteSite.getDescription();
-		if (urlEntry != null) {
-			URLEntryModel newUrlEntryModel = new URLEntryModel();
-			URL url = urlEntry.getURL();
-			newUrlEntryModel.setAnnotation(urlEntry.getAnnotation());
-			newUrlEntryModel.setURLString(url.toExternalForm());
-			this.setDescriptionModel(newUrlEntryModel);
-		}
-	}
-	/**
-	 * Updates all categories used by features on this site
-	 * from categories defined on remote site.
-	 * Categories not defined on remote site are unchanged.
-	 */
-	private void updateCategories(ISite remoteSite) {
-		// collect name of categories used on this site
-		Set usedCategoryNames = new HashSet();
-		SiteFeatureReferenceModel featureRefModels[] =
-			getFeatureReferenceModels();
-		for (int f = 0; f < featureRefModels.length; f++) {
-			String[] featureCategoryNames =
-				featureRefModels[f].getCategoryNames();
-
-			for (int c = 0; c < featureCategoryNames.length; c++) {
-				usedCategoryNames.add(featureCategoryNames[c]);
-			}
-		}
-
-		Collection newCategoryModels = new ArrayList();
-		for (Iterator it = usedCategoryNames.iterator(); it.hasNext();) {
-			String name = (String) it.next();
-			ICategory remoteCategory = remoteSite.getCategory(name);
-			if (remoteCategory == null) {
-				// remote site does not define this category
-				CategoryModel oldCategory = null;
-				try {
-					oldCategory = (CategoryModel) getCategory(name);
-				} catch (NullPointerException npe) {
-					// cannot reproduce npe anymore
-				}
-				if (oldCategory != null) {
-					newCategoryModels.add(oldCategory);
-				}
-			} else {
-				newCategoryModels.add(remoteCategory);
-			}
-
-		}
-		setCategoryModels(
-			(CategoryModel[]) newCategoryModels.toArray(
-				new CategoryModel[newCategoryModels.size()]));
-
-	}
-	private void generateUpdatePolicy(String url) {
-		FileOutputStream fos = null;
-		try {
-			URL siteURL = new URL(this.getURL(), "policy.xml");
-			fos = new FileOutputStream(new File(siteURL.getFile()));
-			OutputStreamWriter outWriter = new OutputStreamWriter(fos, "UTF-8");
-			PrintWriter writer = new PrintWriter(outWriter);
-
-			writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-			writer.println("<update-policy>");
-
-			writer.println(
-				"<!-- You can paste the following fragment, containing url-map elements, into another policy file. -->");
-			writeUrlMaps(writer, url);
-			writer.println("<!-- End of fragment with url-map elements. -->");
-
-			writer.println("</update-policy>");
-
-			writer.flush();
-		} catch (IOException ioe) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(
-				Utilities.newCoreException(
-					"policy.xml could not be saved",
-					ioe));
-		} finally {
-			if (fos != null) {
-				try {
-					fos.close();
-				} catch (IOException ioe2) {
-				}
-			}
-		}
-	}
-	private void writeUrlMaps(PrintWriter writer, String url) {
-		SiteFeatureReferenceModel[] featureReferenceModels =
-			getFeatureReferenceModels();
-		for (int i = 0; i < featureReferenceModels.length; i++) {
-			writer.print("\t");
-			writer.print("<url-map");
-			writer.print(
-				" pattern=\""
-					+ featureReferenceModels[i].getFeatureIdentifier()
-					+ "\"");
-			writer.print(" url=\"" + url + "\"");
-			writer.println(" />");
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSiteFactory.java
deleted file mode 100644
index fe3f0d0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/mirror/MirrorSiteFactory.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.mirror;
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.model.*;
-import org.eclipse.update.standalone.*;
-import org.xml.sax.*;
-
-public class MirrorSiteFactory extends BaseSiteFactory {
-	/*
-	 * @see SiteModelFactory#createSiteMapModel()
-	 */
-	public SiteModel createSiteMapModel() {
-		return new MirrorSite(this);
-	}
-	/*
-	 * @see ISiteFactory#createSite(URL)
-	 */
-	public ISite createSite(URL url)
-		throws CoreException, InvalidSiteTypeException {
-		return createSite(new File(url.getFile()));
-	}
-	/*
-	 * @see ISiteFactory#createSite(URL)
-	 */
-	public ISite createSite(File siteLocation)
-		throws CoreException, InvalidSiteTypeException {
-
-		InputStream siteStream = null;
-
-		if (!siteLocation.exists()) {
-			if (!siteLocation.mkdirs()) {
-				throw Utilities.newCoreException(
-					"Directory "
-						+ siteLocation.getAbsolutePath()
-						+ " could not be created.",
-					null);
-			}
-		}
-		if (!siteLocation.isDirectory() || !siteLocation.canWrite())
-			throw Utilities.newCoreException(
-				siteLocation.getAbsolutePath()
-					+ " is not a directory or is not writtable.",
-				null);
-
-		MirrorSite site = null;
-		// parse public features
-		if (new File(siteLocation, Site.SITE_XML).exists()) {
-			try {
-				siteStream =
-					new FileInputStream(new File(siteLocation, Site.SITE_XML));
-			} catch (FileNotFoundException fnfe) {
-			}
-			site = (MirrorSite) parseSite(siteStream);
-			try {
-				if (siteStream != null)
-					siteStream.close();
-			} catch (IOException e) {
-			}
-		}
-		if (site == null) {
-			site = (MirrorSite) createSiteMapModel();
-		}
-		// parse downloaded plugins and fragments
-		parseDownloadedPluginsAndFragments(
-			site,
-			new File(siteLocation, Site.DEFAULT_PLUGIN_PATH));
-		// parse downloaded features
-		parseDownloadedFeatures(
-			site,
-			new File(siteLocation, Site.DEFAULT_FEATURE_PATH));
-
-		URL url;
-		try {
-			url = siteLocation.toURL();
-		} catch (MalformedURLException mue) {
-			throw Utilities.newCoreException(
-				"A URL for site "
-					+ siteLocation.getAbsolutePath()
-					+ " could not be created.",
-				mue);
-		}
-		SiteContentProvider contentProvider = null;
-		contentProvider = new SiteFileContentProvider(url);
-
-		site.setSiteContentProvider(contentProvider);
-		contentProvider.setSite(site);
-		try {
-			site.resolve(url, url);
-		} catch (MalformedURLException mue) {
-			throw Utilities.newCoreException(
-				"Unable to resolve URL "
-					+ (url == null ? "" : url.toExternalForm()),
-				mue);
-		}
-		return site;
-	}
-	/**
-	 *  
-	 */
-	private void parseDownloadedPluginsAndFragments(MirrorSite site,
-			File pluginDir) throws CoreException {
-		if (!pluginDir.exists()) {
-			return;
-		}
-		String[] dir = pluginDir.list(FeaturePackagedContentProvider.filter);
-		for (int i = 0; i < dir.length; i++) {
-			InputStream in = null;
-			try {
-				File file = new File(pluginDir, dir[i]);
-				JarContentReference jarReference = new JarContentReference(
-						null, file);
-				ContentReference ref = jarReference.peek("META-INF/MANIFEST.MF", null, null); //$NON-NLS-1$
-				if (ref != null) {
-					in = ref.getInputStream();
-					BundleManifest manifest = new BundleManifest(in);
-					if (manifest.exists()) {
-						site
-								.addDownloadedPluginEntry(manifest
-										.getPluginEntry());
-						continue;
-					}
-				}
-				ref = jarReference.peek("plugin.xml", null, null); //$NON-NLS-1$
-				if (ref == null) {
-					ref = jarReference.peek("fragment.xml", null, null); //$NON-NLS-1$
-				}
-				if (ref != null) {
-					in = ref.getInputStream();
-					PluginEntry entry = new DefaultPluginParser().parse(in);
-					site.addDownloadedPluginEntry(entry);
-				}
-			} catch (IOException e) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(e);
-			} catch (SAXException e) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(e);
-			} finally {
-				if(in !=null){
-					try{
-						in.close();
-					}catch(IOException ce){
-					}
-				}
-			}
-		}
-	}
-	/**
-	* Method parseFeature.
-	* @throws CoreException
-	*/
-	private void parseDownloadedFeatures(MirrorSite site, File featureDir)
-		throws CoreException {
-		if (featureDir.exists()) {
-			String[] dir;
-			SiteFeatureReferenceModel featureRef;
-			URL featureURL;
-			File currentFeatureFile;
-			String newFilePath = null;
-
-			try {
-				// only list JAR files
-				dir = featureDir.list(FeaturePackagedContentProvider.filter);
-				for (int index = 0; index < dir.length; index++) {
-
-					// check if the JAR file contains a feature.xml
-					currentFeatureFile = new File(featureDir, dir[index]);
-					JarContentReference ref =
-						new JarContentReference("", currentFeatureFile);
-					ContentReference result = null;
-					try {
-						result = ref.peek(Feature.FEATURE_XML, null, null);
-					} catch (IOException e) {
-						UpdateCore.warn(
-							"Exception retrieving feature.xml in file:"
-								+ currentFeatureFile,
-							e);
-					}
-					if (result == null) {
-						UpdateCore.warn(
-							"Unable to find feature.xml in file:"
-								+ currentFeatureFile);
-					} else {
-						featureURL = currentFeatureFile.toURL();
-						featureRef = createFeatureReferenceModel();
-						featureRef.setSiteModel(site);
-						featureRef.setURLString(featureURL.toExternalForm());
-						featureRef.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-						featureRef.setFeatureIdentifier(
-							featureRef
-								.getVersionedIdentifier()
-								.getIdentifier());
-						featureRef.setFeatureVersion(
-							featureRef
-								.getVersionedIdentifier()
-								.getVersion()
-								.toString());
-						site.addDownloadedFeatureReferenceModel(featureRef);
-					}
-				}
-			} catch (MalformedURLException e) {
-				throw Utilities.newCoreException(
-					"Unable to create URL for file " + newFilePath + ".",
-					e);
-			}
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/BundleManifest.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/BundleManifest.java
deleted file mode 100644
index 4bd1d87..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/BundleManifest.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-import java.io.*;
-import java.util.jar.*;
-
-import org.eclipse.osgi.util.*;
-import org.eclipse.update.core.*;
-import org.osgi.framework.*;
-/**
- * Parses MANIFEST.MF
- */
-public class BundleManifest {
-	private PluginEntry pluginEntry;
-	private IOException exception;
-	/**
-	 * Constructor for local file
-	 */
-public BundleManifest(File manifest) {
-		super();
-		if (manifest.exists() && !manifest.isDirectory()) {
-			FileInputStream fos = null;
-			try {
-				fos = new FileInputStream(manifest);
-				parse(fos);
-			} catch (IOException ioe) {
-			} finally {
-				if (fos != null) {
-					try {
-						fos.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-		}
-	}
-	/**
-	 * Constructor for local file
-	 */
-	public BundleManifest(InputStream input) {
-		super();
-		if (input != null) {
-			parse(input);
-		}
-	}
-	/**
-	 * Parses manifest, creates PluginEntry if manifest is valid, stores
-	 * exception if any occurs
-	 * 
-	 * @param in
-	 *            InputStream
-	 */
-	private void parse(InputStream in) {
-		try {
-			Manifest m = new Manifest(in);
-			Attributes a = m.getMainAttributes();
-			// plugin id
-			String symbolicName = a.getValue(Constants.BUNDLE_SYMBOLICNAME);
-			if (symbolicName == null) {
-				// In Eclipse manifest must have Bundle-SymbolicName attribute
-				return;
-			}
-			String id;
-			try {
-				ManifestElement[] elements = ManifestElement.parseHeader(
-						Constants.BUNDLE_SYMBOLICNAME, symbolicName);
-				id = elements[0].getValue();
-			} catch (BundleException be) {
-				throw new IOException(be.getMessage());
-			}
-			// plugin version
-			String version = a.getValue(Constants.BUNDLE_VERSION);
-			String hostPlugin = a.getValue(Constants.FRAGMENT_HOST);
-			pluginEntry = new PluginEntry();
-			pluginEntry.setVersionedIdentifier(new VersionedIdentifier(id,
-					version));
-			pluginEntry.isFragment(hostPlugin != null
-					&& hostPlugin.length() > 0);
-		} catch (IOException ioe) {
-			exception = ioe;
-		}
-	}
-	public boolean exists() {
-		return exception != null || pluginEntry != null;
-	}
-	/**
-	 * Obtains PluginEntry from a manifest.
-	 * 
-	 * @return PluginEntry or null if valid manifest does not exist
-	 * @throws IOException
-	 *             if exception during parsing
-	 */
-	public PluginEntry getPluginEntry() throws IOException {
-		if (exception != null) {
-			throw exception;
-		} else {
-			return pluginEntry;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
deleted file mode 100644
index 074981b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.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.internal.model;
- 
-import java.util.*;
-
-import org.eclipse.update.core.model.*;
-
-public class ConfigurationActivityModel extends ModelObject{
-	
-	private String label;
-	private int action;
-	private Date date;
-	private int status;
-	private InstallConfigurationModel installConfiguration;
-	
-
-	/**
-	 * Constructor for ConfigurationActivityModel.
-	 */
-	public ConfigurationActivityModel() {
-		super();
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public int getAction() {
-		return action;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public Date getDate() {
-		return date;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public int getStatus() {
-		return status;
-	}
-
-	/**
-	 * Sets the date.
-	 * @param date The date to set
-	 */
-	public void setDate(Date date) {
-		assertIsWriteable();
-		this.date = date;
-	}
-
-	/**
-	 * Sets the status.
-	 * @param status The status to set
-	 */
-	public void setStatus(int status) {
-		assertIsWriteable();
-		this.status = status;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * Sets the label.
-	 * @param label The label to set
-	 */
-	public void setLabel(String label) {
-		assertIsWriteable();
-		this.label = label;
-	}
-
-	/**
-	 * Sets the action.
-	 * @param action The action to set
-	 */
-	public void setAction(int action) {
-		assertIsWriteable();
-		this.action = action;
-	}
-
-	/**
-	 * Gets the installConfiguration.
-	 * @return Returns a InstallConfigurationModel
-	 */
-	public InstallConfigurationModel getInstallConfigurationModel() {
-		return installConfiguration;
-	}
-
-	/**
-	 * Sets the installConfiguration.
-	 * @param installConfiguration The installConfiguration to set
-	 */
-	public void setInstallConfigurationModel(InstallConfigurationModel installConfiguration) {
-		assertIsWriteable();		
-		this.installConfiguration = installConfiguration;
-	}
-
-}
-

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
deleted file mode 100644
index 7c363ff..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * 
- */
-public class ConfigurationPolicyModel extends ModelObject {
-
-	
-	
-
-	private int policy;
-	private Map /* of FeatureReferenceModel */configuredFeatureReferences;
-	private Map /* of FeatureReferenceModel */unconfiguredFeatureReferences;
-	
-	// since 2.0.2
-	private ConfiguredSiteModel configuredSiteModel;
-	
-	// since 2.1
-	private boolean enable;
-
-	/**
-	 * Constructor for ConfigurationPolicyModel.
-	 */
-	public ConfigurationPolicyModel() {
-		super();
-		enable = true;
-		configuredFeatureReferences = new HashMap();
-//		unconfiguredFeatureReferences = new HashMap();		
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public int getPolicy() {
-		return policy;
-	}
-
-	/**
-	 * Sets the policy.
-	 * @param policy The policy to set
-	 */
-	public void setPolicy(int policy) {
-		assertIsWriteable();
-		this.policy = policy;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public FeatureReferenceModel[] getConfiguredFeaturesModel() {
-		if (configuredFeatureReferences==null || configuredFeatureReferences.isEmpty())
-			return new FeatureReferenceModel[0];
-		return (FeatureReferenceModel[]) configuredFeatureReferences.keySet().toArray(arrayTypeFor(configuredFeatureReferences.keySet()));
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public FeatureReferenceModel[] getUnconfiguredFeaturesModel() {
-		// obtain unconfigured features by comparing configured ones with those installed
-		if (unconfiguredFeatureReferences == null
-				&& configuredSiteModel != null
-				&& configuredSiteModel.getSiteModel() != null) {
-			ISite site = (ISite) configuredSiteModel.getSiteModel();
-			ISiteFeatureReference[] siteFeatures = site.getFeatureReferences();
-			if (siteFeatures.length > getConfiguredFeaturesModel().length) {
-				for (int i=0; i<siteFeatures.length; i++) {
-					if (!(siteFeatures[i] instanceof SiteFeatureReference))
-						continue;
-					Iterator iterator = configuredFeatureReferences.keySet().iterator();
-					boolean found = false;
-					while(!found && iterator.hasNext()) {
-						FeatureReferenceModel f = (FeatureReferenceModel)iterator.next();
-						if (UpdateManagerUtils.sameURL(f.getURL(), siteFeatures[i].getURL()))
-							found = true;
-					}
-					if (!found)
-						addUnconfiguredFeatureReference((SiteFeatureReference)siteFeatures[i]);
-				}
-			}
-		}
-		if (unconfiguredFeatureReferences == null
-				|| unconfiguredFeatureReferences.isEmpty())
-			return new FeatureReferenceModel[0];
-		return (FeatureReferenceModel[]) unconfiguredFeatureReferences.keySet()
-				.toArray(arrayTypeFor(unconfiguredFeatureReferences.keySet()));
-	}
-
-	/**
-	 * Gets the configuredSiteModel.
-	 * @return Returns a ConfiguredSiteModel
-	 * @since 2.0.2
-	 */
-	public ConfiguredSiteModel getConfiguredSiteModel() {
-		return configuredSiteModel;
-	}
-
-	/**
-	 * Sets the configuredSiteModel.
-	 * @param configuredSiteModel The configuredSiteModel to set
-	 * @since 2.0.2
-	 */
-	public void setConfiguredSiteModel(ConfiguredSiteModel configuredSiteModel) {
-		this.configuredSiteModel = configuredSiteModel;
-	}
-
-	/**
-	 * 
-	 */
-	private boolean remove(FeatureReferenceModel feature, Map list) {
-		URL featureURL = feature.getURL();
-		boolean found = false;
-		Iterator iter = list.keySet().iterator();
-		while (iter.hasNext() && !found) {
-			FeatureReferenceModel element = (FeatureReferenceModel) iter.next();
-			if (UpdateManagerUtils.sameURL(element.getURL(),featureURL)) {
-				list.remove(element);
-				found = true;
-			}
-		}
-		return found;
-	}
-
-	/**
-	 * returns an array of string corresponding to plugins file
-	 */
-	/*package*/
-
-	
-	/**
-	 * 
-	 */
-	private void add(FeatureReferenceModel feature, Map list) {
-		URL featureURL = feature.getURL();
-		boolean found = false;
-		Iterator iter = list.keySet().iterator();
-		while (iter.hasNext() && !found) {
-			FeatureReferenceModel element = (FeatureReferenceModel) iter.next();
-			if (UpdateManagerUtils.sameURL(element.getURL(),featureURL)) {
-				found = true;
-			}
-		}
-
-		if (!found) {
-			list.put(feature,null);
-		} else {
-			UpdateCore.warn("Feature Reference :"+feature+" already part of the list."); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * adds a feature in the configuredReference list
-	 * also used by the parser to avoid creating another activity
-	 */
-	public void addConfiguredFeatureReference(FeatureReferenceModel feature) {
-		assertIsWriteable();
-		
-		if (configuredFeatureReferences == null)
-			this.configuredFeatureReferences = new HashMap();
-		if (!configuredFeatureReferences.containsKey(feature)){
-			//DEBUG:
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION){
-				UpdateCore.debug("Configuring "+feature.getURLString()); //$NON-NLS-1$
-			}
-			this.add(feature, configuredFeatureReferences);
-		}	
-
-		// when user configure a feature,
-		// we have to remove it from unconfigured feature if it exists
-		// because the user doesn't know...
-		if (unconfiguredFeatureReferences != null) {
-			boolean success = remove(feature, unconfiguredFeatureReferences);
-			if (!success)
-				UpdateCore.warn("Feature not part of Unconfigured list: "+feature.getURLString());			 //$NON-NLS-1$
-		}
-
-	}
-
-	/**
-	 * adds a feature in the list
-	 * also used by the parser to avoid creating another activity
-	 */
-	public void addUnconfiguredFeatureReference(FeatureReferenceModel feature) {
-		assertIsWriteable();
-		if (unconfiguredFeatureReferences == null)
-			this.unconfiguredFeatureReferences = new HashMap();
-		if (!unconfiguredFeatureReferences.containsKey(feature)){
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION){
-				UpdateCore.debug("Unconfiguring "+feature.getURLString()); //$NON-NLS-1$
-			}
-			this.add(feature, unconfiguredFeatureReferences);
-		}	
-
-		// an unconfigured feature is always from a configured one no ?
-		// unless it was parsed right ?
-		if (configuredFeatureReferences != null) {
-			boolean success = remove(feature, configuredFeatureReferences);
-			if (!success)
-				UpdateCore.warn("Feature not part of Configured list: "+feature.getURLString());				 //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * removes a feature from any list
-	 */
-	public void removeFeatureReference(FeatureReferenceModel feature) {
-		assertIsWriteable();
-		if (unconfiguredFeatureReferences!=null){
-			boolean success = remove(feature, unconfiguredFeatureReferences);
-			if (!success)
-				UpdateCore.warn(feature.getURLString()+" not part of unconfigured list.");							 //$NON-NLS-1$
-		}
-
-		if (configuredFeatureReferences != null) {
-			boolean success = remove(feature, configuredFeatureReferences);
-			if (!success)
-				UpdateCore.warn(feature.getURLString()+" not part of configured list.");							 //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Sets the unconfiguredFeatureReferences.
-	 * @param featureReferences The unconfiguredFeatureReferences to set
-	 */
-	protected void setUnconfiguredFeatureReferences(IFeatureReference[] featureReferences) {
-		unconfiguredFeatureReferences = new HashMap();
-		for (int i = 0; i < featureReferences.length; i++) {
-			unconfiguredFeatureReferences.put(featureReferences[i],null);
-		}
-	}
-
-
-	/**
-	 * Sets the configuredFeatureReferences.
-	 * @param featureReferences The configuredFeatureReferences to set
-	 */
-	protected void setConfiguredFeatureReferences(IFeatureReference[] featureReferences) {
-		configuredFeatureReferences = new HashMap();
-		for (int i = 0; i < featureReferences.length; i++) {
-			configuredFeatureReferences.put(featureReferences[i],null);
-		}		
-	
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isEnabled() {
-		return enable;
-	}
-
-	/**
-	 * @param value
-	 */
-	public void setEnabled(boolean value) {
-		enable = value;
-	}
-
-
-	
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
deleted file mode 100644
index 646a776..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * 
- */
-public class ConfiguredSiteModel extends ModelObject {
-	private String[] previousPluginPath;
-
-	private SiteModel site;
-	private String platformURLString;
-	private ConfigurationPolicyModel policy;
-	private InstallConfigurationModel installConfiguration;
-	private boolean installable = false;
-
-	/**
-	 * Constructor
-	 */
-	public ConfiguredSiteModel() {
-		super();
-	}
-
-	/**
-	 * returns the site
-	 * @return The ISite 
-	 * @since 2.0
-	 */
-	public SiteModel getSiteModel() {
-		return site;
-	}
-
-	/**
-	 * Sets the site.
-	 * @param site The site to set
-	 */
-	public void setSiteModel(SiteModel site) {
-		assertIsWriteable();
-		this.site = site;
-	}
-
-	/**
-	 * returns the policy
-	 */
-	public ConfigurationPolicyModel getConfigurationPolicyModel() {
-		return policy;
-	}
-
-	/**
-	 * 
-	 * @since 2.0
-	 */
-	public void setConfigurationPolicyModel(ConfigurationPolicyModel policy) {
-		assertIsWriteable();
-		this.policy = policy;
-		policy.setConfiguredSiteModel(this);
-	}
-
-	/**
-	 * @since
-	 */
-	public boolean isUpdatable() {
-		return installable;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public void setUpdatable(boolean installable) {
-		assertIsWriteable();
-		this.installable = installable;
-	}
-
-	/**
-	 * Gets the installConfiguration.
-	 * @return Returns a InstallConfigurationModel
-	 */
-	public InstallConfigurationModel getInstallConfigurationModel() {
-		return installConfiguration;
-	}
-
-	/**
-	 * Sets the installConfiguration.
-	 * @param installConfiguration The installConfiguration to set
-	 */
-	public void setInstallConfigurationModel(InstallConfigurationModel installConfiguration) {
-		assertIsWriteable();
-		this.installConfiguration = installConfiguration;
-	}
-
-	/**
-	 * Gets the platformURLString.
-	 * @return Returns a String
-	 */
-	public String getPlatformURLString() {
-		return platformURLString;
-	}
-
-	/**
-	 * Sets the platformURLString.
-	 * @param platformURLString The platformURLString to set
-	 */
-	public void setPlatformURLString(String platformURLString) {
-		this.platformURLString = platformURLString;
-	}
-
-	
-		/**
-	 * Gets the previousPluginPath. The list of plugins the platform had.
-	 * @return Returns a String[]
-	 */
-	public String[] getPreviousPluginPath() {
-		if (previousPluginPath == null)
-			previousPluginPath = new String[0];
-		return previousPluginPath;
-	}
-
-	/**
-	 * Sets the previousPluginPath.
-	 * @param previousPluginPath The previousPluginPath to set
-	 */
-	public void setPreviousPluginPath(String[] previousPluginPath) {
-		this.previousPluginPath = new String[previousPluginPath.length];
-		System.arraycopy(previousPluginPath, 0, this.previousPluginPath, 0, previousPluginPath.length);
-	}
-
-	/*
-	 * creates a Status
-	 */
-	protected IStatus createStatus(int statusType, String msg, Exception e){
-		if (statusType!=IStatus.OK) statusType = IStatus.ERROR;
-		return createStatus(statusType,IStatus.OK, msg.toString(), e);
-	}
-
-	/*
-	 * creates a Status
-	 */
-	protected IStatus createStatus(int statusSeverity, int statusCode, String msg, Exception e){
-		String id =	UpdateCore.getPlugin().getBundle().getSymbolicName();
-	
-		StringBuffer completeString = new StringBuffer(""); //$NON-NLS-1$
-		if (msg!=null)
-			completeString.append(msg);
-		if (e!=null){
-			completeString.append("\r\n["); //$NON-NLS-1$
-			completeString.append(e.toString());
-			completeString.append("]\r\n"); //$NON-NLS-1$
-		}
-		return new Status(statusSeverity, id, statusCode, completeString.toString(), e);
-	}
-	
-	/**
-	 * @see org.eclipse.update.configuration.IConfiguredSite#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return getConfigurationPolicyModel().isEnabled();
-	}
-
-	/**
-	 * @see org.eclipse.update.configuration.IConfiguredSite#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean value) {
-		getConfigurationPolicyModel().setEnabled(value);
-	}
-	
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
deleted file mode 100644
index 222f9dd..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.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.internal.model;
-
-
-import java.io.*;
-import javax.xml.parsers.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-/**
- * Parse default feature.xml
- */
-
-public class DefaultPluginParser extends DefaultHandler {
-	private final static SAXParserFactory parserFactory =
-		SAXParserFactory.newInstance();
-	private SAXParser parser;
-	private String id = null;
-	private String version = null;
-	private PluginEntry pluginEntry;
-
-	private static final String PLUGIN = "plugin"; //$NON-NLS-1$
-	private static final String FRAGMENT = "fragment"; //$NON-NLS-1$
-
-	private class ParseCompleteException extends SAXException {
-		public ParseCompleteException(String arg0) {
-			super(arg0);
-		}
-	}
-
-	/**
-	 * Constructor for DefaultFeatureParser
-	 */
-	public DefaultPluginParser() {
-		super();
-		try {
-			parserFactory.setNamespaceAware(true);
-			this.parser = parserFactory.newSAXParser();
-		} catch (ParserConfigurationException e) {
-			UpdateCore.log(e);
-		} catch (SAXException e) {
-			UpdateCore.log(e);
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public synchronized PluginEntry parse(InputStream in) throws SAXException, IOException {
-		try {
-			pluginEntry = new PluginEntry();
-			parser.parse(new InputSource(in), this);
-		} catch (ParseCompleteException e) {
-			// expected, we stopped the parsing when we have the information we need
-			/// no need to pursue the parsing
-		}
-
-		if (id == null || id.trim().length() == 0)
-			id = "_no_id_"; //$NON-NLS-1$
-		pluginEntry.setVersionedIdentifier(new VersionedIdentifier(id, version));
-		return pluginEntry;
-	}
-
-	/**
-	 * @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)) {
-			pluginEntry.isFragment(false);			
-			processPlugin(attributes);
-			return;
-		}
-
-		if (tag.equalsIgnoreCase(FRAGMENT)) {
-			pluginEntry.isFragment(true);			
-			processPlugin(attributes);
-			return;
-		}
-	}
-
-	/** 
-	 * process plugin entry info
-	 */
-	private void processPlugin(Attributes attributes) throws ParseCompleteException {
-		id = attributes.getValue("id"); //$NON-NLS-1$
-		version = attributes.getValue("version"); //$NON-NLS-1$
-		throw new ParseCompleteException(""); //$NON-NLS-1$
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
deleted file mode 100644
index 89405f9..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * An InstallConfigurationModel is 
- * 
- */
-
-public class InstallConfigurationModel extends ModelObject {
-
-	// performance
-	private URL bundleURL;
-	private URL base;
-	private boolean resolved = false;
-
-	private boolean isCurrent;
-	private URL locationURL;
-	private String locationURLString;
-	protected Date date;
-	private String label;
-	private List /* of ConfiguretionActivityModel */ activities;
-	private List /* of configurationSiteModel */ configurationSites;
-
-	protected boolean initialized = false;
-
-	/**
-	 * default constructor. Create
-	 */
-	public InstallConfigurationModel() {
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public ConfiguredSiteModel[] getConfigurationSitesModel() {
-		if (!initialized) 
-			initialize();
-		if (configurationSites == null)
-			return new ConfiguredSiteModel[0];
-	
-		return (ConfiguredSiteModel[]) configurationSites.toArray(arrayTypeFor(configurationSites));
-	}
-
-	/**
-	 * Adds the configuration to the list
-	 * is called when adding a Site or parsing the XML file
-	 * in this case we do not want to create a new activity, so we do not want t call
-	 * addConfigurationSite()
-	 */
-	public void addConfigurationSiteModel(ConfiguredSiteModel site) {
-		if (configurationSites == null) {
-			configurationSites = new ArrayList();
-		}
-		if (!configurationSites.contains(site)) {
-			configurationSites.add(site);
-		}
-	}
-
-	public void setConfigurationSiteModel(ConfiguredSiteModel[] sites) {
-		configurationSites = null;
-		for (int i = 0; i < sites.length; i++) {
-			addConfigurationSiteModel(sites[i]);
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public boolean removeConfigurationSiteModel(ConfiguredSiteModel site) {
-		if (!initialized) initialize();
-
-		if (configurationSites != null) {
-			return configurationSites.remove(site);
-		}
-
-		return false;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public boolean isCurrent() {
-		if (!initialized) initialize();
-		return isCurrent;
-	}
-
-	/**
-	 *  @since 2.0
-	 */
-	public void setCurrent(boolean isCurrent) {
-		// do not check if writable as we may
-		// set an install config as Not current
-		this.isCurrent = isCurrent;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public ConfigurationActivityModel[] getActivityModel() {
-		if (activities == null && !initialized) 
-			initialize();
-		if (activities == null)
-			return new ConfigurationActivityModel[0];
-		return (ConfigurationActivityModel[]) activities.toArray(arrayTypeFor(activities));
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public void addActivityModel(ConfigurationActivityModel activity) {
-		if (activities == null)
-			activities = new ArrayList();
-		if (!activities.contains(activity)) {
-			activities.add(activity);
-			activity.setInstallConfigurationModel(this);
-		}
-	}
-	/**
-	 * 
-	 */
-	public Date getCreationDate() {
-//		if (!initialized) initialize();
-		if (date == null)
-			initialize();
-		return date;
-	}
-	/**
-	 * Sets the date.
-	 * @param date The date to set
-	 */
-	public void setCreationDate(Date date) {
-		assertIsWriteable();
-		this.date = date;
-	}
-	/**
-	 * @since 2.0
-	 */
-	public URL getURL() {
-		//if (!initialized) initialize();
-		//no need to initialize, always set
-		delayedResolve();
-		return locationURL;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public String getLabel() {
-//		if (!initialized) initialize();
-		if (label == null)
-			initialize();
-		return label;
-	}
-
-	/**
-	 * @since 2.0.2
-	 */
-
-	public String toString() {
-		return getLabel();
-	}
-
-	/**
-	 * Sets the label.
-	 * @param label The label to set
-	 */
-	public void setLabel(String label) {
-		assertIsWriteable();
-		this.label = label;
-	}
-
-	/**
-	 * Gets the locationURLString.
-	 * @return Returns a String
-	 */
-	public String getLocationURLString() {
-		if (!initialized) delayedResolve();
-		return locationURLString;
-	}
-
-	/**
-	 * Sets the locationURLString.
-	 * @param locationURLString The locationURLString to set
-	 */
-	public void setLocationURLString(String locationURLString) {
-		assertIsWriteable();
-		this.locationURLString = locationURLString;
-		this.locationURL = null;
-	}
-
-	/*
-	 * @see ModelObject#resolve(URL, ResourceBundle)
-	 */
-	public void resolve(URL base, URL bundleURL) throws MalformedURLException {
-
-		this.base = base;
-		this.bundleURL = bundleURL;
-
-	}
-
-	/**
-	 * Returns the timeline.
-	 * @return long
-	 */
-	public long getTimeline() {
-		return 0;
-//		if (!initialized) initialize();
-//		return timeline;
-	}
-
-
-	/*
-	 * initialize the configurations from the persistent model.
-	 */
-	private void initialize() {
-		
-		try {
-			try {
-				IPlatformConfiguration platformConfig;
-				if (UpdateManagerUtils.sameURL(getURL(), ConfiguratorUtils.getCurrentPlatformConfiguration().getConfigurationLocation()))
-					platformConfig = ConfiguratorUtils.getCurrentPlatformConfiguration();
-				else 
-					platformConfig = ConfiguratorUtils.getPlatformConfiguration(getURL());
-				
-				new InstallConfigurationParser(platformConfig, this);
-			} catch (FileNotFoundException exception) {
-				UpdateCore.warn(locationURLString + " does not exist, The local site is not in synch with the file system and is pointing to a file that doesn't exist.", exception); //$NON-NLS-1$
-				throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ErrorDuringFileAccess", locationURLString), exception); //$NON-NLS-1$
-			} catch (IOException exception) {
-				throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ErrorDuringFileAccess", locationURLString), exception); //$NON-NLS-1$
-			}
-			
-		} catch (CoreException e) {
-			UpdateCore.warn("Error processing configuration history:" + locationURL.toExternalForm(), e); //$NON-NLS-1$
-		} finally {
-			initialized = true;
-		}
-		
-		//finish resolve
-		// PERF:
-		try {
-			// delegate
-			resolveListReference(getActivityModel(), base, bundleURL);
-			resolveListReference(getConfigurationSitesModel(), base, bundleURL);
-		} catch (MalformedURLException e){}		
-	}
-
-	/*
-	 * 
-	 */
-	private void delayedResolve() {
-
-		// PERF: delay resolution
-		if (resolved)
-			return;
-
-		resolved = true;
-		// resolve local elements
-		try {
-			//locationURL = resolveURL(base, bundleURL, locationURLString);		
-			locationURL = new URL(locationURLString);
-		} catch (MalformedURLException e){
-			File f = new File(locationURLString);
-			try {
-				if (f.exists())
-					locationURL = f.toURL();
-				else
-					locationURL = base;
-			} catch (MalformedURLException e1) {
-				locationURL = base;
-			}
-		}
-	}
-	
-	public void resetActivities() {
-		activities = null;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
deleted file mode 100644
index 6c45080..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.internal.configurator.*;
-import org.eclipse.update.internal.core.*;
-
-
-/**
- * parse the default site.xml
- */
-
-public class InstallConfigurationParser {
-	private PlatformConfiguration platformConfig;
-	private URL siteURL;
-	private InstallConfigurationModel config;
-	private ConfiguredSiteModel configSite;
-
-	/**
-	 * Constructor for DefaultSiteParser
-	 */
-	public InstallConfigurationParser(
-		IPlatformConfiguration platformConfig,
-		InstallConfigurationModel config)
-		throws IOException, CoreException {
-
-		Assert.isTrue(platformConfig instanceof PlatformConfiguration);
-		this.platformConfig = (PlatformConfiguration)platformConfig;
-		
-		this.config = config;
-
-		// DEBUG:		
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
-			UpdateCore.debug("Start parsing Configuration:" + (config).getURL().toExternalForm()); //$NON-NLS-1$
-		}
-		
-		processConfig(this.platformConfig);
-	}
-
-
-
-	/** 
-	 * process the Site info
-	 */
-	private void processSite(SiteEntry siteEntry) throws CoreException, IOException {
-
-		//site url
-		siteURL = siteEntry.getURL();
-		try {
-			siteURL = Platform.asLocalURL(siteURL);
-			// TODO workaround bug in platform url resolution
-			if (siteURL.getProtocol().equals("file")) //$NON-NLS-1$
-				siteURL = new File(siteURL.getFile()).toURL();
-		} catch (IOException e) {
-			// keep original url
-		}
-
-		// policy
-		ISite site = SiteManager.getSite(siteURL,null);
-
-		// configuration site
-		BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
-		configSite = factory.createConfigurationSiteModel((SiteModel) site, siteEntry.getSitePolicy().getType());
-
-		//platform url
-		configSite.setPlatformURLString(siteEntry.getURL().toExternalForm());
-		
-		// configured
-		configSite.setEnabled(siteEntry.isEnabled());
-
-		// check if the site exists and is updatable
-	 	configSite.setUpdatable(siteEntry.isUpdateable());
-	 	
-		// add to install configuration
-	 	config.addConfigurationSiteModel(configSite);
-	 	configSite.setInstallConfigurationModel(config);
-		
-		FeatureEntry[] features = siteEntry.getFeatureEntries();
-		for (int i=0; i<features.length; i++) {
-			processFeature(features[i]);
-		}
-	}
-
-	/** 
-	 * process the DefaultFeature info
-	 */
-	private void processFeature(FeatureEntry feature) throws CoreException, IOException {
-
-		// url
-		String path = feature.getURL(); //$NON-NLS-1$
-		URL url = UpdateManagerUtils.getURL(siteURL, path, null);
-
-		if (url != null) {
-			SiteFeatureReference ref = new SiteFeatureReference();
-			ref.setSite((ISite) configSite.getSiteModel());
-			ref.setURL(url);
-			(configSite.getConfigurationPolicyModel()).addConfiguredFeatureReference(ref);
-
-			//updateURL
-//TODO do we need the update url and to resolve it?
-//			String updateURLString = attributes.getValue("updateURL"); //$NON-NLS-1$
-//			URLEntry entry = new URLEntry();
-//			entry.setURLString(updateURLString);
-//			entry.resolve(siteURL,null);
-
-			// DEBUG:		
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
-				UpdateCore.debug("End Processing DefaultFeature Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
-			}
-
-		} else {
-			UpdateCore.log( Policy.bind("InstallConfigurationParser.FeatureReferenceNoURL"), new Exception()); //$NON-NLS-1$
-		}
-
-	}
-
-	/** 
-	 * process the Activity info
-	 */
-//	private void processActivity(Attributes attributes) {
-//
-//		// action
-//		String actionString = attributes.getValue("action"); //$NON-NLS-1$
-//		int action = Integer.parseInt(actionString);
-//
-//		// create
-//		ConfigurationActivityModel activity =
-//			new BaseSiteLocalFactory().createConfigurationActivityModel();
-//		activity.setAction(action);
-//
-//		// label
-//		String label = attributes.getValue("label"); //$NON-NLS-1$
-//		if (label != null)
-//			activity.setLabel(label);
-//
-//		// date
-//		String dateString = attributes.getValue("date"); //$NON-NLS-1$
-//		Date date = new Date(Long.parseLong(dateString));
-//		activity.setDate(date);
-//
-//		// status
-//		String statusString = attributes.getValue("status"); //$NON-NLS-1$
-//		int status = Integer.parseInt(statusString);
-//		activity.setStatus(status);
-//
-//		config.addActivityModel(activity);
-//
-//		// DEBUG:		
-//		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
-//			UpdateCore.debug("End Processing Activity: action:" + actionString + " label: " + label + " date:" + dateString + " status" + statusString); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-//		}
-//
-//	}
-
-	/** 
-	 * process the Config info
-	 */
-	private void processConfig(PlatformConfiguration platformConfig) throws IOException, CoreException {
-
-		// date
-		Date date = new Date(platformConfig.getChangeStamp());
-		config.setCreationDate(date);
-		config.setLabel(date.toString());
-		
-		//timeline
-//		String timelineString = attributes.getValue("timeline"); //$NON-NLS-1$
-//		long timeline = config.getCreationDate().getTime();
-//		if (timelineString!=null) {
-//			timeline = Long.parseLong(timelineString);
-//		}
-//		config.setTimeline(timeline);
-
-		SiteEntry[] sites = platformConfig.getConfiguration().getSites();
-		for (int i=0; i<sites.length; i++)
-			processSite(sites[i]);
-
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
deleted file mode 100644
index 4cab39e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
+++ /dev/null

@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * This class manages the configurations.
- */
-
-public class SiteLocalModel extends ModelObject {
-	public static final String CONFIG_FILE = "platform.xml"; //$NON-NLS-1$
-	private long stamp;
-	private String label;
-	private URL location;
-	private String locationURLString;
-	private int history = UpdateCore.DEFAULT_HISTORY;
-	private List /* of InstallConfigurationModel */configurations;
-	private List /* of InstallConfigurationModel */preservedConfigurations;
-	private InstallConfigurationModel currentConfiguration;
-
-	/**
-	 * Constructor for LocalSite
-	 */
-	public SiteLocalModel(){
-		super();
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public InstallConfigurationModel getCurrentConfigurationModel() {
-		return currentConfiguration;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public InstallConfigurationModel[] getConfigurationHistoryModel() {
-		if (configurations==null)
-			// initialize history
-			processHistory();
-		
-		if (configurations == null)
-			return new InstallConfigurationModel[0];
-		else
-			return (InstallConfigurationModel[])configurations.toArray(arrayTypeFor(configurations));
-	}
-
-	/**
-	 * adds a new configuration to the LocalSite
-	 *  the newly added configuration is teh current one
-	 */
-	public void addConfigurationModel(InstallConfigurationModel config) {
-		if (config != null) {
-			if (configurations == null)
-				configurations = new ArrayList();
-			if (!configurations.contains(config))
-				configurations.add(config);
-		}
-	}
-
-	/**
-	 * adds a new configuration to the LocalSite
-	 *  the newly added configuration is teh current one
-	 */
-	public boolean removeConfigurationModel(InstallConfigurationModel config) {
-		if (config != null) {
-			return configurations.remove(config);
-		}
-		return false;
-	}
-	/**
-	 * Gets the location of the local site.
-	 * @return Returns a URL
-	 */
-	public URL getLocationURL() {
-		return location;
-	}
-
-	/**
-	 * Gets the locationURLString.
-	 * @return Returns a String
-	 */
-	public String getLocationURLString() {
-		return locationURLString;
-	}
-
-
-	/**
-	 * Sets the locationURLString.
-	 * @param locationURLString The locationURLString to set
-	 */
-	public void setLocationURLString(String locationURLString) {
-		assertIsWriteable();
-		this.locationURLString = locationURLString;
-		this.location=null;
-	}
-
-
-	/**
-	 * @since 2.0
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * Sets the label.
-	 * @param label The label to set
-	 */
-	public void setLabel(String label) {
-		assertIsWriteable();
-		this.label = label;
-	}
-
-	
-	/**
-	 * @since 2.0
-	 */
-	public int getMaximumHistoryCount() {
-		return history;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public void setMaximumHistoryCount(int history) {
-		assertIsWriteable();
-		this.history = history;
-	}
-
-	
-	/**
-	 * Adds a preserved configuration into teh collection
-	 * do not save the configuration
-	 * @since 2.0
-	 */
-	public void addPreservedInstallConfigurationModel(InstallConfigurationModel configuration) {
-		if (preservedConfigurations == null)
-			preservedConfigurations = new ArrayList();
-
-		preservedConfigurations.add(configuration);
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public boolean removePreservedConfigurationModel(InstallConfigurationModel configuration) {
-		if (preservedConfigurations != null) {
-			return preservedConfigurations.remove(configuration);
-		}
-		return false;
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public InstallConfigurationModel[] getPreservedConfigurationsModel() {
-		if (preservedConfigurations==null || preservedConfigurations.isEmpty())
-			return new InstallConfigurationModel[0];
-		return (InstallConfigurationModel[])preservedConfigurations.toArray(arrayTypeFor(preservedConfigurations));
-	}
-
-
-	/**
-	 * Sets the currentConfiguration.
-	 * @param currentConfiguration The currentConfiguration to set
-	 */
-	public void setCurrentConfigurationModel(InstallConfigurationModel currentConfiguration) {
-		assertIsWriteable();
-		this.currentConfiguration = currentConfiguration;
-		
-		//2.0.2 set the configuredSite of sites
-		ConfiguredSiteModel[] confSites = currentConfiguration.getConfigurationSitesModel();
-		for (int i = 0; i < confSites.length; i++) {
-			confSites[i].getSiteModel().setConfiguredSiteModel(confSites[i]);
-		}
-	}
-
-	/*
-	 * @see ModelObject#resolve(URL)
-	 */
-	public void resolve(URL base,URL bundleURL) throws MalformedURLException {
-		// local
-		location = resolveURL(base,bundleURL,getLocationURLString());
-		
-		// delegate
-		resolveListReference(getConfigurationHistoryModel(),base,bundleURL);
-		resolveListReference(getPreservedConfigurationsModel(),base,bundleURL);
-		resolveReference(getCurrentConfigurationModel(),base,bundleURL);
-	}
-	
-
-	/**
-	 * Gets the stamp.
-	 * @return Returns a long
-	 */
-	public long getStamp() {
-		return stamp;
-	}
-
-	/**
-	 * Sets the stamp.
-	 * @param stamp The stamp to set
-	 */
-	public void setStamp(long stamp) {
-		this.stamp = stamp;
-	}
-
-	/**
-	 * @see org.eclipse.update.core.model.ModelObject#getPropertyName()
-	 */
-	protected String getPropertyName() {
-		return "platform"; //$NON-NLS-1$
-	}
-
-	/*
-	 * reads the configuration/history directory
-	 */
-	private void processHistory() {
-		try {
-			URL historyURL = new URL(getLocationURL(), "history"); //$NON-NLS-1$
-			historyURL = Platform.asLocalURL(historyURL);
-			File historyDir = new File(historyURL.getFile());
-			if (historyDir.exists()) {
-				File[] backedConfigs = historyDir.listFiles();
-				BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
-				for (int i=0; i<backedConfigs.length; i++) {
-					String name = backedConfigs[i].getName();
-					if (name.endsWith(".xml")) //$NON-NLS-1$
-						name = name.substring(0, name.length()-4);
-					else 
-						continue;
-					Date date = new Date(Long.parseLong(name));
-					InstallConfigurationModel config = factory.createInstallConfigurationModel();
-					config.setLocationURLString(backedConfigs[i].getAbsolutePath().replace('\\', '/'));
-					config.setLabel(date.toString());
-					config.setCreationDate(date);
-					config.resolve(backedConfigs[i].toURL(), getResourceBundleURL());
-	
-					// add the config
-					addConfigurationModel(config);
-				}
-			}
-		} catch (Exception e) {
-			UpdateCore.warn("Error processing history: ", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * return the appropriate resource bundle for this sitelocal
-	 */
-	URL getResourceBundleURL() throws CoreException {
-		URL url = null;
-		try {
-			url = UpdateManagerUtils.asDirectoryURL(getLocationURL());
-		} catch (MissingResourceException e) {
-			UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		return url;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
deleted file mode 100644
index 1ca737d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.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.internal.model;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.internal.configurator.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * parse the default site.xml
- */
-
-public class SiteLocalParser {
-
-	private PlatformConfiguration platformConfig;
-	private SiteLocalModel site;
-	public static final String CONFIG = "config"; //$NON-NLS-1$
-	private ResourceBundle bundle;
-	private BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
-
-	/**
-	 * return the appropriate resource bundle for this sitelocal
-	 */
-	private ResourceBundle getResourceBundle() throws CoreException {
-		ResourceBundle bundle = null;
-		URL url = null;
-		try {
-			url = UpdateManagerUtils.asDirectoryURL(site.getLocationURL());
-			ClassLoader l = new URLClassLoader(new URL[] { url }, null);
-			bundle = ResourceBundle.getBundle("platform", Locale.getDefault(), l); //$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		return bundle;
-	}
-
-	/**
-	 * Constructor for DefaultSiteParser
-	 */
-	public SiteLocalParser(IPlatformConfiguration platformConfig, ILocalSite site) throws IOException, CoreException {
-		Assert.isTrue(platformConfig instanceof PlatformConfiguration);
-		this.platformConfig = (PlatformConfiguration)platformConfig;
-		
-		Assert.isTrue(site instanceof SiteLocalModel);
-		this.site = (SiteLocalModel) site;
-
-		// DEBUG:		
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
-			UpdateCore.debug("Start parsing localsite:" + ((SiteLocalModel) site).getLocationURLString()); //$NON-NLS-1$
-		}
-		
-		bundle = getResourceBundle();
-		
-		processConfig();
-		//processHistory();
-	}
-
-	
-//	/** 
-//	 * process the Site info
-//	 */
-//	private void processSite(Attributes attributes) throws MalformedURLException {
-//		//
-//		String info = attributes.getValue("label"); //$NON-NLS-1$
-//		info = UpdateManagerUtils.getResourceString(info, bundle);
-//		site.setLabel(info);
-//	
-//		// history
-//		String historyString = attributes.getValue("history"); //$NON-NLS-1$
-//		int history;
-//		if (historyString == null || historyString.equals("")) { //$NON-NLS-1$
-//			history = SiteLocalModel.DEFAULT_HISTORY;
-//		} else {
-//			history = Integer.parseInt(historyString);
-//		}
-//		site.setMaximumHistoryCount(history);
-//	
-//		//stamp
-//		String stampString = attributes.getValue("stamp"); //$NON-NLS-1$
-//		long stamp = Long.parseLong(stampString);
-//		site.setStamp(stamp);
-//	
-//		// DEBUG:		
-//		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
-//			UpdateCore.debug("End process Site label:" + info); //$NON-NLS-1$
-//		}
-//	
-//	}
-
-	/** 
-	 * process the Config info
-	 */
-	private void processConfig() throws MalformedURLException, CoreException {
-
-		String label = platformConfig.getConfiguration().getDate().toString();
-		label = UpdateManagerUtils.getResourceString(label, bundle);
-		site.setLabel(label);
-
-		URL url = site.getLocationURL();
-		InstallConfigurationModel config = factory.createInstallConfigurationModel();
-		config.setLocationURLString(url.toExternalForm());
-		config.setLabel(label);
-		config.resolve(url, site.getResourceBundleURL());
-
-		// add the config
-		((SiteLocal)site).addConfiguration((InstallConfiguration)config);
-
-		// DEBUG:		
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
-			UpdateCore.debug("End Processing Config Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/BatchInstallOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/BatchInstallOperation.java
deleted file mode 100644
index 3c93b56..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/BatchInstallOperation.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-
-public class BatchInstallOperation
-	extends Operation
-	implements IBatchOperation {
-		
-	private static final String KEY_INSTALLING = "OperationsManager.installing"; //$NON-NLS-1$
-	protected IInstallFeatureOperation[] operations;
-
-	public BatchInstallOperation(IInstallFeatureOperation[] operations) {
-		super();
-		this.operations = operations;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IMultiOperation#getOperations()
-	 */
-	public IFeatureOperation[] getOperations() {
-		return operations;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean execute(IProgressMonitor monitor, IOperationListener listener) throws CoreException, InvocationTargetException {
-		int installCount = 0;
-		boolean success = false;
-		
-		if (operations == null || operations.length == 0)
-			return false;
-					
-//		// Check for duplication conflicts
-//		ArrayList conflicts =
-//			DuplicateConflictsValidator.computeDuplicateConflicts(
-//				operations,
-//				config);
-//		if (conflicts != null) {
-//			boolean continueProcessing = false;
-//			if (listener != null)
-//				continueProcessing = listener.beforeExecute(this, conflicts);
-//			if (!continueProcessing)
-//				return false;
-//		}
-		
-		OperationsManager.setInProgress(true);
-		if (monitor == null) 
-			monitor = new NullProgressMonitor();
-			
-		try {			
-			if (listener != null)
-				listener.beforeExecute(this, null);
-			
-			monitor.beginTask(
-				Policy.bind(KEY_INSTALLING),
-				operations.length);
-			for (int i = 0; i < operations.length; i++) {
-				SubProgressMonitor subMonitor =
-					new SubProgressMonitor(
-						monitor,
-						1,
-						SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
-
-				operations[i].execute(subMonitor, listener);
-				OperationsManager.addPendingOperation(operations[i]);
-
-				operations[i].markProcessed();
-				if (listener != null)
-					listener.afterExecute(operations[i], null);
-
-				//monitor.worked(1);
-				installCount++;
-			}
-			success = true;
-			return SiteManager.getLocalSite().save();
-		} catch (InstallAbortedException e) {
-			// saves the current configuration
-			if (installCount > 0)
-				SiteManager.getLocalSite().save();
-			throw new InvocationTargetException(e);
-		} catch (CoreException e) {
-			// saves the current configuration
-			if (installCount > 0)
-				SiteManager.getLocalSite().save();
-			throw new InvocationTargetException(e);
-		} finally {
-			OperationsManager.setInProgress(false);
-			monitor.done();
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ConfigOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ConfigOperation.java
deleted file mode 100644
index ddda616..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ConfigOperation.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Configure a feature.
- * ConfigOperation
- */
-public class ConfigOperation
-	extends FeatureOperation
-	implements IConfigFeatureOperation {
-
-	public ConfigOperation(
-		IConfiguredSite site,
-		IFeature feature) {
-		super(site, feature);
-	}
-
-	public boolean execute(IProgressMonitor pm, IOperationListener listener)
-		throws CoreException {
-
-		IStatus status =
-			OperationsManager.getValidator().validatePendingConfig(feature);
-		if (status != null && status.getCode() == IStatus.ERROR) {
-			throw new CoreException(status);
-		}
-
-		targetSite.configure(feature);
-//		ensureUnique();
-
-		try {
-			// Restart not needed
-			boolean restartNeeded = false;
-
-			// Check if this operation is cancelling one that's already pending
-			IOperation pendingOperation =
-				OperationsManager.findPendingOperation(feature);
-
-			if (pendingOperation instanceof IUnconfigFeatureOperation) {
-				// no need to do either pending change
-				OperationsManager.removePendingOperation(pendingOperation);
-			} else {
-				OperationsManager.addPendingOperation(this);
-			}
-
-			markProcessed();
-			if (listener != null)
-				listener.afterExecute(this, null);
-
-			restartNeeded = SiteManager.getLocalSite().save() && restartNeeded;
-
-			// notify the model
-			OperationsManager.fireObjectChanged(feature, null);
-
-			return restartNeeded;
-		} catch (CoreException e) {
-			undo();
-			UpdateUtils.logException(e);
-			throw e;
-		}
-	}
-
-	public void undo() throws CoreException {
-		targetSite.unconfigure(feature);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/DuplicateConflictsValidator.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/DuplicateConflictsValidator.java
deleted file mode 100644
index a6097fe..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/DuplicateConflictsValidator.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-
-
-/**
- * 
- */
-public class DuplicateConflictsValidator  {
-
-	private static final String KEY_CONFLICT =
-		"DuplicateConflictsDialog.conflict"; //$NON-NLS-1$
-
-	public static class IdEntry {
-		IConfiguredSite csite;
-		IFeature feature;
-
-		public IdEntry(IFeature feature, IConfiguredSite csite) {
-			this.feature = feature;
-			this.csite = csite;
-			if (csite == null) {
-				System.out.println("csite null"); //$NON-NLS-1$
-			}
-		}
-		public boolean isInstallCandidate() {
-			return csite != null;
-		}
-		public IFeature getFeature() {
-			return feature;
-		}
-
-		public String getIdentifier() {
-			return feature.getVersionedIdentifier().getIdentifier();
-		}
-		public IConfiguredSite getConfiguredSite() {
-			if (csite != null)
-				return csite;
-			return feature.getSite().getCurrentConfiguredSite();
-		}
-		public boolean sameLevel(IdEntry entry) {
-			VersionedIdentifier vid = feature.getVersionedIdentifier();
-			VersionedIdentifier evid =
-				entry.getFeature().getVersionedIdentifier();
-			return vid.equals(evid);
-		}
-		public String toString() {
-			IConfiguredSite configSite = getConfiguredSite();
-			String version =
-				feature.getVersionedIdentifier().getVersion().toString();
-			String location = configSite.getSite().getURL().getFile();
-			return Policy.bind(
-				KEY_CONFLICT,
-				new String[] { version, location });
-		}
-	}
-
-	public static ArrayList computeDuplicateConflicts(
-		IInstallFeatureOperation job,
-		IInstallConfiguration config,
-		IConfiguredSite targetSite,
-		IFeatureReference[] optionalFeatures) {
-		Hashtable featureTable = new Hashtable();
-		try {
-			computePresentState(featureTable, config);
-			computeNewFeature(
-				job.getFeature(),
-				targetSite,
-				featureTable,
-				optionalFeatures);
-			return computeConflicts(featureTable);
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	public static ArrayList computeDuplicateConflicts(
-		IInstallFeatureOperation[] jobs,
-		IInstallConfiguration config) {
-		Hashtable featureTable = new Hashtable();
-		computePresentState(featureTable, config);
-		computeNewFeatures(jobs, config, featureTable);
-		return computeConflicts(featureTable);
-	}
-
-	public static ArrayList computeDuplicateConflicts(
-		JobTargetSite[] jobSites,
-		IInstallConfiguration config) {
-		Hashtable featureTable = new Hashtable();
-		computePresentState(featureTable, config);
-		computeNewFeatures(jobSites, featureTable);
-		return computeConflicts(featureTable);
-	}
-
-	private static ArrayList computeConflicts(Hashtable featureTable) {
-		ArrayList result = null;
-		for (Enumeration enum = featureTable.elements();
-			enum.hasMoreElements();
-			) {
-			ArrayList candidate = (ArrayList) enum.nextElement();
-			if (candidate.size() == 1)
-				continue;
-			ArrayList conflict = checkForConflict(candidate);
-			if (conflict != null) {
-				if (result == null)
-					result = new ArrayList();
-				result.add(conflict);
-			}
-		}
-		return result;
-	}
-
-	private static ArrayList checkForConflict(ArrayList candidate) {
-		IdEntry firstEntry = null;
-		for (int i = 0; i < candidate.size(); i++) {
-			IdEntry entry = (IdEntry) candidate.get(i);
-			if (firstEntry == null)
-				firstEntry = entry;
-			else if (!entry.sameLevel(firstEntry))
-				return candidate;
-		}
-		return null;
-	}
-
-	private static void computePresentState(
-		Hashtable table,
-		IInstallConfiguration config) {
-		IConfiguredSite[] csites = config.getConfiguredSites();
-		for (int i = 0; i < csites.length; i++) {
-			IConfiguredSite csite = csites[i];
-			IFeatureReference[] refs = csite.getConfiguredFeatures();
-			for (int j = 0; j < refs.length; j++) {
-				try {
-					addEntry(refs[j].getFeature(null), csite, table);
-				} catch (CoreException e) {
-					// don't let one bad feature stop the loop
-				}
-			}
-		}
-	}
-
-	private static void computeNewFeatures(
-		IInstallFeatureOperation[] jobs,
-		IInstallConfiguration config,
-		Hashtable featureTable) {
-		for (int i = 0; i < jobs.length; i++) {
-			IInstallFeatureOperation job = jobs[i];
-			IConfiguredSite targetSite =
-				UpdateUtils.getDefaultTargetSite(config, job);
-			IFeature newFeature = job.getFeature();
-			try {
-				computeNewFeature(newFeature, targetSite, featureTable, null);
-			} catch (CoreException e) {
-			}
-		}
-	}
-
-	private static void computeNewFeatures(
-		JobTargetSite[] jobSites,
-		Hashtable featureTable) {
-		for (int i = 0; i < jobSites.length; i++) {
-			JobTargetSite jobSite = jobSites[i];
-			IInstallFeatureOperation job = jobSite.job;
-			IConfiguredSite targetSite = jobSite.targetSite;
-			IFeature newFeature = job.getFeature();
-			try {
-				computeNewFeature(newFeature, targetSite, featureTable, null);
-			} catch (CoreException e) {
-			}
-		}
-	}
-
-	private static void computeNewFeature(
-		IFeature feature,
-		IConfiguredSite csite,
-		Hashtable table,
-		IFeatureReference[] optionalFeatures)
-		throws CoreException {
-		addEntry(feature, csite, table);
-		IIncludedFeatureReference[] irefs =
-			feature.getIncludedFeatureReferences();
-		for (int i = 0; i < irefs.length; i++) {
-			IIncludedFeatureReference iref = irefs[i];
-			boolean add = true;
-
-			if (iref.isOptional() && optionalFeatures != null) {
-				boolean found = false;
-				for (int j = 0; j < optionalFeatures.length; j++) {
-					IFeatureReference checked = optionalFeatures[j];
-					if (checked.equals(iref)) {
-						found = true;
-						break;
-					}
-				}
-				add = found;
-			}
-			if (add)
-				computeNewFeature(
-					iref.getFeature(null),
-					csite,
-					table,
-					optionalFeatures);
-		}
-	}
-
-	private static void addEntry(
-		IFeature feature,
-		IConfiguredSite csite,
-		Hashtable featureTable) {
-		String id = feature.getVersionedIdentifier().getIdentifier();
-		ArrayList entries = (ArrayList) featureTable.get(id);
-		if (entries == null) {
-			entries = new ArrayList();
-			featureTable.put(id, entries);
-		}
-		IdEntry entry = new IdEntry(feature, csite);
-		boolean replaced = false;
-		for (int i = 0; i < entries.size(); i++) {
-			IdEntry existingEntry = (IdEntry) entries.get(i);
-			IConfiguredSite existingSite = existingEntry.getConfiguredSite();
-			if (existingSite.equals(entry.getConfiguredSite())) {
-				// same site - replace it if not new
-				if (entry.isInstallCandidate()) {
-					entries.set(i, entry);
-					entries.remove(existingEntry);
-				}
-				replaced = true;
-				break;
-			}
-		}
-		if (!replaced)
-			entries.add(entry);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureHierarchyElement.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureHierarchyElement.java
deleted file mode 100644
index 3e3fb9d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureHierarchyElement.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.update.internal.operations;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * This class is used to construct a joint feature hiearchy.
- * Old feature reference represents feature that is
- * found on in the current configuration. New feature
- * reference is found in the feature that is an install/update
- * candidate. The element is used to join nodes of the
- * hiearchy formed by including features so that
- * each node in the hiearchy contains references to the
- * old and the new feature. Old and new features have
- * the same IDs but different versions, except in 
- * the case of optional features, where the tree may
- * be constructed to bring in an optional feature
- * that was not installed initially. In that case,
- * some nodes may have old an new references with the
- * same ID and version. 
- * <p>
- * Old feature reference may be null. That means
- * that the older feature with the same ID but lower
- * version was not found in the current configuration.
- */
-public class FeatureHierarchyElement {
-
-	private Object root;
-	private ArrayList children;
-	private IFeatureReference oldFeatureRef;
-	private IFeatureReference newFeatureRef;
-	private boolean checked;
-	private boolean optionalChildren;
-	private boolean nativeUpgrade = false;
-
-	public FeatureHierarchyElement(
-		IFeatureReference oldRef,
-		IFeatureReference newRef) {
-		oldFeatureRef = oldRef;
-		newFeatureRef = newRef;
-	}
-
-	public void setRoot(Object root) {
-		this.root = root;
-	}
-
-	public Object getRoot() {
-		return root;
-	}
-
-	/*
-	 * Return true if element can be checked, false otherwise.
-	 */
-	public boolean isEditable() {
-		// cannot uncheck non-optional features
-		if (isOptional() == false)
-			return false;
-		// cannot uncheck optional feature that
-		// has already been installed
-		if (oldFeatureRef != null)
-			return false;
-		return true;
-	}
-
-	/**
-	 * A hirearchy node represents a 'false update' if
-	 * both old and new references exist and both
-	 * point to the feature with the same ID and version.
-	 * These nodes will not any bytes to be downloaded - 
-	 * they simply exist to allow the hirarchy to
-	 * reach the optional children that are missing
-	 * and will be installed.
-	 */
-
-	public boolean isFalseUpdate() {
-		if (oldFeatureRef != null && newFeatureRef != null) {
-			try {
-				return oldFeatureRef.getVersionedIdentifier().equals(
-					newFeatureRef.getVersionedIdentifier());
-			} catch (CoreException e) {
-			}
-		}
-		return false;
-	}
-	/**
-	 * Returns true if feature is included as optional.
-	 */
-	public boolean isOptional() {
-		return newFeatureRef instanceof IIncludedFeatureReference
-			&& ((IIncludedFeatureReference) newFeatureRef).isOptional();
-	}
-	/**
-	 * Returns true if this optional feature is selected
-	 * for installation. Non-optional features or non-editable
-	 * features are always checked.
-	 */
-	public boolean isChecked() {
-		return checked;
-	}
-
-	void setNativeUpgrade(boolean nativeUpgrade) {
-		this.nativeUpgrade = nativeUpgrade;
-	}
-
-	/**
-	 * Returns true if this optional feature should
-	 * be enabled when installed. By default, all
-	 * features in the hiearchy should be enabled.
-	 * The exception is for optional features that
-	 * are updated to a new version in case where
-	 * the older version of the optional feature
-	 * is disabled in the given configuration. 
-	 * In this case, the feature is
-	 * updated and disabled in order to maintain
-	 * its state.
-	 */
-	public boolean isEnabled(IInstallConfiguration config) {
-		if (nativeUpgrade)
-			return true;
-		if (isOptional() && oldFeatureRef != null) {
-			try {
-				IFeature oldFeature = oldFeatureRef.getFeature(null);
-				IConfiguredSite csite =
-					UpdateUtils.getConfigSite(oldFeature, config);
-				return csite.isConfigured(oldFeature);
-			} catch (CoreException e) {
-			}
-		}
-		return true;
-	}
-
-	public IFeature getFeature() {
-		try {
-			IFeature feature = newFeatureRef.getFeature(null);
-			return feature;
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Selects an editable feature for installation.
-	 */
-	public void setChecked(boolean checked) {
-		this.checked = checked;
-	}
-	/**
-	 * Returns label for UI presentation.
-	 */
-	public String getLabel() {
-		try {
-			return getFeatureLabel(newFeatureRef);
-		} catch (CoreException e) {
-			if (newFeatureRef instanceof IIncludedFeatureReference) {
-				String iname =
-					((IIncludedFeatureReference) newFeatureRef).getName();
-				if (iname != null)
-					return iname;
-			}
-			try {
-				VersionedIdentifier vid =
-					newFeatureRef.getVersionedIdentifier();
-				return vid.toString();
-			} catch (CoreException e2) {
-			}
-		}
-		return null;
-	}
-	/**
-	 * Computes label from the feature.
-	 */
-	private String getFeatureLabel(IFeatureReference featureRef)
-		throws CoreException {
-		IFeature feature = featureRef.getFeature(null);
-		return feature.getLabel()
-			+ " " //$NON-NLS-1$
-			+ feature.getVersionedIdentifier().getVersion().toString();
-	}
-	/**
-	 * Computes children by linking matching features from the
-	 * old feature's and new feature's hierarchy.
-	 */
-	public FeatureHierarchyElement[] getChildren(
-		boolean update,
-		boolean patch,
-		IInstallConfiguration config) {
-		computeChildren(update, patch, config);
-		FeatureHierarchyElement[] array =
-			new FeatureHierarchyElement[children.size()];
-		children.toArray(array);
-		return array;
-	}
-
-	public FeatureHierarchyElement[] getChildren() {
-		if (children != null) {
-			FeatureHierarchyElement[] array =
-				new FeatureHierarchyElement[children.size()];
-			children.toArray(array);
-			return array;
-		}
-
-		return new FeatureHierarchyElement[0];
-	}
-	/**
-	 * Computes children of this node.
-	 */
-	public void computeChildren(
-		boolean update,
-		boolean patch,
-		IInstallConfiguration config) {
-		if (children == null) {
-			children = new ArrayList();
-			try {
-				IFeature oldFeature = null;
-				IFeature newFeature = null;
-				newFeature = newFeatureRef.getFeature(null);
-				if (oldFeatureRef != null)
-					oldFeature = oldFeatureRef.getFeature(null);
-				optionalChildren =
-					computeElements(
-						oldFeature,
-						newFeature,
-						update,
-						patch,
-						config,
-						children);
-				for (int i = 0; i < children.size(); i++) {
-					FeatureHierarchyElement element =
-						(FeatureHierarchyElement) children.get(i);
-					element.setRoot(getRoot());
-				}
-			} catch (CoreException e) {
-			}
-		}
-	}
-	/**
-	 * 
-	 */
-	public boolean hasOptionalChildren() {
-		return optionalChildren;
-	}
-	/**
-	 * Adds checked optional features to the provided set.
-	 */
-	public void addCheckedOptionalFeatures(
-		boolean update,
-		boolean patch,
-		IInstallConfiguration config,
-		Set set) {
-		if (isOptional() && isChecked()) {
-			// Do not add checked optional features
-			// if this is an update case but
-			// the node is not a 'true' update
-			// (old and new feature are the equal)
-			if (!update || !isFalseUpdate())
-				set.add(newFeatureRef);
-		}
-		FeatureHierarchyElement[] elements = getChildren(update, patch, config);
-		for (int i = 0; i < elements.length; i++) {
-			elements[i].addCheckedOptionalFeatures(update, patch, config, set);
-		}
-	}
-
-	/**
-	 * Computes first-level children of the linked hierarchy
-	 * for the provided old and new features (same ID, different version
-	 * where new version is greater or equal the old version).
-	 * Old feature may be null. 
-	 */
-	public static boolean computeElements(
-		IFeature oldFeature,
-		IFeature newFeature,
-		boolean update,
-		boolean patch,
-		IInstallConfiguration config,
-		ArrayList list) {
-		Object[] oldChildren = null;
-		Object[] newChildren = getIncludedFeatures(newFeature);
-		boolean optionalChildren = false;
-
-		try {
-			if (oldFeature != null) {
-				oldChildren = getIncludedFeatures(oldFeature);
-			}
-			for (int i = 0; i < newChildren.length; i++) {
-				IFeatureReference oldRef = null;
-				IFeatureReference newRef = (IFeatureReference) newChildren[i];
-				if (oldChildren != null) {
-					String newId =
-						newRef.getVersionedIdentifier().getIdentifier();
-
-					for (int j = 0; j < oldChildren.length; j++) {
-						IFeatureReference cref =
-							(IFeatureReference) oldChildren[j];
-						try {
-							if (cref
-								.getVersionedIdentifier()
-								.getIdentifier()
-								.equals(newId)) {
-								oldRef = cref;
-								break;
-							}
-						} catch (CoreException ex) {
-						}
-					}
-				} else if (patch) {
-					// 30849 - find the old reference in the
-					// configuration.
-					if (!UpdateUtils.isPatch(newFeature)) {
-						oldRef = findPatchedReference(newRef, config);
-					}
-				}
-				// test if the old optional feature exists
-				if (oldRef != null
-					&& ((oldRef instanceof IIncludedFeatureReference
-						&& ((IIncludedFeatureReference) oldRef).isOptional())
-						|| patch)) {
-					try {
-						IFeature f = oldRef.getFeature(null);
-						if (f == null)
-							oldRef = null;
-					} catch (CoreException e) {
-						// missing
-						oldRef = null;
-					}
-				}
-				FeatureHierarchyElement element =
-					new FeatureHierarchyElement(oldRef, newRef);
-				// If this is an update (old feature exists), 
-				// only check the new optional feature if the old exists.
-				// Otherwise, always check.
-				if (element.isOptional() && (update || patch)) {
-					element.setChecked(oldRef != null);
-					if (oldRef == null) {
-						// Does not have an old reference,
-						// but it may contain an older
-						// feature that may still qualify
-						// for update. For example,
-						// an older version may have been
-						// installed natively from the CD-ROM.
-						if (hasOlderVersion(newRef)) {
-							element.setNativeUpgrade(true);
-							element.setChecked(true);
-						}
-					}
-				} else
-					element.setChecked(true);
-				list.add(element);
-				element.computeChildren(update, patch, config);
-				if (element.isOptional() || element.hasOptionalChildren())
-					optionalChildren = true;
-			}
-		} catch (CoreException e) {
-		}
-		return optionalChildren;
-	}
-	public static boolean hasOlderVersion(IFeatureReference newRef) {
-		try {
-			VersionedIdentifier vid = newRef.getVersionedIdentifier();
-			PluginVersionIdentifier version = vid.getVersion();
-			String mode = getUpdateVersionsMode();
-
-			IFeature[] allInstalled =
-				UpdateUtils.getInstalledFeatures(vid, false);
-			for (int i = 0; i < allInstalled.length; i++) {
-				IFeature candidate = allInstalled[i];
-				PluginVersionIdentifier cversion =
-					candidate.getVersionedIdentifier().getVersion();
-				// Verify that the difference qualifies as
-				// an update.
-				if (mode.equals(UpdateCore.EQUIVALENT_VALUE)) {
-					if (version.isEquivalentTo(cversion))
-						return true;
-				} else if (mode.equals(UpdateCore.COMPATIBLE_VALUE)) {
-					if (version.isCompatibleWith(cversion))
-						return true;
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-
-	private static IFeatureReference findPatchedReference(
-		IFeatureReference newRef,
-		IInstallConfiguration config)
-		throws CoreException {
-		VersionedIdentifier vid = newRef.getVersionedIdentifier();
-		IConfiguredSite[] csites = config.getConfiguredSites();
-		for (int i = 0; i < csites.length; i++) {
-			IConfiguredSite csite = csites[i];
-			IFeatureReference[] refs = csite.getConfiguredFeatures();
-			for (int j = 0; j < refs.length; j++) {
-				IFeatureReference ref = refs[j];
-				VersionedIdentifier refVid = ref.getVersionedIdentifier();
-				if (vid.getIdentifier().equals(refVid.getIdentifier()))
-					return ref;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns included feature references for the given reference.
-	 */
-	public static Object[] getIncludedFeatures(IFeatureReference ref) {
-		try {
-			IFeature feature = ref.getFeature(null);
-			return getIncludedFeatures(feature);
-		} catch (CoreException e) {
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * Returns included feature references for the given feature.
-	 */
-
-	public static Object[] getIncludedFeatures(IFeature feature) {
-		try {
-			return feature.getIncludedFeatureReferences();
-		} catch (CoreException e) {
-		}
-		return new Object[0];
-	}
-
-	private static String getUpdateVersionsMode() {
-		Preferences store = UpdateCore.getPlugin().getPluginPreferences();
-		return store.getString(UpdateCore.P_UPDATE_VERSIONS);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureOperation.java
deleted file mode 100644
index af90568..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureOperation.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.internal.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-
-public abstract class FeatureOperation extends Operation implements IFeatureOperation {
-	
-	protected IFeature feature;
-	protected IFeature oldFeature;
-	protected IConfiguredSite targetSite;
-
-//	private boolean optionalDelta;
-	
-	
-	public FeatureOperation(IConfiguredSite targetSite, IFeature feature) {
-		super();
-		this.feature = feature;
-		this.targetSite = targetSite;
-	}
-
-	public IFeature getFeature() {
-		return feature;
-	}
-	
-	public IFeature getOldFeature() {
-		return oldFeature;
-	}
-	
-//	public boolean isOptionalDelta() {
-//		return optionalDelta;
-//	}
-	
-	public IConfiguredSite getTargetSite() {
-		return targetSite;
-	}
-
-	public void setTargetSite(IConfiguredSite targetSite) {
-		this.targetSite = targetSite;
-	}
-	
-//	void ensureUnique()
-//		throws CoreException {
-//		
-//		// Only need to check features that patch other features.	
-//		boolean patch = false;
-//		if (targetSite == null)
-//			targetSite = feature.getSite().getCurrentConfiguredSite();
-//		IImport[] imports = feature.getImports();
-//		for (int i = 0; i < imports.length; i++) {
-//			if (imports[i].isPatch()) {
-//				patch = true;
-//				break;
-//			}
-//		}
-//		if (!patch)
-//			return;
-//			
-//		IFeature localFeature =
-//			UpdateUtils.getLocalFeature(targetSite, feature);
-//		ArrayList oldFeatures = new ArrayList();
-//		// First collect all older active features that
-//		// have the same ID as new features marked as 'unique'.
-//		UpdateUtils.collectOldFeatures(localFeature, targetSite, oldFeatures);
-//		// Now unconfigure old features to enforce uniqueness
-//		for (int i = 0; i < oldFeatures.size(); i++) {
-//			IFeature oldFeature = (IFeature) oldFeatures.get(i);
-//			unconfigure(config, oldFeature);
-//		}
-//	}
-
-	static void configure(IInstallConfiguration config, IFeature feature)
-		throws CoreException {
-		IConfiguredSite site = UpdateUtils.getConfigSite(feature, config);
-		if (site != null) {
-			site.configure(feature);
-		}
-	}
-
-	static boolean unconfigure(IFeature feature)
-		throws CoreException {
-		IInstallConfiguration config = SiteManager.getLocalSite().getCurrentConfiguration();
-		IConfiguredSite site = UpdateUtils.getConfigSite(feature, config);
-		if (site != null) {
-			PatchCleaner cleaner = new PatchCleaner(site, feature);
-			boolean result = site.unconfigure(feature);
-			cleaner.dispose();
-			return result;
-		}
-		return false;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureStatus.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureStatus.java
deleted file mode 100644
index 4d642dc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/FeatureStatus.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-
-/**
- * The feature status provide info about the broken features and what is
- * wrong.
- */
-public class FeatureStatus extends Status {
-	public final static int CODE_OTHER = IStatus.OK;//0
-	public final static int CODE_PREREQ_FEATURE = 1;
-	public final static int CODE_PREREQ_PLUGIN = 2;
-	public final static int CODE_EXCLUSIVE = 4;
-	public final static int CODE_CYCLE = 8;
-	public final static int CODE_OPTIONAL_CHILD = 16;
-	public final static int CODE_ENVIRONMENT = 32;
-	IFeature feature;
-
-	public FeatureStatus(IFeature feature, int severity, String pluginId, int code, String message, Throwable exception) {
-		super(severity, pluginId, code, message, exception);
-		this.feature = feature;
-	}
-	public IFeature getFeature() {
-		return feature;
-	}
-	public boolean equals(Object obj) {
-		if (!(obj instanceof FeatureStatus))
-			return false;
-		FeatureStatus fs = (FeatureStatus) obj;
-		// only check for feature, regardless of status type
-		if (fs.getFeature() == feature)
-			return true;
-		else if (fs.getFeature() == null && feature == null)
-			return fs.getMessage().equals(getMessage());
-		else if (fs.getFeature() == null && feature != null)
-			return false;
-		else if (fs.getFeature() != null && feature == null)
-			return false;
-		else if (fs.getFeature().equals(feature))
-			return true;
-		else
-			return false;
-	}
-
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/InstallOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/InstallOperation.java
deleted file mode 100644
index 4fd71d2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/InstallOperation.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Configure a feature.
- * ConfigOperation
- */
-public class InstallOperation
-	extends FeatureOperation
-	implements IInstallFeatureOperation {
-	private static final String KEY_OLD = "OperationsManager.error.old"; //$NON-NLS-1$
-
-	private IFeatureReference[] optionalFeatures;
-	private IFeature[] unconfiguredOptionalFeatures;
-	private IVerificationListener verifier;
-
-	/**
-	 * Constructor
-	 * @param site
-	 * @param feature
-	 * @param optionalFeatures optional features to install. If null, the operation will install them all (if any)
-	 * @param unconfiguredOptionalElements optional features unconfigured before the operation. They should remain unconfigured after the install.
-	 * @param verifier
-	 */
-	public InstallOperation(
-		IConfiguredSite site,
-		IFeature feature,
-		IFeatureReference[] optionalFeatures,
-		IFeature[] unconfiguredOptionalElements,
-		IVerificationListener verifier) {
-		super(site, feature);
-		IFeature[] installed = UpdateUtils.getInstalledFeatures(feature);
-		if (installed.length > 0)
-			this.oldFeature = installed[0];
-		this.unconfiguredOptionalFeatures = unconfiguredOptionalElements;
-		this.optionalFeatures = optionalFeatures;
-		this.verifier = verifier;
-	}
-
-	public IFeatureReference[] getOptionalFeatures() {
-		return optionalFeatures;
-	}
-
-	public boolean execute(IProgressMonitor pm, IOperationListener listener)
-		throws CoreException {
-
-		boolean reinstall = false;
-		if (oldFeature != null
-			&& feature.getVersionedIdentifier().equals(
-				oldFeature.getVersionedIdentifier()))
-			reinstall = true;
-
-		setOptionalFeatures();
-
-		if (optionalFeatures == null)
-			targetSite.install(feature, verifier, pm);
-		else
-			targetSite.install(feature, optionalFeatures, verifier, pm);
-
-		if (!reinstall) {
-
-			if (oldFeature != null) { //&& isOptionalDelta()) {
-				preserveOptionalState();
-
-				boolean oldSuccess = unconfigure(oldFeature);
-				if (!oldSuccess) {
-					IInstallConfiguration config = SiteManager.getLocalSite().getCurrentConfiguration();
-					if (!UpdateUtils.isNestedChild(config, oldFeature)) {
-						// "eat" the error if nested child
-						String message =
-							Policy.bind(
-								KEY_OLD,
-								oldFeature.getLabel());
-						IStatus status =
-							new Status(
-								IStatus.ERROR,
-								UpdateUtils.getPluginId(),
-								IStatus.OK,
-								message,
-								null);
-						throw new CoreException(status);
-					}
-				}
-			}
-
-//			if (oldFeature == null) {
-//				ensureUnique();
-//			}
-		}
-		return true;
-	}
-
-	private void preserveOptionalState() {
-		if (unconfiguredOptionalFeatures == null)
-			return;
-
-		for (int i = 0; i < unconfiguredOptionalFeatures.length; i++) {
-			try {
-				// Get the feature that matches the original unconfigured ones.
-				IFeature localFeature =
-					UpdateUtils.getLocalFeature(
-						targetSite,
-						unconfiguredOptionalFeatures[i]);
-				if (localFeature != null)
-					targetSite.unconfigure(localFeature);
-
-			} catch (CoreException e) {
-				// Ignore this - we will leave with it
-			}
-		}
-	}
-	
-	private void setOptionalFeatures() {
-		try {
-			// Ensure optional features are correctly set
-			if (optionalFeatures == null && UpdateUtils.hasOptionalFeatures(feature) ) {
-				JobRoot jobRoot = new JobRoot(this);
-				IInstallConfiguration config = SiteManager.getLocalSite().getCurrentConfiguration();
-				HashSet set = new HashSet();
-				boolean update = oldFeature != null;
-				boolean patch = UpdateUtils.isPatch(feature);
-				FeatureHierarchyElement[] elements = jobRoot.getElements();
-				for (int i = 0; i < elements.length; i++) {
-					elements[i].addCheckedOptionalFeatures(update, patch, config, set);
-				}
-				optionalFeatures = new IFeatureReference[set.size()];
-				set.toArray(optionalFeatures);
-				unconfiguredOptionalFeatures = jobRoot.getUnconfiguredOptionalFeatures(config, targetSite);
-			}
-		} catch (CoreException e) {
-			UpdateUtils.logException(e);
-		}
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobRoot.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobRoot.java
deleted file mode 100644
index ce9f6ef..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobRoot.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.update.internal.operations;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-public class JobRoot {
-	private IInstallFeatureOperation job;
-	private FeatureHierarchyElement[] elements;
-
-	public JobRoot(IInstallFeatureOperation job) {
-		this.job = job;
-	}
-
-	public IInstallFeatureOperation getJob() {
-		return job;
-	}
-
-	public FeatureHierarchyElement[] getElements() {
-		if (elements == null)
-			computeElements();
-		return elements;
-	}
-
-	/**
-	 * Returns unconfigured features before an install.
-	 * After installing the features, the caller must get the local features that match
-	 * these unconfigured features and unconfigure them.
-	 * @param config
-	 * @param targetSite
-	 * @return
-	 */
-	public IFeature[] getUnconfiguredOptionalFeatures(
-		IInstallConfiguration config,
-		IConfiguredSite targetSite) {
-
-		ArrayList unconfiguredOptionalFeatures = new ArrayList();
-		getUnconfiguredOptionalFeatures(unconfiguredOptionalFeatures, config, targetSite, getElements(), UpdateUtils.isPatch(job.getFeature()));
-		IFeature[] unconfiguredOptionalFeaturesArray =
-			new IFeature[unconfiguredOptionalFeatures.size()];
-		unconfiguredOptionalFeatures.toArray(unconfiguredOptionalFeaturesArray);
-		return unconfiguredOptionalFeaturesArray;
-	}
-
-	private void getUnconfiguredOptionalFeatures(
-		ArrayList unconfiguredOptionalFeatures,
-		IInstallConfiguration config,
-		IConfiguredSite targetSite,
-		FeatureHierarchyElement[] optionalElements,
-		boolean isPatch) {
-		for (int i = 0; i < optionalElements.length; i++) {
-			FeatureHierarchyElement[] children =
-				optionalElements[i].getChildren(true, isPatch, config);
-			getUnconfiguredOptionalFeatures(
-				unconfiguredOptionalFeatures,
-				config,
-				targetSite,
-				children,
-				isPatch);
-			if (!optionalElements[i].isEnabled(config)) {
-				unconfiguredOptionalFeatures.add(optionalElements[i].getFeature());
-			}
-		}
-	}
-
-	private void computeElements() {
-		try {
-			IFeature oldFeature = job.getOldFeature();
-			IFeature newFeature = job.getFeature();
-			ArrayList list = new ArrayList();
-			boolean patch = UpdateUtils.isPatch(newFeature);
-			FeatureHierarchyElement.computeElements(
-				oldFeature,
-				newFeature,
-				oldFeature != null,
-				patch,
-				SiteManager.getLocalSite().getCurrentConfiguration(),
-				list);
-			elements = new FeatureHierarchyElement[list.size()];
-			list.toArray(elements);
-			for (int i = 0; i < elements.length; i++) {
-				elements[i].setRoot(this);
-			}
-		} catch (CoreException e) {
-			UpdateUtils.logException(e);
-		}
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSite.java
deleted file mode 100644
index efe036f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSite.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.update.internal.operations;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.operations.*;
-
-
-public class JobTargetSite {
-	public IInstallFeatureOperation job;
-	public IConfiguredSite affinitySite;
-	public IConfiguredSite defaultSite;
-	public IConfiguredSite targetSite;
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSites.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSites.java
deleted file mode 100644
index 4892116..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/JobTargetSites.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-import java.util.*;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-
-/**
- * Hashtable of JobTargetSite's. Keys are IInstallFeatureOperation.
- * JobTargetSites
- */
-public class JobTargetSites extends HashMap {
-
-	private IInstallConfiguration config;
-	private IInstallFeatureOperation[] jobs;
-
-	/**
-	 * Constructor for ReviewPage2
-	 */
-	public JobTargetSites(IInstallConfiguration config) {
-		this.config = config;
-	}
-
-	public void setJobs(IInstallFeatureOperation[] jobs) {
-		this.jobs = jobs;
-	}
-
-	public void computeDefaultTargetSites() {
-		clear();
-		for (int i = 0; i < jobs.length; i++) {
-			JobTargetSite jobSite = new JobTargetSite();
-			jobSite.job = jobs[i];
-			jobSite.defaultSite =
-				UpdateUtils.getDefaultTargetSite(config, jobs[i], false);
-			jobSite.affinitySite =
-				UpdateUtils.getAffinitySite(config, jobs[i].getFeature());
-			if (jobSite.affinitySite == null)
-				jobSite.affinitySite = jobs[i].getTargetSite();
-			jobSite.targetSite = computeTargetSite(jobSite);
-			put(jobs[i], jobSite);
-		}
-	}
-
-	public IConfiguredSite computeTargetSite(JobTargetSite jobSite) {
-		IConfiguredSite csite =
-			jobSite.affinitySite != null ? jobSite.affinitySite : jobSite.defaultSite;
-		return (csite == null) ? getFirstTarget(jobSite) : csite;
-	}
-
-	
-	public boolean getSiteVisibility(IConfiguredSite site, JobTargetSite jobSite) {
-		// If affinity site is known, only it should be shown
-		if (jobSite.affinitySite != null) {
-			// Must compare referenced sites because
-			// configured sites themselves may come from 
-			// different configurations
-			return site.getSite().equals(jobSite.affinitySite.getSite());
-		}
-
-		// If this is the default target site, let it show
-		if (site.equals(jobSite.defaultSite))
-			return true;
-			
-//		// Not the default. If update, show only private sites.
-//		// If install, allow product site + private sites.
-//		if (site.isPrivateSite() && site.isUpdatable())
-//			return true;
-//			
-//		if (jobSite.job.getOldFeature() == null && site.isProductSite())
-//			return true;
-//			
-//		return false;
-		
-		// Allow installing into any updateable site
-		return site.isUpdatable();
-	}
-
-
-	private IConfiguredSite getFirstTarget(JobTargetSite jobSite) {
-		IConfiguredSite firstSite = jobSite.targetSite;
-		if (firstSite == null) {
-			IConfiguredSite[] sites = config.getConfiguredSites();
-			for (int i = 0; i < sites.length; i++) {
-				IConfiguredSite csite = sites[i];
-				if (getSiteVisibility(csite, jobSite)) {
-					firstSite = csite;
-					break;
-				}
-			}
-		}
-		return firstSite;
-	}
-
-	public JobTargetSite findPatchedFeature(IFeature patch) {
-		for (Iterator enum = this.keySet().iterator(); enum.hasNext();) {
-			JobTargetSite jobSite = (JobTargetSite)get(enum.next());
-			IFeature target = jobSite.job.getFeature();
-			if (!target.equals(patch) && UpdateUtils.isPatch(target, patch))
-				return jobSite;
-		}
-		return null;
-	}
-
-	public JobTargetSite[] getJobTargetSites() {
-		JobTargetSite[] sites = new JobTargetSite[jobs.length];
-		for (int i = 0; i < jobs.length; i++) {
-			JobTargetSite jobSite = (JobTargetSite)get(jobs[i]);
-			sites[i] = jobSite;
-		}
-		return sites;
-	}
-
-	public IConfiguredSite getTargetSite(IInstallFeatureOperation job) {
-		IInstallFeatureOperation target = null;
-		for (int i = 0; jobs != null && i < jobs.length; i++)
-			if (job == jobs[i]) {
-				target = jobs[i];
-				break;
-			}
-		if (target != null) {
-			JobTargetSite jobSite = (JobTargetSite)get(target);
-			if (jobSite != null)
-				return jobSite.targetSite;
-		}
-		return null;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/Operation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/Operation.java
deleted file mode 100644
index 7816c84..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/Operation.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.internal.operations;
-
-import org.eclipse.update.operations.*;
-
-
-public abstract class Operation implements IOperation {
-	
-	private boolean processed;
-	
-	
-	public Operation() {
-	}
-	
-	public boolean isProcessed() {
-		return processed;
-	}
-	
-	public void markProcessed() {
-		processed = true;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationFactory.java
deleted file mode 100644
index cc6d02f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationFactory.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.internal.operations;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-public class OperationFactory implements IOperationFactory {
-
-	public OperationFactory() {
-	}
-
-	public IConfigFeatureOperation createConfigOperation(
-		IConfiguredSite targetSite,
-		IFeature feature) {
-		return new ConfigOperation(targetSite, feature);
-	}
-
-	public IBatchOperation createBatchInstallOperation(IInstallFeatureOperation[] operations) {
-		return new BatchInstallOperation(operations);
-	}
-
-	public IInstallFeatureOperation createInstallOperation(
-		IConfiguredSite targetSite,
-		IFeature feature,
-		IFeatureReference[] optionalFeatures,
-		IFeature[] unconfiguredOptionalFeatures,
-		IVerificationListener verifier) {
-		return new InstallOperation(
-			targetSite,
-			feature,
-			optionalFeatures,
-			unconfiguredOptionalFeatures,
-			verifier);
-	}
-
-	public IUnconfigFeatureOperation createUnconfigOperation(
-		IConfiguredSite targetSite,
-		IFeature feature) {
-		return new UnconfigOperation(targetSite, feature);
-	}
-
-	public IConfigFeatureOperation createReplaceFeatureVersionOperation(
-		IFeature feature,
-		IFeature anotherFeature) {
-	
-		return new ReplaceFeatureVersionOperation(feature, anotherFeature);		
-	}
-		
-	public IUninstallFeatureOperation createUninstallOperation(
-		IConfiguredSite targetSite,
-		IFeature feature) {
-		return new UninstallOperation(targetSite, feature);
-	}
-
-	public IRevertConfigurationOperation createRevertConfigurationOperation(
-		IInstallConfiguration config,
-		IProblemHandler problemHandler) {
-		return new RevertConfigurationOperation(
-			config,
-			problemHandler);
-	}
-
-	public IToggleSiteOperation createToggleSiteOperation(
-		IConfiguredSite site) {
-		return new ToggleSiteOperation(site);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationValidator.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationValidator.java
deleted file mode 100644
index e52209b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/OperationValidator.java
+++ /dev/null

@@ -1,1282 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-//import java.io.*;
-//import java.net.*;
-//import java.nio.channels.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.configurator.PlatformConfiguration;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- *  
- */
-public class OperationValidator implements IOperationValidator {
-	private static final String KEY_ROOT_MESSAGE =
-		"ActivityConstraints.rootMessage"; //$NON-NLS-1$
-	private static final String KEY_ROOT_MESSAGE_INIT =
-		"ActivityConstraints.rootMessageInitial"; //$NON-NLS-1$
-	private static final String KEY_CHILD_MESSAGE =
-		"ActivityConstraints.childMessage"; //$NON-NLS-1$
-	private static final String KEY_PLATFORM = "ActivityConstraints.platform"; //$NON-NLS-1$
-	private static final String KEY_PRIMARY = "ActivityConstraints.primary"; //$NON-NLS-1$
-	private static final String KEY_OS = "ActivityConstraints.os"; //$NON-NLS-1$
-	private static final String KEY_WS = "ActivityConstraints.ws"; //$NON-NLS-1$
-	private static final String KEY_ARCH = "ActivityConstraints.arch"; //$NON-NLS-1$
-	private static final String KEY_PREREQ = "ActivityConstraints.prereq"; //$NON-NLS-1$
-	private static final String KEY_PREREQ_PLUGIN =
-		"ActivityConstaints.prereq.plugin"; //$NON-NLS-1$
-	private static final String KEY_PREREQ_FEATURE =
-		"ActivityConstaints.prereq.feature"; //$NON-NLS-1$
-	private static final String KEY_PREREQ_PERFECT =
-		"ActivityConstraints.prereqPerfect"; //$NON-NLS-1$
-	private static final String KEY_PREREQ_EQUIVALENT =
-		"ActivityConstraints.prereqEquivalent"; //$NON-NLS-1$
-	private static final String KEY_PREREQ_COMPATIBLE =
-		"ActivityConstraints.prereqCompatible"; //$NON-NLS-1$
-	private static final String KEY_PREREQ_GREATER =
-		"ActivityConstraints.prereqGreaterOrEqual"; //$NON-NLS-1$
-	private static final String KEY_OPTIONAL_CHILD =
-		"ActivityConstraints.optionalChild"; //$NON-NLS-1$
-	private static final String KEY_CYCLE = "ActivityConstraints.cycle"; //$NON-NLS-1$
-	private static final String KEY_CONFLICT = "ActivityConstraints.conflict"; //$NON-NLS-1$
-	private static final String KEY_EXCLUSIVE = "ActivityConstraints.exclusive"; //$NON-NLS-1$
-	private static final String KEY_NO_LICENSE =
-		"ActivityConstraints.noLicense"; //$NON-NLS-1$
-
-	/**
-	 * Checks if the platform configuration has been modified outside this program.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePlatformConfigValid() {
-		ArrayList status = new ArrayList(1);
-		checkPlatformWasModified(status);
-		
-		// report status
-		if (status.size() > 0)
-			return createMultiStatus(KEY_ROOT_MESSAGE, status, IStatus.ERROR);
-		return null;
-	}
-	
-	/*
-	 * Called by UI before performing operation. Returns null if no errors, a
-	 * status with IStatus.WARNING code when the initial configuration is
-	 * broken, or a status with IStatus.ERROR when there the operation
-	 * introduces new errors
-	 */
-	public IStatus validatePendingInstall(
-		IFeature oldFeature,
-		IFeature newFeature) {
-		// check initial state
-		ArrayList beforeStatus = new ArrayList();
-		validateInitialState(beforeStatus);
-
-		// check proposed change
-		ArrayList status = new ArrayList();
-		checkPlatformWasModified(status);
-		validateInstall(oldFeature, newFeature, status);
-
-		// report status
-		return createCombinedReportStatus(beforeStatus, status);
-	}
-
-	/*
-	 * Called by UI before performing operation
-	 */
-	public IStatus validatePendingUnconfig(IFeature feature) {
-		// check initial state
-		ArrayList beforeStatus = new ArrayList();
-		validateInitialState(beforeStatus);
-
-		// check proposed change
-		ArrayList status = new ArrayList();
-		checkPlatformWasModified(status);
-		validateUnconfigure(feature, status);
-
-		// report status
-		return createCombinedReportStatus(beforeStatus, status);
-	}
-
-	/*
-	 * Called by UI before performing operation
-	 */
-	public IStatus validatePendingConfig(IFeature feature) {
-		// check initial state
-		ArrayList beforeStatus = new ArrayList();
-		validateInitialState(beforeStatus);
-
-		// check proposed change
-		ArrayList status = new ArrayList();
-		checkPlatformWasModified(status);
-		validateConfigure(feature, status);
-
-		// report status
-		return createCombinedReportStatus(beforeStatus, status);
-	}
-
-	/**
-	 * Called before performing operation.
-	 */
-	public IStatus validatePendingReplaceVersion(
-		IFeature feature,
-		IFeature anotherFeature) {
-		// check initial state
-		ArrayList beforeStatus = new ArrayList();
-		validateInitialState(beforeStatus);
-
-		// check proposed change
-		ArrayList status = new ArrayList();
-		checkPlatformWasModified(status);
-		validateReplaceVersion(feature, anotherFeature, status);
-
-		// report status
-		return createCombinedReportStatus(beforeStatus, status);
-	}
-
-
-	/*
-	 * Called by the UI before doing a revert/ restore operation
-	 */
-	public IStatus validatePendingRevert(IInstallConfiguration config) {
-		// check initial state
-		ArrayList beforeStatus = new ArrayList();
-		validateInitialState(beforeStatus);
-
-		// check proposed change
-		ArrayList status = new ArrayList();
-		checkPlatformWasModified(status);
-		validateRevert(config, status);
-
-		// report status
-		return createCombinedReportStatus(beforeStatus, status);
-	}
-
-	/*
-	 * Called by the UI before doing a batched processing of several pending
-	 * changes.
-	 */
-	public IStatus validatePendingChanges(IInstallFeatureOperation[] jobs) {
-		// check initial state
-		ArrayList beforeStatus = new ArrayList();
-		validateInitialState(beforeStatus);
-		checkPlatformWasModified(beforeStatus);
-
-		// check proposed change
-		ArrayList status = new ArrayList();
-		validatePendingChanges(jobs, status, beforeStatus);
-
-		// report status
-		return createCombinedReportStatus(beforeStatus, status);
-	}
-
-	/*
-	 * Check the current state.
-	 */
-	public IStatus validateCurrentState() {
-		// check the state
-		ArrayList status = new ArrayList();
-		checkPlatformWasModified(status);
-		validateInitialState(status);
-
-		// report status
-		if (status.size() > 0)
-			return createMultiStatus(KEY_ROOT_MESSAGE, status, IStatus.ERROR);
-		return null;
-	}
-
-	/*
-	 * Check to see if we are not broken even before we start
-	 */
-	private static void validateInitialState(ArrayList status) {
-		try {
-			ArrayList features = computeFeatures();
-			// uncomment this when patch released in boot
-			//checkConfigurationLock(status);
-			checkConstraints(features, status);
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-
-	/*
-	 * handle unconfigure
-	 */
-	private static void validateUnconfigure(
-		IFeature feature,
-		ArrayList status) {
-		try {
-			checkSiteReadOnly(feature,status);
-			ArrayList features = computeFeatures();
-			features = computeFeaturesAfterOperation(features, null, feature);
-			checkConstraints(features, status);
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-
-
-	/*
-	 * handle configure
-	 */
-	private static void validateConfigure(IFeature feature, ArrayList status) {
-		try {
-			checkSiteReadOnly(feature,status);
-			ArrayList features = computeFeatures();
-			checkOptionalChildConfiguring(feature, status);
-			checkForCycles(feature, null, features);
-			features = computeFeaturesAfterOperation(features, feature, null);
-			checkConstraints(features, status);
-
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-
-	/*
-	 * handle replace version
-	 */
-	private static void validateReplaceVersion(
-		IFeature feature,
-		IFeature anotherFeature,
-		ArrayList status) {
-		try {
-			checkSiteReadOnly(feature,status);
-			ArrayList features = computeFeatures();
-			checkForCycles(feature, null, features);
-			features =
-				computeFeaturesAfterOperation(
-					features,
-					anotherFeature,
-					feature);
-			checkConstraints(features, status);
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-
-	/*
-	 * handle install and update
-	 */
-	private static void validateInstall(
-		IFeature oldFeature,
-		IFeature newFeature,
-		ArrayList status) {
-		try {
-			checkSiteReadOnly(oldFeature,status);
-			ArrayList features = computeFeatures();
-			checkForCycles(newFeature, null, features);
-			features =
-				computeFeaturesAfterOperation(features, newFeature, oldFeature);
-			checkConstraints(features, status);
-			checkLicense(newFeature, status);
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-
-	/*
-	 * handle revert and restore
-	 */
-	private static void validateRevert(
-		IInstallConfiguration config,
-		ArrayList status) {
-		try {
-//			// check the timeline and don't bother
-//			// to check anything else if negative
-//			if (!checkTimeline(config, status))
-//				return;
-			ArrayList features = computeFeaturesAfterRevert(config);
-			checkConstraints(features, status);
-			checkRevertConstraints(features, status);
-
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-
-
-	/*
-	 * Handle one-click changes as a batch
-	 */
-	private static void validatePendingChanges(
-		IInstallFeatureOperation[] jobs,
-		ArrayList status,
-		ArrayList beforeStatus) {
-		try {
-			ArrayList features = computeFeatures();
-			ArrayList savedFeatures = features;
-			int nexclusives = 0;
-
-			// pass 1: see if we can process the entire "batch"
-			ArrayList tmpStatus = new ArrayList();
-			for (int i = 0; i < jobs.length; i++) {
-				IInstallFeatureOperation job = jobs[i];
-
-				IFeature newFeature = job.getFeature();
-				IFeature oldFeature = job.getOldFeature();
-				checkLicense(newFeature, status);
-				if (jobs.length > 1 && newFeature.isExclusive()) {
-					nexclusives++;
-					status.add(
-						createStatus(
-							newFeature,
-							FeatureStatus.CODE_EXCLUSIVE,
-							Policy.bind(KEY_EXCLUSIVE)));
-					continue;
-				}
-				checkForCycles(newFeature, null, features);
-				features =
-					computeFeaturesAfterOperation(
-						features,
-						newFeature,
-						oldFeature);
-			}
-			if (nexclusives > 0)
-				return;
-			checkConstraints(features, tmpStatus);
-			if (tmpStatus.size() == 0) // the whole "batch" is OK
-				return;
-
-			// pass 2: we have conflicts
-			features = savedFeatures;
-			for (int i = 0; i < jobs.length; i++) {
-				IInstallFeatureOperation job = jobs[i];
-				IFeature newFeature = job.getFeature();
-				IFeature oldFeature = job.getOldFeature();
-
-				features =
-					computeFeaturesAfterOperation(
-						features,
-						newFeature,
-						oldFeature);
-
-				checkConstraints(features, status);
-				if (status.size() > 0
-					&& !isBetterStatus(beforeStatus, status)) {
-					IStatus conflict =
-						createStatus(
-							newFeature,
-							FeatureStatus.CODE_OTHER,
-							Policy.bind(KEY_CONFLICT));
-					status.add(0, conflict);
-					return;
-				}
-			}
-		} catch (CoreException e) {
-			status.add(e.getStatus());
-		}
-	}
-	
-	private static void checkPlatformWasModified(ArrayList status) {
-		try {
-			// checks if the platform has been modified outside this eclipse instance
-			IPlatformConfiguration platformConfig = ConfiguratorUtils.getCurrentPlatformConfiguration();
-			
-			long currentTimeStamp = platformConfig.getChangeStamp();
-			// get the last modified value for this config, from this process point of view
-			if (platformConfig instanceof PlatformConfiguration) 
-				currentTimeStamp = ((PlatformConfiguration)platformConfig).getConfiguration().lastModified();
-				
-			// get the real last modified value
-			URL platformXML = platformConfig.getConfigurationLocation();
-			long actualTimeStamp = currentTimeStamp;
-			if ("file".equals(platformXML.getProtocol())) //$NON-NLS-1$
-				actualTimeStamp = new File(platformXML.getFile()).lastModified();
-			else {
-				URLConnection connection = platformXML.openConnection();
-				actualTimeStamp = connection.getLastModified();
-			}
-			if (currentTimeStamp != actualTimeStamp)
-				status.add(createStatus(
-								null,
-								FeatureStatus.CODE_OTHER,
-								Policy.bind("ActivityConstraints.platformModified"))); //$NON-NLS-1$
-		} catch (IOException e) {
-			// ignore
-		}
-	}
-	
-	private static void checkSiteReadOnly(IFeature feature, ArrayList status) {
-		if(feature == null){
-			return;
-		}
-		IConfiguredSite csite = feature.getSite().getCurrentConfiguredSite();
-		if (csite != null && !csite.isUpdatable())
-			status.add(createStatus(feature, FeatureStatus.CODE_OTHER,
-					Policy
-					.bind("ActivityConstraints.readOnly", //$NON-NLS-1$
-							csite.getSite().getURL().toExternalForm())));
-	}
-
-	/*
-	 * Compute a list of configured features
-	 */
-	private static ArrayList computeFeatures() throws CoreException {
-		return computeFeatures(true);
-	}
-	/*
-	 * Compute a list of configured features
-	 */
-	private static ArrayList computeFeatures(boolean configuredOnly)
-		throws CoreException {
-		ArrayList features = new ArrayList();
-		ILocalSite localSite = SiteManager.getLocalSite();
-		IInstallConfiguration config = localSite.getCurrentConfiguration();
-		IConfiguredSite[] csites = config.getConfiguredSites();
-
-		for (int i = 0; i < csites.length; i++) {
-			IConfiguredSite csite = csites[i];
-
-			IFeatureReference[] crefs;
-
-			if (configuredOnly)
-				crefs = csite.getConfiguredFeatures();
-			else
-				crefs = csite.getSite().getFeatureReferences();
-			for (int j = 0; j < crefs.length; j++) {
-				IFeatureReference cref = crefs[j];
-				IFeature cfeature = cref.getFeature(null);
-				features.add(cfeature);
-			}
-		}
-
-		return features;
-	}
-
-	/*
-	 * Compute the nested feature subtree starting at the specified base
-	 * feature
-	 */
-	private static ArrayList computeFeatureSubtree(
-			IFeature top,
-			IFeature feature,
-			ArrayList features,
-			boolean tolerateMissingChildren,
-			ArrayList configuredFeatures,
-			ArrayList visitedFeatures)
-	throws CoreException {
-
-		// check arguments
-		if (top == null)
-			return features;
-		if (feature == null)
-			feature = top;
-		if (features == null)
-			features = new ArrayList();
-		if (visitedFeatures == null)
-			visitedFeatures = new ArrayList();
-
-		// check for <includes> cycle
-		if (visitedFeatures.contains(feature)) {
-			IStatus status =
-			createStatus(top, FeatureStatus.CODE_CYCLE, Policy.bind(KEY_CYCLE));
-			throw new CoreException(status);
-		} else {
-			// keep track of visited features so we can detect cycles
-			visitedFeatures.add(feature);
-		}
-
-		// return specified base feature and all its children
-		if (!features.contains(feature))
-			features.add(feature);
-		IIncludedFeatureReference[] children =
-		feature.getIncludedFeatureReferences();
-		for (int i = 0; i < children.length; i++) {
-			try {
-				IFeature child = children[i].getFeature(null);
-				features =
-				computeFeatureSubtree(
-						top,
-						child,
-						features,
-						tolerateMissingChildren,
-						null,
-						visitedFeatures);
-			} catch (CoreException e) {
-				if (!children[i].isOptional() && !tolerateMissingChildren)
-					throw e;
-			}
-		}
-		// no cycles for this feature during DFS
-		visitedFeatures.remove(feature);
-		return features;
-	}
-
-	private static void checkLicense(IFeature feature, ArrayList status) {
-		IURLEntry licenseEntry = feature.getLicense();
-		if (licenseEntry != null) {
-			String license = licenseEntry.getAnnotation();
-			if (license != null && license.trim().length() > 0)
-				return;
-		}
-		status.add(
-			createStatus(feature, FeatureStatus.CODE_OTHER, Policy.bind(KEY_NO_LICENSE)));
-	}
-
-	/*
-	 * Compute a list of features that will be configured after the operation
-	 */
-	private static ArrayList computeFeaturesAfterOperation(
-		ArrayList features,
-		IFeature add,
-		IFeature remove)
-		throws CoreException {
-
-		ArrayList addTree = computeFeatureSubtree(add, null, null, false,
-		/* do not tolerate missing children */
-		features, null);
-		ArrayList removeTree =
-			computeFeatureSubtree(
-				remove,
-				null,
-				null,
-				true /* tolerate missing children */,
-				null,
-				null
-		);
-		if (remove != null) {
-			// Patches to features are removed together with
-			// those features. Include them in the list.
-			contributePatchesFor(removeTree, features, removeTree);
-		}
-
-		if (remove != null)
-			features.removeAll(removeTree);
-
-		if (add != null)
-			features.addAll(addTree);
-
-		return features;
-	}
-
-	private static void contributePatchesFor(
-		ArrayList removeTree,
-		ArrayList features,
-		ArrayList result)
-		throws CoreException {
-
-		for (int i = 0; i < removeTree.size(); i++) {
-			IFeature feature = (IFeature) removeTree.get(i);
-			contributePatchesFor(feature, features, result);
-		}
-	}
-
-	private static void contributePatchesFor(
-		IFeature feature,
-		ArrayList features,
-		ArrayList result)
-		throws CoreException {
-		for (int i = 0; i < features.size(); i++) {
-			IFeature candidate = (IFeature) features.get(i);
-			if (UpdateUtils.isPatch(feature, candidate)) {
-				ArrayList removeTree =
-					computeFeatureSubtree(candidate, null, null, true,null,null);
-				result.addAll(removeTree);
-			}
-		}
-	}
-
-	/*
-	 * Compute a list of features that will be configured after performing the
-	 * revert
-	 */
-	private static ArrayList computeFeaturesAfterRevert(IInstallConfiguration config)
-		throws CoreException {
-
-		ArrayList list = new ArrayList();
-		IConfiguredSite[] csites = config.getConfiguredSites();
-		for (int i = 0; i < csites.length; i++) {
-			IConfiguredSite csite = csites[i];
-			IFeatureReference[] features = csite.getConfiguredFeatures();
-			for (int j = 0; j < features.length; j++) {
-				list.add(features[j].getFeature(null));
-			}
-		}
-		return list;
-	}
-
-
-
-	/*
-	 * Compute a list of plugin entries for the specified features.
-	 */
-	private static ArrayList computePluginsForFeatures(ArrayList features)
-		throws CoreException {
-		if (features == null)
-			return new ArrayList();
-
-		HashMap plugins = new HashMap();
-		for (int i = 0; i < features.size(); i++) {
-			IFeature feature = (IFeature) features.get(i);
-			IPluginEntry[] entries = feature.getPluginEntries();
-			for (int j = 0; j < entries.length; j++) {
-				IPluginEntry entry = entries[j];
-				plugins.put(entry.getVersionedIdentifier(), entry);
-			}
-		}
-		ArrayList result = new ArrayList();
-		result.addAll(plugins.values());
-		return result;
-	}
-
-
-	/**
-	 * Check for feature cycles:
-	 * - visit feature
-	 * - if feature is in the cycle candidates list, then cycle found, else add it to candidates list
-	 * - DFS children 
-	 * - when return from DFS remove the feature from the candidates list
-	 */
-	private static void checkForCycles(
-			IFeature feature,
-			ArrayList candidates,
-			ArrayList configuredFeatures)
-	throws CoreException {
-
-		// check arguments
-		if (feature == null)
-			return;
-		if (configuredFeatures == null)
-			configuredFeatures = new ArrayList();
-		if (candidates == null)
-			candidates = new ArrayList();
-		
-		// check for <includes> cycle
-		if (candidates.contains(feature)) {
-			String msg = Policy.bind(
-					KEY_CYCLE, 
-					new String[] {feature.getLabel(), 
-							feature.getVersionedIdentifier().toString()});
-			IStatus status = createStatus(feature, FeatureStatus.CODE_CYCLE, msg);
-			throw new CoreException(status);
-		}
-
-		// potential candidate
-		candidates.add(feature);
-		
-		// recursively, check cycles with children
-		IIncludedFeatureReference[] children =
-		feature.getIncludedFeatureReferences();
-		for (int i = 0; i < children.length; i++) {
-			try {
-				IFeature child = children[i].getFeature(null);
-				checkForCycles(child, candidates, configuredFeatures);
-			} catch (CoreException e) {
-				if (!children[i].isOptional())
-					throw e;
-			}
-		}
-		// no longer a candidate, because no cycles with children
-		candidates.remove(feature);
-	}
-	
-	/*
-	 * validate constraints
-	 */
-	private static void checkConstraints(ArrayList features, ArrayList status)
-		throws CoreException {
-		if (features == null)
-			return;
-
-		ArrayList plugins = computePluginsForFeatures(features);
-
-		checkEnvironment(features, status);
-		checkPlatformFeature(features, plugins, status);
-		checkPrimaryFeature(features, status);
-		checkPrereqs(features, plugins, status);
-	}
-
-	/*
-	 * Verify all features are either portable, or match the current
-	 * environment
-	 */
-	private static void checkEnvironment(
-		ArrayList features,
-		ArrayList status) {
-
-		String os = Platform.getOS();
-		String ws = Platform.getWS();
-		String arch = Platform.getOSArch();
-
-		for (int i = 0; i < features.size(); i++) {
-			IFeature feature = (IFeature) features.get(i);
-			ArrayList fos = createList(feature.getOS());
-			ArrayList fws = createList(feature.getWS());
-			ArrayList farch = createList(feature.getOSArch());
-
-			if (fos.size() > 0) {
-				if (!fos.contains(os)) {
-					IStatus s =
-						createStatus(feature, FeatureStatus.CODE_ENVIRONMENT, Policy.bind(KEY_OS));
-					if (!status.contains(s))
-						status.add(s);
-					continue;
-				}
-			}
-
-			if (fws.size() > 0) {
-				if (!fws.contains(ws)) {
-					IStatus s =
-						createStatus(feature, FeatureStatus.CODE_ENVIRONMENT, Policy.bind(KEY_WS));
-					if (!status.contains(s))
-						status.add(s);
-					continue;
-				}
-			}
-
-			if (farch.size() > 0) {
-				if (!farch.contains(arch)) {
-					IStatus s =
-						createStatus(feature, FeatureStatus.CODE_ENVIRONMENT, Policy.bind(KEY_ARCH));
-					if (!status.contains(s))
-						status.add(s);
-					continue;
-				}
-			}
-		}
-	}
-
-	/*
-	 * Verify we end up with a version of platform configured
-	 */
-	private static void checkPlatformFeature(
-		ArrayList features,
-		ArrayList plugins,
-		ArrayList status) {
-
-		String[] bootstrapPlugins =
-			ConfiguratorUtils
-				.getCurrentPlatformConfiguration()
-				.getBootstrapPluginIdentifiers();
-
-		for (int i = 0; i < bootstrapPlugins.length; i++) {
-			boolean found = false;
-			for (int j = 0; j < plugins.size(); j++) {
-				IPluginEntry plugin = (IPluginEntry) plugins.get(j);
-				if (bootstrapPlugins[i]
-					.equals(plugin.getVersionedIdentifier().getIdentifier())) {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				IStatus s =
-					createStatus(null, FeatureStatus.CODE_OTHER, Policy.bind(KEY_PLATFORM));
-				if (!status.contains(s))
-					status.add(s);
-
-				return;
-			}
-		}
-	}
-
-	/*
-	 * Verify we end up with a version of primary feature configured
-	 */
-	private static void checkPrimaryFeature(
-		ArrayList features,
-		ArrayList status) {
-
-		String featureId =
-			ConfiguratorUtils
-				.getCurrentPlatformConfiguration()
-				.getPrimaryFeatureIdentifier();
-		
-		if (featureId == null)
-			return; // no existing primary feature, nothing to worry about
-
-		for (int i = 0; i < features.size(); i++) {
-			IFeature feature = (IFeature) features.get(i);
-			if (featureId
-				.equals(feature.getVersionedIdentifier().getIdentifier()))
-				return;
-		}
-
-		IStatus s = createStatus(null, FeatureStatus.CODE_OTHER, Policy.bind(KEY_PRIMARY));
-		if (!status.contains(s))
-			status.add(s);
-	}
-
-	/*
-	 * Verify we do not break prereqs
-	 */
-	private static void checkPrereqs(
-		ArrayList features,
-		ArrayList plugins,
-		ArrayList status) {
-
-		for (int i = 0; i < features.size(); i++) {
-			IFeature feature = (IFeature) features.get(i);
-			IImport[] imports = feature.getImports();
-
-			for (int j = 0; j < imports.length; j++) {
-				IImport iimport = imports[j];
-				// for each import determine plugin or feature, version, match
-				// we need
-				VersionedIdentifier iid = iimport.getVersionedIdentifier();
-				String id = iid.getIdentifier();
-				PluginVersionIdentifier version = iid.getVersion();
-				boolean featurePrereq =
-					iimport.getKind() == IImport.KIND_FEATURE;
-				boolean ignoreVersion =
-					version.getMajorComponent() == 0
-						&& version.getMinorComponent() == 0
-						&& version.getServiceComponent() == 0;
-				int rule = iimport.getRule();
-				if (rule == IImport.RULE_NONE)
-					rule = IImport.RULE_COMPATIBLE;
-
-				boolean found = false;
-
-				ArrayList candidates;
-
-				if (featurePrereq)
-					candidates = features;
-				else
-					candidates = plugins;
-				for (int k = 0; k < candidates.size(); k++) {
-					VersionedIdentifier cid;
-					if (featurePrereq) {
-						// the candidate is a feature
-						IFeature candidate = (IFeature) candidates.get(k);
-						// skip self
-						if (feature.equals(candidate))
-							continue;
-						cid = candidate.getVersionedIdentifier();
-					} else {
-						// the candidate is a plug-in
-						IPluginEntry plugin = (IPluginEntry) candidates.get(k);
-						cid = plugin.getVersionedIdentifier();
-					}
-					PluginVersionIdentifier cversion = cid.getVersion();
-					if (id.equals(cid.getIdentifier())) {
-						// have a candidate
-						if (ignoreVersion)
-							found = true;
-						else if (
-							rule == IImport.RULE_PERFECT
-								&& cversion.isPerfect(version))
-							found = true;
-						else if (
-							rule == IImport.RULE_EQUIVALENT
-								&& cversion.isEquivalentTo(version))
-							found = true;
-						else if (
-							rule == IImport.RULE_COMPATIBLE
-								&& cversion.isCompatibleWith(version))
-							found = true;
-						else if (
-							rule == IImport.RULE_GREATER_OR_EQUAL
-								&& cversion.isGreaterOrEqualTo(version))
-							found = true;
-					}
-					if (found)
-						break;
-				}
-
-				if (!found) {
-					// report status
-					String target =
-						featurePrereq
-							? Policy.bind(KEY_PREREQ_FEATURE)
-							: Policy.bind(KEY_PREREQ_PLUGIN);
-					int errorCode = featurePrereq
-							? FeatureStatus.CODE_PREREQ_FEATURE
-							: FeatureStatus.CODE_PREREQ_PLUGIN;
-					String msg =
-						Policy.bind(
-							KEY_PREREQ,
-							new String[] { target, id });
-
-					if (!ignoreVersion) {
-						if (rule == IImport.RULE_PERFECT)
-							msg =
-								Policy.bind(
-									KEY_PREREQ_PERFECT,
-									new String[] {
-										target,
-										id,
-										version.toString()});
-						else if (rule == IImport.RULE_EQUIVALENT)
-							msg =
-								Policy.bind(
-									KEY_PREREQ_EQUIVALENT,
-									new String[] {
-										target,
-										id,
-										version.toString()});
-						else if (rule == IImport.RULE_COMPATIBLE)
-							msg =
-								Policy.bind(
-									KEY_PREREQ_COMPATIBLE,
-									new String[] {
-										target,
-										id,
-										version.toString()});
-						else if (rule == IImport.RULE_GREATER_OR_EQUAL)
-							msg =
-								Policy.bind(
-									KEY_PREREQ_GREATER,
-									new String[] {
-										target,
-										id,
-										version.toString()});
-					}
-					IStatus s = createStatus(feature, errorCode, msg);
-					if (!status.contains(s))
-						status.add(s);
-				}
-			}
-		}
-	}
-
-	/*
-	 * Verify we end up with valid nested features after revert
-	 */
-	private static void checkRevertConstraints(
-		ArrayList features,
-		ArrayList status) {
-
-		for (int i = 0; i < features.size(); i++) {
-			IFeature feature = (IFeature) features.get(i);
-			try {
-				computeFeatureSubtree(
-					feature,
-					null,
-					null,
-					false /* do not tolerate missing children */,
-					null,
-					null
-				);
-			} catch (CoreException e) {
-				status.add(e.getStatus());
-			}
-		}
-	}
-
-	/*
-	 * Verify that a parent of an optional child is configured before we allow
-	 * the child to be configured as well
-	 */
-
-	private static void checkOptionalChildConfiguring(
-		IFeature feature,
-		ArrayList status)
-		throws CoreException {
-		ILocalSite localSite = SiteManager.getLocalSite();
-		IInstallConfiguration config = localSite.getCurrentConfiguration();
-		IConfiguredSite[] csites = config.getConfiguredSites();
-
-		boolean included = false;
-		for (int i = 0; i < csites.length; i++) {
-			IConfiguredSite csite = csites[i];
-			ISiteFeatureReference[] crefs =
-				csite.getSite().getFeatureReferences();
-			for (int j = 0; j < crefs.length; j++) {
-				IFeatureReference cref = crefs[j];
-				IFeature cfeature = null;
-				try {
-					cfeature = cref.getFeature(null);
-				} catch (CoreException e) {
-					//FIXME: cannot ask 'isOptional' here
-					// Ignore missing optional feature.
-					/*
-					 * if (cref.isOptional()) continue;
-					 */
-					throw e;
-				}
-				if (isParent(cfeature, feature, true)) {
-					// Included in at least one feature as optional
-					included = true;
-					if (csite.isConfigured(cfeature)) {
-						// At least one feature parent
-						// is enabled - it is OK to
-						// configure optional child.
-						return;
-					}
-				}
-			}
-		}
-		if (included) {
-			// feature is included as optional but
-			// no parent is currently configured.
-			String msg = Policy.bind(KEY_OPTIONAL_CHILD);
-			status.add(createStatus(feature, FeatureStatus.CODE_OPTIONAL_CHILD, msg));
-		} else {
-			//feature is root - can be configured
-		}
-	}
-//
-//	/**
-//	 * Checks if the configuration is locked by other instances
-//	 * 
-//	 * @param status
-//	 */
-//	private static void checkConfigurationLock(ArrayList status) {
-//		IPlatformConfiguration config =
-//			BootLoader.getCurrentPlatformConfiguration();
-//		URL configURL = config.getConfigurationLocation();
-//		if (!"file".equals(configURL.getProtocol())) {
-//			status.add(
-//				createStatus(
-//					null,
-//					"Configuration location is not writable:" + configURL));
-//			return;
-//		}
-//		String locationString = configURL.getFile();
-//		File configDir = new File(locationString);
-//		if (!configDir.isDirectory())
-//			configDir = configDir.getParentFile();
-//		if (!configDir.exists()) {
-//			status.add(
-//				createStatus(null, "Configuration location does not exist"));
-//			return;
-//		}
-//		File locksDir = new File(configDir, "locks");
-//		// check all the possible lock files
-//		File[] lockFiles = locksDir.listFiles();
-//		File configLock = BootLoader.getCurrentPlatformConfiguration().getLockFile();
-//		for (int i = 0; i < lockFiles.length; i++) {
-//			if (lockFiles[i].equals(configLock))
-//				continue;
-//			try {
-//				RandomAccessFile raf = new RandomAccessFile(lockFiles[i], "rw");
-//				FileChannel channel = raf.getChannel();
-//				System.out.println(channel.isOpen());
-//				FileLock lock = channel.tryLock();
-//				if (lock == null){
-//					// there is another eclipse instance running
-//					raf.close();
-//					status.add(
-//						createStatus(
-//							null,
-//							"Another instance is running, please close it before performing any configuration operations"));
-//					return;
-//				}
-//
-//			} catch (Exception e) {
-//				status.add(createStatus(null, "Failed to create lock:"+lockFiles[i]));
-//				return;
-//			} 
-//		}
-//	}
-
-	private static boolean isParent(
-		IFeature candidate,
-		IFeature feature,
-		boolean optionalOnly)
-		throws CoreException {
-		IIncludedFeatureReference[] refs =
-			candidate.getIncludedFeatureReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IIncludedFeatureReference child = refs[i];
-			VersionedIdentifier fvid = feature.getVersionedIdentifier();
-			VersionedIdentifier cvid = child.getVersionedIdentifier();
-
-			if (fvid.getIdentifier().equals(cvid.getIdentifier()) == false)
-				continue;
-			// same ID
-			PluginVersionIdentifier fversion = fvid.getVersion();
-			PluginVersionIdentifier cversion = cvid.getVersion();
-
-			if (fversion.equals(cversion)) {
-				// included and matched; return true if optionality is not
-				// important or it is and the inclusion is optional
-				return optionalOnly == false || child.isOptional();
-			}
-		}
-		return false;
-	}
-
-//	private static boolean checkTimeline(
-//		IInstallConfiguration config,
-//		ArrayList status) {
-//		try {
-//			ILocalSite lsite = SiteManager.getLocalSite();
-//			IInstallConfiguration cconfig = lsite.getCurrentConfiguration();
-//			if (cconfig.getTimeline() != config.getTimeline()) {
-//				// Not the same timeline - cannot revert
-//				String msg =
-//					UpdateUtils.getFormattedMessage(
-//						KEY_WRONG_TIMELINE,
-//						config.getLabel());
-//				status.add(createStatus(null, FeatureStatus.CODE_OTHER, msg));
-//				return false;
-//			}
-//		} catch (CoreException e) {
-//			status.add(e.getStatus());
-//		}
-//		return true;
-//	}
-
-	private static IStatus createMultiStatus(
-		String rootKey,
-		ArrayList children,
-		int code) {
-		IStatus[] carray =
-			(IStatus[]) children.toArray(new IStatus[children.size()]);
-		String message = Policy.bind(rootKey);
-		return new MultiStatus(
-			UpdateCore.getPlugin().getBundle().getSymbolicName(),
-			code,
-			carray,
-			message,
-			null);
-	}
-
-	private static IStatus createStatus(IFeature feature, int errorCode, String message) {
-
-		String fullMessage;
-		if (feature == null)
-			fullMessage = message;
-		else {
-			PluginVersionIdentifier version =
-				feature.getVersionedIdentifier().getVersion();
-			fullMessage =
-				Policy.bind(
-					KEY_CHILD_MESSAGE,
-					new String[] {
-						feature.getLabel(),
-						version.toString(),
-						message });
-		}
-
-		return new FeatureStatus(
-			feature,
-			IStatus.ERROR,
-			UpdateCore.getPlugin().getBundle().getSymbolicName(),
-			errorCode,
-			fullMessage,
-			null);
-	}
-
-	//	private static IStatus createReportStatus(ArrayList beforeStatus,
-	// ArrayList status) {
-	//		// report status
-	//		if (status.size() > 0) {
-	//			if (beforeStatus.size() > 0)
-	//				return createMultiStatus(KEY_ROOT_MESSAGE_INIT,
-	// beforeStatus,IStatus.ERROR);
-	//			else
-	//				return createMultiStatus(KEY_ROOT_MESSAGE, status,IStatus.ERROR);
-	//		}
-	//		return null;
-	//	}
-
-	private static IStatus createCombinedReportStatus(
-		ArrayList beforeStatus,
-		ArrayList status) {
-		if (beforeStatus.size() == 0) { // good initial config
-			if (status.size() == 0) {
-				return null; // all fine
-			} else {
-				return createMultiStatus(
-					KEY_ROOT_MESSAGE,
-					status,
-					IStatus.ERROR);
-				// error after operation
-			}
-		} else { // beforeStatus.size() > 0 : initial config errors
-			if (status.size() == 0) {
-				return null; // errors will be fixed
-			} else {
-				if (isBetterStatus(beforeStatus, status)) {
-					return createMultiStatus(
-						"ActivityConstraints.warning", //$NON-NLS-1$
-						beforeStatus,
-						IStatus.WARNING);
-					// errors may be fixed
-				} else {
-					ArrayList combined = new ArrayList();
-					combined.add(
-						createMultiStatus(
-							"ActivityConstraints.beforeMessage", //$NON-NLS-1$
-							beforeStatus,
-							IStatus.ERROR));
-					combined.add(
-						createMultiStatus(
-							"ActivityConstraints.afterMessage", //$NON-NLS-1$
-							status,
-							IStatus.ERROR));
-					return createMultiStatus(
-						KEY_ROOT_MESSAGE_INIT,
-						combined,
-						IStatus.ERROR);
-				}
-			}
-		}
-	}
-
-	private static ArrayList createList(String commaSeparatedList) {
-		ArrayList list = new ArrayList();
-		if (commaSeparatedList != null) {
-			StringTokenizer t =
-				new StringTokenizer(commaSeparatedList.trim(), ","); //$NON-NLS-1$
-			while (t.hasMoreTokens()) {
-				String token = t.nextToken().trim();
-				if (!token.equals("")) //$NON-NLS-1$
-					list.add(token);
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * Returns true if status is a subset of beforeStatus
-	 * 
-	 * @param beforeStatus
-	 * @param status
-	 * @return
-	 */
-	private static boolean isBetterStatus(
-		ArrayList beforeStatus,
-		ArrayList status) {
-		// if no status at all, then it's a subset
-		if (status == null || status.size() == 0)
-			return true;
-		// there is some status, so if there is no initial status, then it's
-		// not a subset
-		if (beforeStatus == null || beforeStatus.size() == 0)
-			return false;
-		// quick check
-		if (beforeStatus.size() < status.size())
-			return false;
-
-		// check if all the status elements appear in the original status
-		for (int i = 0; i < status.size(); i++) {
-			IStatus s = (IStatus) status.get(i);
-			// if this is not a feature status, something is wrong, so return
-			// false
-			if (!(s instanceof FeatureStatus))
-				return false;
-			FeatureStatus fs = (FeatureStatus) s;
-			// check against all status elements
-			boolean found = false;
-			for (int j = 0; !found && j < beforeStatus.size(); j++) {
-				if (fs.equals(beforeStatus.get(j)))
-					found = true;
-			}
-			if (!found)
-				return false;
-		}
-		return true;
-	}
-
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/PatchCleaner.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/PatchCleaner.java
deleted file mode 100644
index c9c7b8e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/PatchCleaner.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.update.internal.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-
-/**
- * This utility class attaches as a listened to the provided
- * configured site, and for every unconfigured feature 
- * it tests if it is a patch and cleans up its backup configuration.
- */
-
-public class PatchCleaner {
-	private IConfiguredSite csite;
-	private SiteListener listener;
-	class SiteListener implements IConfiguredSiteChangedListener {
-		public void featureInstalled(IFeature feature) {
-		}
-		public void featureRemoved(IFeature feature) {
-			cleanSavedConfigs(feature);
-		}
-		public void featureConfigured(IFeature feature) {
-		}
-		public void featureUnconfigured(IFeature feature) {
-			cleanSavedConfigs(feature);
-		}
-	}
-	public PatchCleaner(IConfiguredSite csite, IFeature root) {
-		this.csite = csite;
-		listener = new SiteListener();
-		csite.addConfiguredSiteChangedListener(listener);
-	}
-
-	public void dispose() {
-		csite.removeConfiguredSiteChangedListener(listener);
-	}
-	private void cleanSavedConfigs(IFeature feature) {
-		if (feature.isPatch()) {
-			IInstallConfiguration backupConfig = UpdateUtils.getBackupConfigurationFor(feature);
-			if (backupConfig!=null) {
-				// clean it
-				remove(backupConfig);
-			}
-		}
-	}
-	private void remove(IInstallConfiguration config) {
-		try {
-			ILocalSite localSite = SiteManager.getLocalSite();
-			localSite.removeFromPreservedConfigurations(config);
-		}
-		catch (CoreException e) {
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ReplaceFeatureVersionOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ReplaceFeatureVersionOperation.java
deleted file mode 100644
index c87b8e8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ReplaceFeatureVersionOperation.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.internal.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Swaps a feature.
- * ReplaceFeatureVersionOperation
- */
-public class ReplaceFeatureVersionOperation
-	extends FeatureOperation
-	implements IConfigFeatureOperation {
-
-	private IFeature anotherFeature;
-	
-	public ReplaceFeatureVersionOperation(
-		IFeature feature,
-		IFeature anotherFeature) {
-		super(feature.getSite().getCurrentConfiguredSite(), feature);
-		this.anotherFeature = anotherFeature;
-	}
-
-	public boolean execute(IProgressMonitor pm, IOperationListener listener)
-		throws CoreException {
-
-		IStatus status =
-			OperationsManager.getValidator().validatePendingReplaceVersion(feature, anotherFeature);
-		if (status != null) {
-			throw new CoreException(status);
-		}
-
-		// unconfigure current feature first, then configure the other one
-		
-		PatchCleaner cleaner = new PatchCleaner(targetSite, feature);
-		targetSite.unconfigure(feature);
-		cleaner.dispose();
-		
-		targetSite.configure(anotherFeature);
-//		ensureUnique();
-
-		try {
-			// Restart not needed
-			boolean restartNeeded = false;
-
-			// Check if this operation is cancelling one that's already pending
-			IOperation pendingOperation =
-				OperationsManager.findPendingOperation(feature);
-
-			if (pendingOperation instanceof IConfigFeatureOperation) {
-				// no need to do either pending change
-				OperationsManager.removePendingOperation(pendingOperation);
-			} else {
-				OperationsManager.addPendingOperation(this);
-				restartNeeded = true;
-			}
-			
-			pendingOperation =
-				OperationsManager.findPendingOperation(anotherFeature);
-				
-			if (pendingOperation instanceof IUnconfigFeatureOperation) {
-				// no need to do either pending change
-				OperationsManager.removePendingOperation(pendingOperation);
-			} else {
-				OperationsManager.addPendingOperation(this);
-				restartNeeded = true;
-			}
-			
-			markProcessed();
-			if (listener != null)
-				listener.afterExecute(this, null);
-
-			restartNeeded = SiteManager.getLocalSite().save() && restartNeeded;
-
-			// notify the model
-			OperationsManager.fireObjectChanged(feature, null);
-
-			return restartNeeded;
-		} catch (CoreException e) {
-			undo();
-			UpdateUtils.logException(e);
-			throw e;
-		}
-	}
-
-	public void undo() throws CoreException {
-		targetSite.unconfigure(anotherFeature);
-		targetSite.configure(feature);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/RevertConfigurationOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/RevertConfigurationOperation.java
deleted file mode 100644
index 0b7fe5b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/RevertConfigurationOperation.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.update.internal.operations;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-public class RevertConfigurationOperation extends Operation implements IRevertConfigurationOperation {
-
-	private IInstallConfiguration config;
-	private IProblemHandler problemHandler;
-
-	public RevertConfigurationOperation(
-		IInstallConfiguration config,
-		IProblemHandler problemHandler) {
-		super();
-		this.config = config;
-		this.problemHandler = problemHandler;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean execute(IProgressMonitor monitor, IOperationListener listener)
-		throws CoreException, InvocationTargetException {
-		IStatus status =
-			OperationsManager.getValidator().validatePendingRevert(config);
-		if (status != null && status.getCode() == IStatus.ERROR) {
-			throw new CoreException(status);
-		}
-
-		try {
-			ILocalSite localSite = SiteManager.getLocalSite();
-			localSite.revertTo(config, monitor, problemHandler);
-			localSite.save();
-			return true;
-		} catch (CoreException e) {
-			UpdateUtils.logException(e);
-			throw e;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ToggleSiteOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ToggleSiteOperation.java
deleted file mode 100644
index 73158d5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/ToggleSiteOperation.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.update.internal.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-public class ToggleSiteOperation
-	extends Operation
-	implements IToggleSiteOperation {
-
-	private IConfiguredSite site;
-
-	public ToggleSiteOperation(IConfiguredSite site) {
-		super();
-		this.site = site;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean execute(
-		IProgressMonitor monitor,
-		IOperationListener listener)
-		throws CoreException {
-		if (site == null)
-			return false;
-		boolean oldValue = site.isEnabled();
-		site.setEnabled(!oldValue);
-		IStatus status = OperationsManager.getValidator().validateCurrentState();
-		if (status != null) {
-			// revert
-			site.setEnabled(oldValue);
-			throw new CoreException(status);
-		} else {
-			try {
-				boolean restartNeeded = SiteManager.getLocalSite().save();
-				OperationsManager.fireObjectChanged(site, ""); //$NON-NLS-1$
-				return restartNeeded; // will restart only if changes could not be applied to current config
-			} catch (CoreException e) {
-				//revert
-				site.setEnabled(oldValue);
-				UpdateUtils.logException(e);
-				throw e;
-			}
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigOperation.java
deleted file mode 100644
index 7fbac96..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UnconfigOperation.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Unconfigure a feature.
- * UnconfigOperation
- */
-public class UnconfigOperation
-	extends FeatureOperation
-	implements IUnconfigFeatureOperation {
-
-	public UnconfigOperation(
-		IConfiguredSite site,
-		IFeature feature) {
-		super(site, feature);
-	}
-
-	public boolean execute(IProgressMonitor pm, IOperationListener listener)
-		throws CoreException {
-
-		IStatus status =
-			OperationsManager.getValidator().validatePendingUnconfig(feature);
-		if (status != null && status.getCode() == IStatus.ERROR) {
-			throw new CoreException(status);
-		}
-
-		PatchCleaner cleaner = new PatchCleaner(targetSite, feature);
-		targetSite.unconfigure(feature);
-		cleaner.dispose();
-
-		try {
-			// Restart not needed
-			boolean restartNeeded = false;
-
-			// Check if this operation is cancelling one that's already pending
-			IOperation pendingOperation =
-				OperationsManager.findPendingOperation(feature);
-
-			if (pendingOperation instanceof IConfigFeatureOperation) {
-				// no need to do either pending change
-				OperationsManager.removePendingOperation(pendingOperation);
-			} else {
-				OperationsManager.addPendingOperation(this);
-				restartNeeded = true;
-			}
-
-			markProcessed();
-			if (listener != null)
-				listener.afterExecute(this, null);
-
-			restartNeeded = SiteManager.getLocalSite().save() && restartNeeded;
-
-			// notify the model
-			OperationsManager.fireObjectChanged(feature, null);
-
-			return restartNeeded;
-		} catch (CoreException e) {
-			undo();
-			UpdateUtils.logException(e);
-			throw e;
-		}
-	}
-
-	public void undo() throws CoreException {
-		targetSite.configure(feature);
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UninstallOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UninstallOperation.java
deleted file mode 100644
index 3242a79..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UninstallOperation.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.internal.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Configure a feature.
- * ConfigOperation
- */
-public class UninstallOperation extends FeatureOperation implements IUninstallFeatureOperation{
-
-	public UninstallOperation(IConfiguredSite site, IFeature feature) {
-		super(site, feature);
-	}
-
-	public void setTargetSite(IConfiguredSite targetSite) {
-		this.targetSite = targetSite;
-	}
-
-	public boolean execute(IProgressMonitor pm, IOperationListener listener) throws CoreException {
-		if (targetSite == null)
-			targetSite = UpdateUtils.getConfigSite(feature, SiteManager.getLocalSite().getCurrentConfiguration());
-
-			if (targetSite != null) {
-				targetSite.remove(feature, pm);
-			} else {
-				// we should do something here
-				String message =
-					Policy.bind(
-						"OperationsManager.error.uninstall", //$NON-NLS-1$
-						feature.getLabel());
-				IStatus status =
-					new Status(
-						IStatus.ERROR,
-						UpdateUtils.getPluginId(),
-						IStatus.OK,
-						message,
-						null);
-				throw new CoreException(status);
-			}
-
-
-		markProcessed();
-		if (listener != null)
-			listener.afterExecute(this, null);
-
-		boolean restartNeeded = SiteManager.getLocalSite().save();
-
-		// notify the model
-		OperationsManager.fireObjectChanged(feature, UNINSTALL);
-		
-		return restartNeeded;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UpdateUtils.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UpdateUtils.java
deleted file mode 100644
index 83bcd45..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UpdateUtils.java
+++ /dev/null

@@ -1,575 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.search.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-
-/**
- * Helper class for performing update related tasks, queries, etc.
- * All the methods are static and this class should be a singleton.
- */
-public class UpdateUtils {
-	public static final String P_UPDATE_POLICY_URL = "updatePolicyURL"; //$NON-NLS-1$
-
-	/**
-	 * Private constructor
-	 */
-	private UpdateUtils() {
-	}
-	
-
-	public static String getPluginId() {
-		return UpdateCore.getPlugin().getBundle().getSymbolicName();
-	}
-
-
-	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 (status.getSeverity() != IStatus.INFO) {
-//			if (showErrorDialog)
-//				ErrorDialog.openError(getActiveWorkbenchShell(), null, null, status);
-			//ResourcesPlugin.getPlugin().getLog().log(status);
-// Should log on the update plugin's log
-//			Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status);
-			UpdateCore.getPlugin().getLog().log(status);
-		} else {
-//			MessageDialog.openInformation(getActiveWorkbenchShell(), null, status.getMessage());
-		}
-	}
-
-	public static IFeature[] searchSite(String featureId, IConfiguredSite site, boolean onlyConfigured) throws CoreException {
-		IFeatureReference[] references = null;
-
-		if (onlyConfigured)
-			references = site.getConfiguredFeatures();
-		else
-			references = site.getSite().getFeatureReferences();
-		Vector result = new Vector();
-
-		for (int i = 0; i < references.length; i++) {
-			IFeature feature = references[i].getFeature(null);
-			String id = feature.getVersionedIdentifier().getIdentifier();
-			if (featureId.equals(id)) {
-				result.add(feature);
-			}
-		}
-		return (IFeature[]) result.toArray(new IFeature[result.size()]);
-	}
-
-	public static IFeature[] getInstalledFeatures(IFeature feature) {
-		return getInstalledFeatures(feature, true);
-	}
-
-	public static IFeature[] getInstalledFeatures(IFeature feature, boolean onlyConfigured) {
-		return getInstalledFeatures(feature.getVersionedIdentifier(), onlyConfigured);
-	}
-	public static IFeature[] getInstalledFeatures(VersionedIdentifier vid, boolean onlyConfigured) {
-		Vector features = new Vector();
-		try {
-			ILocalSite localSite = SiteManager.getLocalSite();
-			IInstallConfiguration config = localSite.getCurrentConfiguration();
-			IConfiguredSite[] isites = config.getConfiguredSites();
-			String id = vid.getIdentifier();
-
-			for (int i = 0; i < isites.length; i++) {
-				IConfiguredSite isite = isites[i];
-				IFeature[] result = UpdateUtils.searchSite(id, isite, onlyConfigured);
-				for (int j = 0; j < result.length; j++) {
-					IFeature installedFeature = result[j];
-					features.add(installedFeature);
-				}
-			}
-		} catch (CoreException e) {
-			UpdateUtils.logException(e);
-		}
-		return (IFeature[]) features.toArray(new IFeature[features.size()]);
-	}
-	
-	public static boolean isPatch(IFeature candidate) {
-		IImport[] imports = candidate.getImports();
-
-		for (int i = 0; i < imports.length; i++) {
-			IImport iimport = imports[i];
-			if (iimport.isPatch()) return true;
-		}
-		return false;
-	}
-
-	public static boolean isPatch(IFeature target, IFeature candidate) {
-		VersionedIdentifier vid = target.getVersionedIdentifier();
-		IImport[] imports = candidate.getImports();
-
-		for (int i = 0; i < imports.length; i++) {
-			IImport iimport = imports[i];
-			if (iimport.isPatch()) {
-				VersionedIdentifier ivid = iimport.getVersionedIdentifier();
-				if (vid.equals(ivid)) {
-					// Bingo.
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static IInstallConfiguration getBackupConfigurationFor(IFeature feature) {
-		VersionedIdentifier vid = feature.getVersionedIdentifier();
-		String key = "@" + vid.getIdentifier() + "_" + vid.getVersion(); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			ILocalSite lsite = SiteManager.getLocalSite();
-			IInstallConfiguration[] configs = lsite.getPreservedConfigurations();
-			for (int i = 0; i < configs.length; i++) {
-				IInstallConfiguration config = configs[i];
-				if (config.getLabel().startsWith(key))
-					return config;
-			}
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-	
-	
-	public static boolean hasLicense(IFeature feature) {
-		IURLEntry info = feature.getLicense();
-		if (info == null)
-			return false;
-		String licenseTxt = info.getAnnotation();
-		if (licenseTxt == null)
-			return false;
-		return licenseTxt.trim().length() > 0;
-	}
-	public static boolean hasOptionalFeatures(IFeatureReference fref) {
-		try {
-			return hasOptionalFeatures(fref.getFeature(null));
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-	public static boolean hasOptionalFeatures(IFeature feature) {
-		try {
-			IIncludedFeatureReference[] irefs = feature.getIncludedFeatureReferences();
-			for (int i = 0; i < irefs.length; i++) {
-				IIncludedFeatureReference iref = irefs[i];
-				if (iref.isOptional())
-					return true;
-				// see if it has optional children
-				IFeature child = iref.getFeature(null);
-				if (hasOptionalFeatures(child))
-					return true;
-			}
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-
-	public static IFeature getLocalFeature(
-		IConfiguredSite csite,
-		IFeature feature)
-		throws CoreException {
-		IFeatureReference[] refs = csite.getConfiguredFeatures();
-		for (int i = 0; i < refs.length; i++) {
-			IFeatureReference ref = refs[i];
-			VersionedIdentifier refVid = ref.getVersionedIdentifier();
-			if (feature.getVersionedIdentifier().equals(refVid))
-				return ref.getFeature(null);
-		}
-		return null;
-	}
-	
-	public static IConfiguredSite getConfigSite(
-		IFeature feature,
-		IInstallConfiguration config)
-		throws CoreException {
-		IConfiguredSite[] configSites = config.getConfiguredSites();
-		for (int i = 0; i < configSites.length; i++) {
-			IConfiguredSite site = configSites[i];
-			if (site.getSite().equals(feature.getSite())) {
-				return site;
-			}
-		}
-		return null;
-	}
-	
-	public static IConfiguredSite getDefaultTargetSite(
-		IInstallConfiguration config,
-		IInstallFeatureOperation pendingChange) {
-		return getDefaultTargetSite(config, pendingChange, true);
-	}
-
-	public  static IConfiguredSite getDefaultTargetSite(
-		IInstallConfiguration config,
-		IInstallFeatureOperation pendingChange,
-		boolean checkAffinityFeature) {
-		IFeature oldFeature = pendingChange.getOldFeature();
-		IFeature newFeature = pendingChange.getFeature();
-		if (oldFeature != null) {
-			// We should install into the same site as
-			// the old feature
-			try {
-				return getConfigSite(oldFeature, config);
-			} catch (CoreException e) {
-				logException(e);
-				return null;
-			}
-		}
-
-		// This is a new install. Check if there is 
-		// a disabled feature with the same ID
-		String newFeatureID =
-			newFeature.getVersionedIdentifier().getIdentifier();
-		IConfiguredSite sameSite = getSiteWithFeature(config, newFeatureID);
-		if (sameSite != null) {
-			return sameSite;
-		}
-
-		if (checkAffinityFeature) {
-			return getAffinitySite(config, newFeature);
-		}
-		return null;
-	}
-	
-	public static IConfiguredSite getAffinitySite(
-		IInstallConfiguration config,
-		IFeature newFeature) {
-		// check if the affinity feature is installed
-		String affinityID = newFeature.getAffinityFeature();
-		if (affinityID != null) {
-			IConfiguredSite affinitySite =
-				getSiteWithFeature(config, affinityID);
-			if (affinitySite != null)
-				return affinitySite;
-		}
-		return null;
-	}
-
-	public static IConfiguredSite getSiteWithFeature(
-		IInstallConfiguration config,
-		String featureID) {
-		if (featureID == null)
-			return null;
-		IConfiguredSite[] sites = config.getConfiguredSites();
-		for (int i = 0; i < sites.length; i++) {
-			IConfiguredSite site = sites[i];
-			IFeatureReference[] refs = site.getFeatureReferences();
-			for (int j = 0; j < refs.length; j++) {
-				IFeatureReference ref = refs[j];
-				try {
-					IFeature feature = ref.getFeature(null);
-					if (featureID
-						.equals(
-							feature
-								.getVersionedIdentifier()
-								.getIdentifier())) {
-						// found it
-						return site;
-					}
-				} catch (CoreException e) {
-					logException(e);
-				}
-			}
-		}
-		return null;
-	}
-	
-	public static void collectOldFeatures(
-		IFeature feature,
-		IConfiguredSite targetSite,
-		ArrayList result)
-		throws CoreException {
-		IIncludedFeatureReference[] included =
-			feature.getIncludedFeatureReferences();
-		for (int i = 0; i < included.length; i++) {
-			IIncludedFeatureReference iref = included[i];
-
-			IFeature ifeature;
-
-			try {
-				ifeature = iref.getFeature(null);
-			} catch (CoreException e) {
-				if (iref.isOptional())
-					continue;
-				throw e;
-			}
-			// find other features and unconfigure
-			String id = iref.getVersionedIdentifier().getIdentifier();
-			IFeature[] sameIds = UpdateUtils.searchSite(id, targetSite, true);
-			for (int j = 0; j < sameIds.length; j++) {
-				IFeature sameId = sameIds[j];
-				// Ignore self.
-				if (sameId.equals(ifeature))
-					continue;
-				result.add(sameId);
-			}
-			collectOldFeatures(ifeature, targetSite, result);
-		}
-	}
-
-//
-//	public static IInstallConfiguration createInstallConfiguration() throws CoreException{
-//		try {
-//			ILocalSite localSite = SiteManager.getLocalSite();
-//			IInstallConfiguration config =
-//				localSite.cloneCurrentConfiguration();
-//			config.setLabel(Utilities.format(config.getCreationDate()));
-//			return config;
-//		} catch (CoreException e) {
-//			// Let callers handle logging
-//			//logException(e);
-//			throw e;
-//		}
-//	}
-	
-	public static UpdateSearchRequest createNewUpdatesRequest(IFeature [] features) {
-		UpdateSearchScope scope = new UpdateSearchScope();
-		scope.setUpdateMapURL(UpdateUtils.getUpdateMapURL());
-		UpdatesSearchCategory category = new UpdatesSearchCategory();
-		if (features!=null)
-			category.setFeatures(features);
-		UpdateSearchRequest searchRequest = new UpdateSearchRequest(category, scope);
-		searchRequest.addFilter(new EnvironmentFilter());
-		return searchRequest;
-	}
-
-	public static boolean isNestedChild(IInstallConfiguration config, IFeature feature) {
-		IConfiguredSite[] csites = config.getConfiguredSites();
-		try {
-			for (int i = 0; csites != null && i < csites.length; i++) {
-				IFeatureReference[] refs = csites[i].getConfiguredFeatures();
-				for (int j = 0; refs != null && j < refs.length; j++) {
-					IFeature parent = refs[j].getFeature(null);
-					IFeatureReference[] children =
-						parent.getIncludedFeatureReferences();
-					for (int k = 0;
-						children != null && k < children.length;
-						k++) {
-						IFeature child = children[k].getFeature(null);
-						if (feature.equals(child))
-							return true;
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// will return false
-		}
-		return false;
-	}
-	
-	
-	public static boolean hasObsoletePatches(IFeature feature) {
-		// Check all the included features that
-		// are unconfigured, and see if their patch 
-		// references are better than the original.
-		try {
-			IFeatureReference[] irefs = feature.getIncludedFeatureReferences();
-			for (int i = 0; i < irefs.length; i++) {
-				IFeatureReference iref = irefs[i];
-				IFeature ifeature = iref.getFeature(null);
-				IConfiguredSite csite = ifeature.getSite().getCurrentConfiguredSite();
-				if (!csite.isConfigured(ifeature)) {
-					if (!isPatchHappy(ifeature))
-						return false;
-				}
-			}
-		} catch (CoreException e) {
-			return false;
-		}
-		// All checks went well
-		return true;
-	}
-	
-	public static boolean isPatchHappy(IFeature feature) throws CoreException {
-		// If this is a patch and it includes 
-		// another patch and the included patch
-		// is disabled but the feature it was declared
-		// to patch is now newer (and is presumed to
-		// contain the now disabled patch), and
-		// the newer patched feature is enabled,
-		// a 'leap of faith' assumption can be
-		// made:
-
-		// Although the included patch is disabled,
-		// the feature it was designed to patch
-		// is now newer and most likely contains
-		// the equivalent fix and more. Consequently,
-		// we can claim that the status and the error
-		// icon overlay are misleading because
-		// all the right plug-ins are configured.
-		IImport[] imports = feature.getImports();
-		IImport patchReference = null;
-		for (int i = 0; i < imports.length; i++) {
-			IImport iimport = imports[i];
-			if (iimport.isPatch()) {
-				patchReference = iimport;
-				break;
-			}
-		}
-		if (patchReference == null)
-			return false;
-		VersionedIdentifier refVid = patchReference.getVersionedIdentifier();
-
-		// Find the patched feature and 
-		IConfiguredSite csite = feature.getSite().getCurrentConfiguredSite();
-		if (csite == null)
-			return false;
-
-		IFeatureReference[] crefs = csite.getConfiguredFeatures();
-		for (int i = 0; i < crefs.length; i++) {
-			IFeatureReference cref = crefs[i];
-			VersionedIdentifier cvid = cref.getVersionedIdentifier();
-			if (cvid.getIdentifier().equals(refVid.getIdentifier())) {
-				// This is the one.
-				if (cvid.getVersion().isGreaterThan(refVid.getVersion())) {
-					// Bingo: we found the referenced feature
-					// and its version is greater - 
-					// we can assume that it contains better code
-					// than the patch that referenced the
-					// older version.
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static URL getUpdateMapURL() {
-		Preferences pref = UpdateCore.getPlugin().getPluginPreferences();
-		String mapFile = pref.getString(UpdateUtils.P_UPDATE_POLICY_URL);
-		if (mapFile!=null && mapFile.length()>0) {
-			try {
-				String decodedFile = URLDecoder.decode(mapFile, "UTF-8"); //$NON-NLS-1$
-				return new URL(decodedFile);
-			}
-			catch (MalformedURLException e) {
-			}
-			catch(UnsupportedEncodingException e) {
-			}
-		}
-		return null;
-	}
-	
-
-	public static void downloadFeatureContent(
-		IFeature feature,
-		final IProgressMonitor progress)
-		throws InstallAbortedException, CoreException {
-
-		// only downloads our known feature types
-		if (!(feature instanceof Feature))
-			return;
-			
-		//DEBUG
-		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL) {
-			UpdateCore.debug(
-				"Downloading...:" + feature.getURL().toExternalForm()); //$NON-NLS-1$
-		}
-
-		IProgressMonitor pm = new NullProgressMonitor() {
-			public boolean isCanceled() {
-				return progress.isCanceled();
-			}
-		};
-
-		// make sure we have an InstallMonitor		
-		InstallMonitor monitor = new InstallMonitor(pm);
-
-		// Get source feature provider and verifier.
-		// Initialize target variables.
-		final IFeatureContentProvider provider =
-			feature.getFeatureContentProvider();
-		IPluginEntry[] targetSitePluginEntries = null;
-
-		// determine list of plugins to install
-		// find the intersection between the plugin entries already contained
-		// on the target site, and plugin entries packaged in source feature
-		IPluginEntry[] sourceFeaturePluginEntries = feature.getPluginEntries();
-
-		IConfiguredSite targetSite =
-			getSiteWithFeature(
-				SiteManager.getLocalSite().getCurrentConfiguration(),
-				((Feature)feature).getFeatureIdentifier());
-		if (targetSite == null) {
-			if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL) {
-				UpdateCore.debug("The site to install in is null"); //$NON-NLS-1$
-			}
-
-			targetSitePluginEntries = new IPluginEntry[0];
-		} else {
-			targetSitePluginEntries = targetSite.getSite().getPluginEntries();
-		}
-		IPluginEntry[] pluginsToInstall =
-			UpdateManagerUtils.diff(
-				sourceFeaturePluginEntries,
-				targetSitePluginEntries);
-		INonPluginEntry[] nonPluginsToInstall = feature.getNonPluginEntries();
-
-		// Download feature archive(s)
-		provider.getFeatureEntryArchiveReferences(monitor);
-		// Download plugin archives
-		for (int i = 0; i < pluginsToInstall.length; i++) {
-			provider.getPluginEntryArchiveReferences(pluginsToInstall[i], monitor);
-		}
-
-		// Download non-plugin archives. Verification handled by optional install handler
-		for (int i = 0; i < nonPluginsToInstall.length; i++) {
-			provider.getNonPluginEntryArchiveReferences(nonPluginsToInstall[i], monitor);
-		}
-
-		// Download child features
-		IFeatureReference[] children = feature.getIncludedFeatureReferences();
-
-		// TODO: check if they are optional, and if they should be installed [2.0.1]
-		for (int i = 0; i < children.length; i++) {
-			IFeature childFeature = null;
-			try {
-				childFeature = children[i].getFeature(null);
-			} catch (CoreException e) {
-				UpdateCore.warn(null, e);
-			}
-			if (childFeature != null) {
-				downloadFeatureContent(childFeature, monitor);
-			}
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/BaseSearchCategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/BaseSearchCategory.java
deleted file mode 100644
index b2034f4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/BaseSearchCategory.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.internal.search;
-
-import org.eclipse.update.search.*;
-
-public abstract class BaseSearchCategory implements IUpdateSearchCategory {
-	private String id;
-	
-	protected BaseSearchCategory(String id) {
-		setId(id);
-	}
-	
-	public String getId() {
-		return id;
-	}
-	
-	public void setId(String id) {
-		if (this.id==null)
-			this.id = id;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
deleted file mode 100644
index d0e9286..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.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.update.internal.search;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.search.*;
-
-/**
- * Searches for optional features
- */
-public class OptionalFeatureSearchCategory extends BaseSearchCategory {
-	private IUpdateSearchQuery[] queries;
-	private ArrayList vids;
-	private static final String CATEGORY_ID =
-		"org.eclipse.update.core.unified-search"; //$NON-NLS-1$
-
-	private class OptionalQuery implements IUpdateSearchQuery {
-		public void run(
-			ISite site,
-			String[] categoriesToSkip,
-			IUpdateSearchFilter filter,
-			IUpdateSearchResultCollector collector,
-			IProgressMonitor monitor) {
-
-			monitor.beginTask("", vids.size()); //$NON-NLS-1$
-			for (int i = 0; i < vids.size(); i++) {
-				VersionedIdentifier vid = (VersionedIdentifier) vids.get(i);
-				monitor.subTask(vid.toString());
-				IFeature feature =
-					createFeature(
-						site,
-						vid,
-						new SubProgressMonitor(monitor, 1));
-				if (feature!=null && filter.accept(feature))
-					collector.accept(feature);
-			}
-		}
-
-		private IFeature createFeature(
-			ISite site,
-			VersionedIdentifier vid,
-			IProgressMonitor monitor) {
-			try {
-				URL siteURL = site.getURL();
-				//TODO This assumption stands only in the default case
-				// In general, feature archive URL may be mapped on site.
-				// Also, feature type may be something else (not packaged).
-				// We may need additional information (not only id and version)
-				// in order to create a feature on a site.
-				String relative = vid.toString();
-				URL featureURL = new URL(siteURL, "features/" + relative+".jar"); //$NON-NLS-1$ //$NON-NLS-2$
-				return site.createFeature(
-					"org.eclipse.update.core.packaged", //$NON-NLS-1$
-					featureURL,
-					monitor);
-			} catch (Exception e) {
-				return null;
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.update.internal.ui.search.ISearchQuery#getSearchSite()
-		 */
-		public IQueryUpdateSiteAdapter getQuerySearchSite() {
-			return null;
-		}
-	}
-
-	public void addVersionedIdentifier(VersionedIdentifier vid) {
-		vids.add(vid);
-	}
-
-	public void clear() {
-		vids.clear();
-	}
-
-	public OptionalFeatureSearchCategory() {
-		super(CATEGORY_ID);
-		vids = new ArrayList();
-		queries = new IUpdateSearchQuery[] { new OptionalQuery()};
-	}
-
-	public IUpdateSearchQuery[] getQueries() {
-		return queries;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/QueryUpdateSiteAdapter.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/QueryUpdateSiteAdapter.java
deleted file mode 100644
index 3f51a49..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/QueryUpdateSiteAdapter.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.internal.search;
-
-import java.net.*;
-
-import org.eclipse.update.search.*;
-
-public class QueryUpdateSiteAdapter extends UpdateSiteAdapter implements IQueryUpdateSiteAdapter {
-	private String mappingId;
-
-	public QueryUpdateSiteAdapter(String label, URL url, String mappingId) {
-		super(label, url);
-		this.mappingId = mappingId;
-	}
-	
-	public String getMappingId() {
-		return mappingId;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java
deleted file mode 100644
index 96088c6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.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.update.internal.search;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.search.*;
-
-/**
- * Searches an update site
- */
-public class SiteSearchCategory extends BaseSearchCategory {
-	private IUpdateSearchQuery[] queries;
-	private static final String CATEGORY_ID =
-		"org.eclipse.update.core.unified-search"; //$NON-NLS-1$
-
-	private static class Query implements IUpdateSearchQuery {
-		public void run(
-			ISite site,
-			String[] categoriesToSkip,
-			IUpdateSearchFilter filter,
-			IUpdateSearchResultCollector collector,
-			IProgressMonitor monitor) {
-			ISiteFeatureReference[] refs = site.getFeatureReferences();
-			HashSet ignores = new HashSet();
-			if (categoriesToSkip != null) {
-				for (int i = 0; i < categoriesToSkip.length; i++) {
-					ignores.add(categoriesToSkip[i]);
-				}
-			}
-
-			monitor.beginTask("", refs.length); //$NON-NLS-1$
-
-			for (int i = 0; i < refs.length; i++) {
-				ISiteFeatureReference ref = refs[i];
-				boolean skipFeature = false;
-				if (monitor.isCanceled())
-					break;
-				if (ignores.size() > 0) {
-					ICategory[] categories = ref.getCategories();
-
-					for (int j = 0; j < categories.length; j++) {
-						ICategory category = categories[j];
-						if (ignores.contains(category.getName())) {
-							skipFeature = true;
-							break;
-						}
-					}
-				}
-				try {
-					if (!skipFeature) {
-						if (filter.accept(ref)) {
-							IFeature feature = ref.getFeature(null);
-							if (filter.accept(feature))
-								collector.accept(feature);
-							monitor.subTask(feature.getLabel());
-						}
-					}
-				} catch (CoreException e) {
-					System.out.println(e);
-				} finally {
-					monitor.worked(1);
-				}
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.update.internal.ui.search.ISearchQuery#getSearchSite()
-		 */
-		public IQueryUpdateSiteAdapter getQuerySearchSite() {
-			return null;
-		}
-	}
-
-	public SiteSearchCategory() {
-		super(CATEGORY_ID);
-		queries = new IUpdateSearchQuery[] { new Query()};
-	}
-
-	public IUpdateSearchQuery[] getQueries() {
-		return queries;
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatePolicy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatePolicy.java
deleted file mode 100644
index 38f0b97..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatePolicy.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.search;
-
-import java.io.*;
-import java.net.*;
-import java.util.ArrayList;
-	
-import javax.xml.parsers.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.search.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-/**
- * 
- * This class opens connection to the update map resource
- * and parses the file to load update URL mappings.
- * These mappings are used to redirect new updates search
- * when the redirection pattern matches.
- */
-
-public class UpdatePolicy {
-	private static final String TAG_POLICY = "update-policy";
-	private static final String TAG_URL_MAP = "url-map";
-	private static final String ATT_URL = "url";
-	private static final String ATT_PATTERN = "pattern";
-
-	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-
-	private static class MapSite implements IUpdateSiteAdapter {
-		private URL url;
-		public MapSite(URL url) {
-			this.url = url;
-		}
-		public String getLabel() {
-			return url.toString();
-		}
-		public URL getURL() {
-			return url;
-		}
-	}
-
-	private static class UpdateMapEntry {
-		private IUpdateSiteAdapter site;
-		private String pattern;
-
-		public UpdateMapEntry(String pattern, URL url) {
-			this.pattern = pattern;
-			this.site = new MapSite(url);
-		}
-		public IUpdateSiteAdapter getSite() {
-			return site;
-		}
-		public boolean matches(String id) {
-			return id.startsWith(pattern);
-		}
-		public String getPattern() {
-			return pattern;
-		}
-	}
-
-	private ArrayList entries;
-	private IUpdateSiteAdapter defaultSite;
-	private boolean loaded = false;
-	private boolean fallbackAllowed = true;
-
-	public UpdatePolicy() {
-		entries = new ArrayList();
-	}
-
-	public void load(URL mapFile, IProgressMonitor monitor)
-		throws CoreException {
-		InputStream policyStream = null;
-		try {
-			Response response = UpdateCore.getPlugin().get(mapFile);
-			UpdateManagerUtils.checkConnectionResult(response, mapFile);
-			policyStream = response.getInputStream(monitor);
-			// the stream can be null if the user cancels the connection
-			if (policyStream == null)
-				return;
-			
-			documentBuilderFactory.setNamespaceAware(true);
-			DocumentBuilder parser = documentBuilderFactory.newDocumentBuilder();
-			Document doc = parser.parse(new InputSource(policyStream));
-
-			processUpdatePolicy(doc);
-			loaded = true;
-		} catch (IOException e) {
-			throw Utilities.newCoreException(
-				Policy.bind(
-					"SiteURLFactory.UnableToAccessSiteStream",
-					mapFile == null ? "" : mapFile.toExternalForm()),
-				ISite.SITE_ACCESS_EXCEPTION,
-				e);
-		} catch (SAXException e) {
-			throw Utilities.newCoreException(
-				"Errors while parsing update policy",
-				0,
-				e);
-
-		} catch(ParserConfigurationException e) {
-			throw Utilities.newCoreException(
-				"Errors while parsing update policy",
-				0,
-				e);
-		} finally {
-			if (policyStream != null) {
-				try {
-					policyStream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	public boolean isLoaded() {
-		return loaded;
-	}
-	
-	/*
-	 * Given the feature ID, returns the mapped update URL if
-	 * found in the mappings. This URL will be used INSTEAD of
-	 * the update URL encoded in the feature itself during the
-	 * new update search.
-	 * <p>In case of multiple matches (e.g. org.eclipse and org.eclipse.platform)
-	 * the URL for the longer pattern will be picked (i.e. org.eclipse.platform).
-	 */
-	public IUpdateSiteAdapter getMappedSite(String id) {
-		UpdateMapEntry lastEntry = null;
-		for (int i = 0; i < entries.size(); i++) {
-			UpdateMapEntry entry = (UpdateMapEntry) entries.get(i);
-			if (entry.matches(id)) {
-				if (lastEntry == null)
-					lastEntry = entry;
-				else {
-					// Choose the match with longer pattern.
-					// For example, if two matches are found:
-					// 'org.eclipse' and 'org.eclipse.platform',
-					// pick 'org.eclipse.platform'.
-					String pattern = entry.getPattern();
-					String lastPattern = lastEntry.getPattern();
-					if (pattern.length() > lastPattern.length())
-						lastEntry = entry;
-				}
-			}
-		}
-		if (lastEntry != null)
-			return lastEntry.getSite();
-		else
-			return defaultSite;
-	}
-
-	public boolean isFallbackAllowed() {
-		return fallbackAllowed;
-	}
-	
-	private void reset() {
-		if (entries.isEmpty() == false)
-			entries.clear();
-	}
-
-	private void processUpdatePolicy(Document document) throws CoreException {
-		Node root = document.getDocumentElement();
-		reset();
-		
-		if (root.getNodeName().equals(TAG_POLICY)==false)
-			throwCoreException("'"+TAG_POLICY+"' is expected.", null);
-				
-		NodeList nodes = root.getChildNodes();
-		
-		for (int i=0; i<nodes.getLength(); i++) {
-			Node child = nodes.item(i);
-			if (child.getNodeType() != Node.ELEMENT_NODE)
-				continue;
-			String tag = child.getNodeName();
-			if (tag.equals(TAG_URL_MAP))
-				processMapNode(child);
-		}
-	}
-	private void processMapNode(Node node) throws CoreException {
-		String pattern = getAttribute(node, ATT_PATTERN);
-		String urlName = getAttribute(node, ATT_URL);
-		
-		assertNotNull(ATT_PATTERN, pattern);
-		assertNotNull(ATT_URL, urlName);
-		
-		// empty url means feature is not updateable
-		if (urlName.trim().length() == 0) {
-			addEntry(pattern, null);
-			return;
-		}
-
-		try {
-			String decodedValue = URLDecoder.decode(urlName, "UTF-8");
-			URL url = new URL(decodedValue);
-			addEntry(pattern, url);
-		} catch (MalformedURLException e) {
-			throwCoreException("invalid URL - "+urlName, null);
-		} catch (UnsupportedEncodingException e) {
-		}
-	}
-	
-	private void assertNotNull(String name, String value) throws CoreException {
-		if (value==null)
-			throwCoreException(name+" cannot be null.", null);
-	}
-	
-	private String getAttribute(Node node, String name) {
-		NamedNodeMap attMap = node.getAttributes();
-		Node att = attMap.getNamedItem(name);
-		if (att==null) return null;
-		return att.getNodeValue();
-	}
-
-	private void addEntry(String pattern, URL url) {
-		if (pattern.equalsIgnoreCase("*"))
-			defaultSite = new MapSite(url);
-		else
-			entries.add(new UpdateMapEntry(pattern, url));
-	}
-	
-	private void throwCoreException(String message, Throwable e) throws CoreException {
-		String fullMessage = "Update Policy: "+message;
-		throw Utilities.newCoreException(fullMessage, 0, e);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdateSiteAdapter.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdateSiteAdapter.java
deleted file mode 100644
index 78b58c2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdateSiteAdapter.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.search;
-
-import java.net.*;
-
-import org.eclipse.update.search.*;
-
-/**
- */
-public class UpdateSiteAdapter implements IUpdateSiteAdapter {
-	private String label;
-	private URL url;
-	
-	public UpdateSiteAdapter(String label, URL url) {
-		this.label = label;
-		this.url = url;
-	}
-	public URL getURL() {
-		return url;
-	}
-	public String getLabel() {
-		return label;
-	}
-/*
-	public ISite getSite(IProgressMonitor monitor) {
-		try {
-			return SiteManager.getSite(getURL(), monitor);
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-*/
-	public String toString(){
-		return "" + getURL(); //$NON-NLS-1$
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
deleted file mode 100644
index ebee1ba..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
+++ /dev/null

@@ -1,528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.search;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-public class UpdatesSearchCategory extends BaseSearchCategory {
-	private static final String CATEGORY_ID =
-		"org.eclipse.update.core.new-updates";
-	private IFeature [] features;
-
-	class Candidate {
-		ArrayList children;
-		Candidate parent;
-		IFeatureReference ref;
-		public Candidate(IFeatureReference ref) {
-			this.ref = ref;
-		}
-		public Candidate(IFeatureReference ref, Candidate parent) {
-			this(ref);
-			this.parent = parent;
-		}
-		public void add(Candidate child) {
-			if (children == null)
-				children = new ArrayList();
-			child.setParent(this);
-			children.add(child);
-		}
-		void setParent(Candidate parent) {
-			this.parent = parent;
-		}
-		public IFeatureReference getReference() {
-			return ref;
-		}
-		void setReference(IFeatureReference ref) {
-			this.ref = ref;
-		}
-		public IFeature getFeature(IProgressMonitor monitor) {
-			try {
-				return ref.getFeature(monitor);
-			} catch (CoreException e) {
-				return null;
-			}
-		}
-		public Candidate getParent() {
-			return parent;
-		}
-		public Candidate getRoot() {
-			Candidate root = this;
-
-			while (root.getParent() != null) {
-				root = root.getParent();
-			}
-			return root;
-		}
-		public IURLEntry getUpdateEntry() {
-			int location = IUpdateConstants.SEARCH_ROOT;
-
-			if (ref instanceof IIncludedFeatureReference)
-				location =
-					((IIncludedFeatureReference) ref).getSearchLocation();
-			if (parent == null || location == IUpdateConstants.SEARCH_SELF) {
-				return getFeature(null).getUpdateSiteEntry();
-			}
-			return getRoot().getUpdateEntry();
-		}
-		public String toString() {
-			return ref.toString();
-		}
-		public boolean equals(Object source) {
-			if (source instanceof Candidate) {
-				return this.ref.equals(((Candidate) source).getReference());
-			}
-			if (source instanceof IFeatureReference) {
-				return this.ref.equals(source);
-			}
-			return false;
-		}
-		public void addToFlatList(ArrayList list, boolean updatableOnly) {
-			// add itself
-			if (!updatableOnly || isUpdatable())
-				list.add(this);
-			// add children
-			if (children != null) {
-				for (int i = 0; i < children.size(); i++) {
-					Candidate child = (Candidate) children.get(i);
-					child.addToFlatList(list, updatableOnly);
-				}
-			}
-		}
-		public boolean isUpdatable() {
-			return (parent == null);
-		}
-	}
-
-	private static class Hit {
-		IFeature candidate;
-		IFeatureReference ref;
-		IInstallFeatureOperation patchFor;
-		boolean patch;
-		public Hit(IFeature candidate, IFeatureReference ref) {
-			this.candidate = candidate;
-			this.ref = ref;
-		}
-		public Hit(IFeature candidate, IFeatureReference ref, boolean patch) {
-			this(candidate, ref);
-			this.patch = patch;
-		}
-
-		public Hit(IFeature candidate, IFeatureReference ref, IInstallFeatureOperation patchFor) {
-			this(candidate, ref, true);
-			this.patchFor = patchFor;
-		}
-
-		public IInstallFeatureOperation getJob() {
-			try {
-				IFeature feature = ref.getFeature(null);
-				return OperationsManager.getOperationFactory().createInstallOperation(null, feature, null, null, null);
-			} catch (CoreException e) {
-				return null;
-			}
-		}
-
-		public boolean isPatch() {
-			return patch;
-		}
-		public IInstallFeatureOperation getPatchedJob() {
-			return patchFor;
-		}
-	}
-
-	class UpdateQuery implements IUpdateSearchQuery {
-		IFeature candidate;
-		IQueryUpdateSiteAdapter adapter;
-
-		public UpdateQuery(
-			IFeature candidate,
-			IURLEntry updateEntry) {
-			this.candidate = candidate;
-			if (updateEntry != null && updateEntry.getURL() != null)
-				adapter =
-					new QueryUpdateSiteAdapter(
-						getLabelForEntry(updateEntry),
-						updateEntry.getURL(),
-						candidate.getVersionedIdentifier().getIdentifier());
-		}
-		private String getLabelForEntry(IURLEntry entry) {
-			String label = entry.getAnnotation();
-			if (label == null || label.length() == 0)
-				label = entry.getURL().toString();
-			return label;
-		}
-
-		public IQueryUpdateSiteAdapter getQuerySearchSite() {
-			return adapter;
-		}
-		private boolean isBroken() {
-			try {
-				IStatus status =
-					SiteManager.getLocalSite().getFeatureStatus(candidate);
-				return status.getSeverity() == IStatus.ERROR;
-			} catch (CoreException e) {
-				return false;
-			}
-		}
-		private boolean isMissingOptionalChildren(IFeature feature) {
-			try {
-				IIncludedFeatureReference[] children =
-					feature.getIncludedFeatureReferences();
-				for (int i = 0; i < children.length; i++) {
-					IIncludedFeatureReference ref = children[i];
-					try {
-						IFeature child = ref.getFeature(null);
-						// If we are here, the child is not missing.
-						// Check it's children recursively.
-						if (isMissingOptionalChildren(child))
-							return true;
-					} catch (CoreException e) {
-						// Missing child. Return true if optional,
-						// otherwise it is a broken feature that we 
-						// do not care about.
-						if (ref.isOptional()) {
-							return FeatureHierarchyElement.hasOlderVersion(ref);
-						}
-					}
-				}
-			} catch (CoreException e) {
-			}
-			return false;
-		}
-		public void run(
-			ISite site,
-			String[] categoriesToSkip,
-			IUpdateSearchFilter filter,
-			IUpdateSearchResultCollector collector,
-			IProgressMonitor monitor) {
-			ArrayList hits = new ArrayList();
-			boolean broken = isBroken();
-			boolean missingOptionalChildren = false;
-
-			// Don't bother to compute missing optional children
-			// if the feature is broken - all we want is to 
-			// see if we should allow same-version re-install.
-			if (!broken)
-				missingOptionalChildren = isMissingOptionalChildren(candidate);
-			ISiteFeatureReference[] refs = site.getFeatureReferences();
-			monitor.beginTask("", refs.length + 1);
-			ArrayList updateJobs = new ArrayList();
-			for (int i = 0; i < refs.length; i++) {
-				ISiteFeatureReference ref = refs[i];
-				try {
-					if (isNewerVersion(candidate.getVersionedIdentifier(),ref.getVersionedIdentifier())) {
-						Hit h = new Hit(candidate, ref);
-						hits.add(h);
-						updateJobs.add(h.getJob());
-					} else {
-						// accept the same feature if the installed
-						// feature is broken
-						if ((broken || missingOptionalChildren)
-							&& candidate.getVersionedIdentifier().equals(
-								ref.getVersionedIdentifier())){
-							hits.add(new Hit(candidate, ref));
-							continue;
-						}
-						else {
-							// check for patches
-							if (isPatch(candidate, ref)){
-								hits.add(new Hit(candidate, ref, true));
-								continue;
-							}
-						}
-					}
-				} catch (CoreException e) {
-				}
-				monitor.worked(1);
-				if (monitor.isCanceled()){
-					return;
-				}
-				
-			}
-			// accept patches for updated features
-			for (int n = 0; n < updateJobs.size(); n++) {
-				IInstallFeatureOperation job = (IInstallFeatureOperation) updateJobs
-						.get(n);
-					IFeature newCandidate = job.getFeature();
-					for (int i = 0; i < refs.length; i++) {
-						ISiteFeatureReference ref = refs[i];
-						if (isPatch(newCandidate, ref)) {
-							Hit h = new Hit(newCandidate, ref, job);
-							hits.add(h);
-							continue;
-						}
-						//monitor.worked(1);
-						if (monitor.isCanceled()) {
-							return;
-						}
-					}
-			}
-			if (hits.size() > 0) {
-				collectValidHits(hits, filter, collector);
-			}
-			monitor.worked(1);
-			monitor.done();
-		}
-	}
-
-	private ArrayList candidates;
-
-	public UpdatesSearchCategory() {
-		super(CATEGORY_ID);
-	}
-
-	private void collectValidHits(
-		ArrayList hits,
-		IUpdateSearchFilter filter,
-		IUpdateSearchResultCollector collector) {
-		Object[] array = hits.toArray();
-		IFeature topHit = null;
-		for (int i = 0; i < hits.size(); i++) {
-			Hit hit = (Hit) hits.get(i);
-			IInstallFeatureOperation job = hit.getJob();
-			if (job == null)
-				continue;
-			// do not accept updates without a license
-			if (!UpdateUtils.hasLicense(job.getFeature())) {
-				UpdateCore.log(job.getFeature().getVersionedIdentifier() + ": " + Policy.bind("DefaultFeatureParser.NoLicenseText"), null);
-				continue;
-			}
-			IStatus status;
-			if( hit.getPatchedJob()==null){
-				status = OperationsManager.getValidator().validatePendingInstall(job.getOldFeature(), job.getFeature());
-			}else{
-				status = OperationsManager.getValidator().validatePendingChanges(new IInstallFeatureOperation[]{hit.getPatchedJob(), job});
-						
-			}
-			if (status == null || status.getCode() == IStatus.WARNING) {
-				if (hit.isPatch()) {
-					IFeature patch = job.getFeature();
-					// Do not add the patch if already installed
-					IFeature[] sameId = UpdateUtils.getInstalledFeatures(patch, false);
-					if (sameId.length==0) {
-						if (filter.accept(patch))
-							collector.accept(patch);
-					}
-				}
-				else if (topHit == null) {
-					topHit = job.getFeature();
-					if (filter.accept(topHit))
-						collector.accept(topHit);
-				}
-			}
-		}
-	}
-
-	private void initialize() {
-		candidates = new ArrayList();
-		try {
-			ILocalSite localSite = SiteManager.getLocalSite();
-			IInstallConfiguration config = localSite.getCurrentConfiguration();
-			IConfiguredSite[] isites = config.getConfiguredSites();
-			for (int i = 0; i < isites.length; i++) {
-				contributeCandidates(isites[i]);
-			}
-		} catch (CoreException e) {
-			UpdateCore.log(
-				"Error while initializing the search for new updates",
-				e);
-		}
-	}
-
-	private void contributeCandidates(IConfiguredSite isite)
-		throws CoreException {
-		IFeatureReference[] refs = isite.getConfiguredFeatures();
-		ArrayList candidatesPerSite = new ArrayList();
-		for (int i = 0; i < refs.length; i++) {
-			IFeatureReference ref = refs[i];
-			// Don't waste time searching for updates to 
-			// patches.
-			try {
-				if (UpdateUtils.isPatch(ref.getFeature(null)))
-					continue;
-			}
-			catch (CoreException e) {
-				continue;
-			}
-			Candidate c = new Candidate(ref);
-			candidatesPerSite.add(c);
-		}
-		// Create a tree from a flat list
-		buildHierarchy(candidatesPerSite);
-		// Add the remaining root candidates to 
-		// the global list of candidates.
-		candidates.addAll(candidatesPerSite);
-	}
-
-	private void buildHierarchy(ArrayList candidates) throws CoreException {
-		Candidate[] array =
-			(Candidate[]) candidates.toArray(new Candidate[candidates.size()]);
-		// filter out included features so that only top-level features remain on the list
-		for (int i = 0; i < array.length; i++) {
-			Candidate parent = array[i];
-			IFeature feature = parent.getFeature(null);
-			IFeatureReference[] included =
-				feature.getIncludedFeatureReferences();
-			for (int j = 0; j < included.length; j++) {
-				IFeatureReference fref = included[j];
-				Candidate child = findCandidate(candidates, fref);
-				if (child != null) {
-					parent.add(child);
-					child.setReference(fref);
-					candidates.remove(child);
-				}
-			}
-		}
-	}
-	private Candidate findCandidate(ArrayList list, IFeatureReference ref) {
-		for (int i = 0; i < list.size(); i++) {
-			Candidate c = (Candidate) list.get(i);
-			if (c.ref.equals(ref))
-				return c;
-		}
-		return null;
-	}
-
-	public IUpdateSearchQuery[] getQueries() {
-		initialize();
-		ArrayList allCandidates = getAllCandidates();
-
-		IUpdateSearchQuery[] queries =
-			new IUpdateSearchQuery[allCandidates.size()];
-		for (int i = 0; i < queries.length; i++) {
-			Candidate candidate = (Candidate) allCandidates.get(i);
-			IFeature feature = candidate.getFeature(null);
-			IURLEntry updateEntry = candidate.getUpdateEntry();
-			if (feature == null) {
-				queries[i] = null;
-			} else {
-				queries[i] = new UpdateQuery(feature, updateEntry);
-			}
-		}
-		return queries;
-	}
-	
-/**
- * Sets the features for which new updates need to be found. If
- * not set, updates will be searched for all the installed
- * and configured features.
- * @param features the features to search updates for
- */	
-	public void setFeatures(IFeature [] features) {
-		this.features = features;
-	}
-	
-/**
- * Returns an array of features for which updates need to
- * be found. 
- * @return an array of features or <samp>null</samp> if not
- * set.
- */	
-	public IFeature [] getFeatures() {
-		return features;
-	}
-	/**
-	 * @param fvi
-	 * @param cvi
-	 * @return fvi < cvi
-	 */
-	private boolean isNewerVersion(
-		VersionedIdentifier fvi,
-		VersionedIdentifier cvi) {
-		if (!fvi.getIdentifier().equals(cvi.getIdentifier()))
-			return false;
-		PluginVersionIdentifier fv = fvi.getVersion();
-		PluginVersionIdentifier cv = cvi.getVersion();
-		String mode = getUpdateVersionsMode();
-		boolean greater = cv.isGreaterThan(fv);
-		if (!greater)
-			return false;
-		if (mode.equals(UpdateCore.EQUIVALENT_VALUE))
-			return cv.isEquivalentTo(fv);
-		else if (mode.equals(UpdateCore.COMPATIBLE_VALUE))
-			return cv.isCompatibleWith(fv);
-		else
-			return false;
-	}
-
-	private boolean isPatch(IFeature candidate, ISiteFeatureReference ref) {
-		if (ref.isPatch() == false)
-			return false;
-		try {
-			IFeature feature = ref.getFeature(null);
-			if( UpdateUtils.isPatch(candidate, feature))
-				return true;
-			// Check if patch is for children
-			try {
-				IIncludedFeatureReference[] children =
-					candidate.getIncludedFeatureReferences();
-				for (int i = 0; i < children.length; i++) {
-					IIncludedFeatureReference cref = children[i];
-					try {
-						IFeature child = cref.getFeature(null);
-						if (isPatch(child, ref))
-							return true;
-					} catch (CoreException e) {
-					}
-				}
-			} catch (CoreException e) {
-			}
-			return false;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-	
-	private String getUpdateVersionsMode() {
-		Preferences store = UpdateCore.getPlugin().getPluginPreferences();
-		return store.getString(UpdateCore.P_UPDATE_VERSIONS);
-	}
-/*
- * This method recursively walks the list of candidates
- * building the flat that starts with the roots but
- * also includes all the children that are updatable
- * (use 'include' clause with a match that is not 'perfect').
- */
-	private ArrayList getAllCandidates() {
-		ArrayList selected = new ArrayList();
-		for (int i=0; i<candidates.size(); i++) {
-			Candidate c = (Candidate)candidates.get(i);
-			if (isOnTheList(c))
-				c.addToFlatList(selected, true);
-		}
-		return selected;
-	}
-	
-	private boolean isOnTheList(Candidate c) {
-		if (features==null) return true;
-		VersionedIdentifier vid;
-		try {
-			vid = c.getReference().getVersionedIdentifier();
-		}
-		catch (CoreException e) {
-			return false;
-		}
-		for (int i=0; i<features.length; i++) {
-			IFeature feature = features[i];
-			VersionedIdentifier fvid = feature.getVersionedIdentifier();
-			if (fvid.equals(vid))
-				return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
deleted file mode 100644
index 05e4e05..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.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.update.internal.security;
- 
- import java.security.cert.*;
- 
-/**
- *
- */
-public class CertificatePair {
-	private Certificate root;
-	private Certificate issuer;
-	
-	
-
-	/**
-	 * Gets the root.
-	 * @return Returns a Certificate
-	 */
-	public Certificate getRoot() {
-		return root;
-	}
-
-	/**
-	 * Sets the root.
-	 * @param root The root to set
-	 */
-	public void setRoot(Certificate root) {
-		this.root = root;
-	}
-
-	/**
-	 * Gets the issuer.
-	 * @return Returns a Certificate
-	 */
-	public Certificate getIssuer() {
-		return issuer;
-	}
-
-	/**
-	 * Sets the issuer.
-	 * @param issuer The issuer to set
-	 */
-	public void setIssuer(Certificate issuer) {
-		this.issuer = issuer;
-	}
-
-	/*
-	 * @see Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		
-		if (obj==null) return false;
-		
-		if (!(obj instanceof CertificatePair)) return false;
-		
-		if (root==null || issuer==null) return false;
-		
-		CertificatePair pair = (CertificatePair)obj;
-		
-		return (root.equals(pair.getRoot()) && issuer.equals(pair.getIssuer()));
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
deleted file mode 100644
index 7b7993d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.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.update.internal.security;
-
-import java.security.*;
-import java.security.cert.*;
-import java.security.cert.Certificate;
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Result of the service
- */
-public class JarVerificationResult implements IVerificationResult {
-
-
-	private int resultCode;
-	private int verificationCode;
-	private Exception resultException;
-	private List /*of Certificates[] */
-	certificates;
-	private CertificatePair[] rootCertificates;
-	private CertificatePair foundCertificate; // certificate found in one keystore
-	
-	private String signerInfo;
-	private String verifierInfo;
-	private ContentReference contentReference;
-	private IFeature feature;
-	private boolean featureVerification;
-	private boolean alreadySeen;
-
-	/*
-	 * 
-	 */
-	public int getResultCode() {
-		return resultCode;
-	}
-	
-	/*
-	 * 
-	 */
-	public Exception getVerificationException() {
-		return resultException;
-	}
-	
-	/*
-	 * 
-	 */
-	public void setResultCode(int newResultCode) {
-		resultCode = newResultCode;
-	}
-	
-	/*
-	 * 
-	 */
-	public void setResultException(Exception newResultException) {
-		resultException = newResultException;
-	}
-	
-	/*
-	 * 
-	 */
-	public int getVerificationCode() {
-		return verificationCode;
-	}
-
-	/*
-	 * 
-	 */
-	public void setVerificationCode(int verificationCode) {
-		this.verificationCode = verificationCode;
-	}
-
-	/*
-	 * adds an array of Certificates to the list
-	 * force recomputation of root cert
-	 */
-	public void addCertificates(Certificate[] certs) {
-		if (certificates == null)
-			certificates = new ArrayList();
-		certificates.add(certs);
-		rootCertificates = null;
-	}
-
-	/*
-	 * Returns the list of root certificates
-	 * The list of certificates we received is an array of certificates
-	 * we have to determine 
-	 * 1) how many chain do we have (a chain stops when verifier of a cert is 
-	 * not the signer of the next cert in the list 
-	 * 2) build a cert with the leaf signer and the root verifier for each chain
-	 */
-	public CertificatePair[] getRootCertificates() {
-		if (rootCertificates == null) {
-			rootCertificates = new CertificatePair[0];			
-			List rootCertificatesList = new ArrayList();
-			if (certificates != null && certificates.size() > 0) {
-				Iterator iter = certificates.iterator();
-				while (iter.hasNext()) {
-
-					Certificate[] certs = (Certificate[]) iter.next();
-					if (certs != null && certs.length > 0) {
-
-						CertificatePair pair = new CertificatePair();
-						pair.setIssuer(certs[0]);
-
-						for (int i = 0; i < certs.length - 1; i++) {
-							X509Certificate x509certRoot = (X509Certificate) certs[i];
-							X509Certificate x509certIssuer = (X509Certificate) certs[i+1];
-							if (!x509certRoot.getIssuerDN().equals(x509certIssuer.getSubjectDN())) {
-								pair.setRoot(x509certRoot);
-								if (!rootCertificatesList.contains(pair)) {
-									rootCertificatesList.add(pair);
-								}
-								pair = new CertificatePair();
-								pair.setIssuer(x509certIssuer);
-							}
-						}
-
-						// add the latest one
-						if (pair != null) {
-							pair.setRoot(certs[certs.length - 1]);
-							if (!rootCertificatesList.contains(pair)) {
-								rootCertificatesList.add(pair);
-							}
-						}
-					}
-				}
-
-			}
-			
-			if (rootCertificatesList.size() > 0) {
-				rootCertificates = new CertificatePair[rootCertificatesList.size()];				
-				rootCertificatesList.toArray(rootCertificates);
-			}
-		}
-		return rootCertificates;
-	}
-
-	/*
-	 * 
-	 */
-	private CertificatePair getFoundCertificate() {
-		return foundCertificate;
-	}
-
-	/*
-	 * 
-	 */
-	public void setFoundCertificate(CertificatePair foundCertificate) {
-		this.foundCertificate = foundCertificate;
-	}
-
-
-	/*
-	 * Initializes the signerInfo and the VerifierInfo from the Certificate Pair
-	 */
-	private void initializeCertificates(){
-		X509Certificate certRoot = null;
-		X509Certificate certIssuer = null;
-		CertificatePair trustedCertificate;
-		if (getFoundCertificate() == null) {
-			CertificatePair[] certs = getRootCertificates();
-			if (certs.length == 0)
-				return;
-			trustedCertificate = certs[0];
-		} else {
-			trustedCertificate = getFoundCertificate();
-		}
-		certRoot = (X509Certificate) trustedCertificate.getRoot();
-		certIssuer = (X509Certificate) trustedCertificate.getIssuer();
-
-		StringBuffer strb = new StringBuffer();
-		strb.append(issuerString(certIssuer.getSubjectDN()));
-		strb.append("\r\n"); //$NON-NLS-1$
-		strb.append(Policy.bind("JarVerificationResult.ValidBetween", dateString(certIssuer.getNotBefore()), dateString(certIssuer.getNotAfter()))); //$NON-NLS-1$
-		strb.append(checkValidity(certIssuer));
-		signerInfo = strb.toString();
-		if (certIssuer != null && !certIssuer.equals(certRoot)) {
-			strb = new StringBuffer();	
-			strb.append(issuerString(certIssuer.getIssuerDN()));
-			strb.append("\r\n"); //$NON-NLS-1$
-			strb.append(Policy.bind("JarVerificationResult.ValidBetween", dateString(certRoot.getNotBefore()), dateString(certRoot.getNotAfter()))); //$NON-NLS-1$ 
-			strb.append(checkValidity(certRoot));
-			verifierInfo = strb.toString();
-		}
-
-	}
-
-	/*
-	 * Returns a String to show if the certificate is valid
-	 */
-	private String checkValidity(X509Certificate cert) {
-
-		try {
-			cert.checkValidity();
-		} catch (CertificateExpiredException e) {
-			return ("\r\n" + Policy.bind("JarVerificationResult.ExpiredCertificate")); //$NON-NLS-1$ //$NON-NLS-2$ 
-		} catch (CertificateNotYetValidException e) {
-			return ("\r\n" + Policy.bind("JarVerificationResult.CertificateNotYetValid")); //$NON-NLS-1$ //$NON-NLS-2$ 
-		}
-		return ("\r\n" + Policy.bind("JarVerificationResult.CertificateValid")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/*
-	 * Returns the label String from a X50name
-	 */
-	private String issuerString(Principal principal) {
-// 19902
-//		try {
-//			if (principal instanceof X500Name) {
-//				StringBuffer buf = new StringBuffer();
-//				X500Name name = (X500Name) principal;
-//				buf.append((name.getDNQualifier() != null) ? name.getDNQualifier() + ", " : "");
-//				buf.append(name.getCommonName());
-//				buf.append((name.getOrganizationalUnit() != null) ? ", " + name.getOrganizationalUnit() : "");
-//				buf.append((name.getOrganization() != null) ? ", " + name.getOrganization() : "");
-//				buf.append((name.getLocality() != null) ? ", " + name.getLocality() : "");
-//				buf.append((name.getCountry() != null) ? ", " + name.getCountry() : "");
-//				return new String(buf);
-//			}
-//		} catch (Exception e) {
-//			UpdateCore.warn("Error parsing X500 Certificate",e);
-//		}
-		return principal.toString();
-	}
-
-	/*
-	 * 
-	 */
-	private String dateString(Date date) {
-		return DateFormat.getDateInstance().format(date);
-	}
-
-	/*
-	 *
-	 */
-	public String getSignerInfo() {
-		if (signerInfo==null) initializeCertificates();
-		return signerInfo;
-	}
-
-	/*
-	 *
-	 */
-	public String getVerifierInfo() {
-		if (signerInfo==null) initializeCertificates();		
-		return verifierInfo;
-	}
-
-	/*
-	 *
-	 */
-	public ContentReference getContentReference() {
-		return contentReference;
-	}
-
-	/*
-	 * 
-	 */
-	public void setContentReference(ContentReference ref) {
-		this.contentReference = ref;
-	}
-
-
-	/*
-	 *
-	 */
-	public IFeature getFeature() {
-		return feature;
-	}
-
-	/*
-	 * 
-	 */
-	public void setFeature(IFeature feature) {
-		this.feature = feature;
-	}
-
-	/*
-	 * 
-	 */
-	public String getText() {
-		return null;
-	}
-
-
-	/*
-	 * 
-	 */
-	public boolean isFeatureVerification() {
-		return featureVerification;
-	}
-	
-	/*
-	 * 
-	 */
-	public void isFeatureVerification(boolean featureVerification) {
-		this.featureVerification = featureVerification;
-	}
-
-	/*
-	 *
-	 */
-	public boolean alreadySeen() {
-		return alreadySeen;
-	}
-
-	/*
-	 * 
-	 */
-	public boolean alreadySeen(boolean seen) {
-		return this.alreadySeen = seen;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
deleted file mode 100644
index 877da7e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
+++ /dev/null

@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.security;
-
-import java.io.*;
-import java.security.*;
-import java.security.cert.*;
-import java.security.cert.Certificate;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * The JarVerifier will check the integrity of the JAR.
- * If the Jar is signed and the integrity is validated,
- * it will check if one of the certificate of each file
- * is in one of the keystore.
- *
- */
-
-public class JarVerifier extends Verifier {
-
-	private static final String MANIFEST = "META-INF"; //$NON-NLS-1$
-
-	private JarVerificationResult result;
-	private List /*of CertificatePair*/
-	trustedCertificates;
-	private boolean acceptUnsignedFiles;
-	private List /* of KeyStore */
-	listOfKeystores;
-	private IProgressMonitor monitor;
-	private File jarFile;
-
-	/*
-	 * Default Constructor
-	 */
-	public JarVerifier() {
-		initialize();
-	}
-
-	/*
-	 * Returns the list of the keystores.
-	 */
-	private List getKeyStores() throws CoreException {
-		if (listOfKeystores == null) {
-			listOfKeystores = new ArrayList(0);
-			KeyStores listOfKeystoreHandles = new KeyStores();
-			InputStream in = null;
-			KeyStore keystore = null;
-			KeystoreHandle handle = null;
-			while (listOfKeystoreHandles.hasNext()) {
-				try {
-					handle = listOfKeystoreHandles.next();
-					in = UpdateCore.getPlugin().get(handle.getLocation()).getInputStream();
-					try {
-						keystore = KeyStore.getInstance(handle.getType());
-						keystore.load(in, null); // no password
-					} catch (NoSuchAlgorithmException e) {
-						throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToFindEncryption", handle.getLocation().toExternalForm()), e); //$NON-NLS-1$
-					} catch (CertificateException e) {
-						throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToLoadCertificate", handle.getLocation().toExternalForm()), e); //$NON-NLS-1$
-					} catch (KeyStoreException e) {
-						throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToFindProviderForKeystore", handle.getType()), e); //$NON-NLS-1$
-					} finally {
-						if (in != null) {
-							try {
-								in.close();
-							} catch (IOException e) {
-							} // nothing
-						}
-					} // try loading a keyStore
-
-					// keystore was loaded
-					listOfKeystores.add(keystore);
-				} catch (IOException e) {
-					// nothing... if the keystore doesn't exist, continue	
-				}
-
-			} // while all key stores
-
-		}
-
-		return listOfKeystores;
-	}
-
-	/*
-	 * 
-	 */
-	private void initialize() {
-		result = null;
-		trustedCertificates = null;
-		acceptUnsignedFiles = false;
-		listOfKeystores = null;
-	}
-
-	/*
-	 * init
-	 */
-	private void init(IFeature feature, ContentReference contentRef) throws CoreException {
-		jarFile = null;
-		if (contentRef instanceof JarContentReference) {
-			JarContentReference jarReference = (JarContentReference) contentRef;
-			try {
-				jarFile = jarReference.asFile();
-				if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
-					UpdateCore.debug("Attempting to read JAR file:"+jarFile); //$NON-NLS-1$
-			
-				// # of entries
-				if (!jarFile.exists()) throw new IOException();
-				JarFile jar = new JarFile(jarFile);
-				if (jar !=null){
-					try {
-						jar.close();
-					} catch (IOException ex) {
-						// unchecked
-					}
-				}
-			} catch (ZipException e){
-				throw Utilities.newCoreException(Policy.bind("JarVerifier.InvalidJar", jarReference.toString()), e); //$NON-NLS-1$				
-			} catch (IOException e) {
-				throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToAccessJar", jarReference.toString()), e); //$NON-NLS-1$
-			}
-		}
-
-		result = new JarVerificationResult();
-		result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
-		result.setResultException(null);
-		result.setFeature(feature);
-		result.setContentReference(contentRef);
-	}
-
-	/*
-	 * Returns true if one of the certificate exists in the keystore
-	 */
-	private boolean existsInKeystore(Certificate cert) throws CoreException {
-		try {
-			List keyStores = getKeyStores();
-			if (!keyStores.isEmpty()) {
-				Iterator listOfKeystores = keyStores.iterator();
-				while (listOfKeystores.hasNext()) {
-					KeyStore keystore = (KeyStore) listOfKeystores.next();
-
-					if (keystore.getCertificateAlias(cert) != null) {
-						return true;
-					}
-				}
-			}
-		} catch (KeyStoreException e) {
-			throw Utilities.newCoreException(Policy.bind("JarVerifier.KeyStoreNotLoaded"), e); //$NON-NLS-1$
-		}
-		return false;
-	}
-
-	/*
-	 * 
-	 */
-	private List readJarFile(JarFile jarFile, String identifier)
-		throws IOException, InterruptedException {
-		List list = new ArrayList();
-		byte[] buffer = new byte[4096];
-		Enumeration entries = jarFile.entries();
-		JarEntry currentEntry = null;
-		InputStream in = null;
-		if (monitor != null)
-			monitor.setTaskName(Policy.bind("JarVerifier.Verify", identifier == null ? jarFile.getName(): identifier)); //$NON-NLS-1$ 
-
-		try {
-			while (entries.hasMoreElements()) {
-				currentEntry = (JarEntry) entries.nextElement();
-				list.add(currentEntry);
-				in = jarFile.getInputStream(currentEntry);
-				while ((in.read(buffer, 0, buffer.length)) != -1) {
-					// Security error thrown if tempered
-				}
-				if (in!=null)
-					in.close();
-			}
-		} catch (IOException e) {
-			result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
-			result.setResultException(e);
-		}
-
-		return list;
-	}
-
-	/*
-	 * @param newMonitor org.eclipse.core.runtime.IProgressMonitor
-	 */
-	public void setMonitor(IProgressMonitor newMonitor) {
-		monitor = newMonitor;
-	}
-
-	/*
-	 * @see IVerifier#verify(IFeature,ContentReference,boolean, InstallMonitor)
-	 */
-	public IVerificationResult verify(
-		IFeature feature,
-		ContentReference reference,
-		boolean isFeatureVerification,
-		InstallMonitor monitor)
-		throws CoreException {
-
-		if (reference == null)
-			return result;
-
-		// if parent knows how to verify, ask the parent first
-		if (getParent() != null) {
-			IVerificationResult vr =
-				getParent().verify(feature, reference, isFeatureVerification, monitor);
-			if (vr.getVerificationCode() != IVerificationResult.TYPE_ENTRY_UNRECOGNIZED)
-				return vr;
-		}
-
-		// the parent couldn't verify
-		setMonitor(monitor);
-		init(feature, reference);
-		result.isFeatureVerification(isFeatureVerification);
-
-		if (jarFile!=null) {
-				result = verify(jarFile.getAbsolutePath(), reference.getIdentifier());
-		} else {
-			result.setVerificationCode(IVerificationResult.TYPE_ENTRY_UNRECOGNIZED);
-		}
-
-		return result;
-	}
-
-	/*
-	 * 
-	 */
-	private JarVerificationResult verify(String file, String identifier) {
-
-		try {
-
-			// verify integrity
-			verifyIntegrity(file, identifier);
-
-			// do not close input stream
-			// as verifyIntegrity already did it
-
-			//if user already said yes
-			result.alreadySeen(alreadyValidated());
-
-			// verify source certificate
-			if (result.getVerificationCode()
-				== IVerificationResult.TYPE_ENTRY_SIGNED_UNRECOGNIZED) {
-				verifyAuthentication();
-			}
-
-			// save the fact the file is not signed, so the user will not be prompted again 
-			if (result.getVerificationCode()
-				== IVerificationResult.TYPE_ENTRY_NOT_SIGNED) {
-				acceptUnsignedFiles = true;
-			}
-
-		} catch (Exception e) {
-			result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
-			result.setResultException(e);
-		}
-
-		if (monitor != null) {
-			monitor.worked(1);
-			if (monitor.isCanceled()) {
-				result.setVerificationCode(IVerificationResult.VERIFICATION_CANCELLED);
-			}
-		}
-
-		return result;
-	}
-
-	/*
-	 * Verifies that each file has at least one certificate
-	 * valid in the keystore
-	 *
-	 * At least one certificate from each Certificate Array
-	 * of the Jar file must be found in the known Certificates
-	 */
-	private void verifyAuthentication() throws CoreException {
-
-		CertificatePair[] entries = result.getRootCertificates();
-		boolean certificateFound = false;
-
-		// If all the certificate of an entry are
-		// not found in the list of known certifcate
-		// the certificate is not trusted by any keystore.
-		for (int i = 0; i < entries.length; i++) {
-			certificateFound = existsInKeystore(entries[i].getRoot());
-			if (certificateFound) {
-				result.setVerificationCode(IVerificationResult.TYPE_ENTRY_SIGNED_RECOGNIZED);
-				result.setFoundCertificate(entries[i]);
-				return;
-			}
-		}
-	}
-
-	/*
-	 * Verifies the integrity of the JAR
-	 */
-	private void verifyIntegrity(String file, String identifier) {
-
-		JarFile jarFile = null;
-
-		try {
-			// If the JAR is signed and not valid
-			// a security exception will be thrown
-			// while reading it
-			jarFile = new JarFile(file, true);
-			List filesInJar = readJarFile(jarFile, identifier);
-
-			// you have to read all the files once
-			// before getting the certificates 
-			if (jarFile.getManifest() != null) {
-				Iterator iter = filesInJar.iterator();
-				boolean certificateFound = false;
-				while (iter.hasNext()) {
-					JarEntry currentJarEntry = (JarEntry) iter.next();
-					Certificate[] certs = currentJarEntry.getCertificates();
-					if ((certs != null) && (certs.length != 0)) {
-						certificateFound = true;
-						result.addCertificates(certs);
-					} else {
-						String jarEntryName = currentJarEntry.getName();
-						if (!jarEntryName.toUpperCase().startsWith(MANIFEST)
-							&& !currentJarEntry.isDirectory()) {
-							// if the jarEntry is not in MANIFEST, consider the whole file unsigned							
-							break;
-						}
-
-					}
-				}
-
-				if (certificateFound)
-					result.setVerificationCode(IVerificationResult.TYPE_ENTRY_SIGNED_UNRECOGNIZED);
-				else
-					result.setVerificationCode(IVerificationResult.TYPE_ENTRY_NOT_SIGNED);
-			} else {
-				Exception e = new Exception(Policy.bind("JarVerifier.InvalidFile", file)); //$NON-NLS-1$
-				result.setResultException(e);
-				result.setVerificationCode(IVerificationResult.TYPE_ENTRY_NOT_SIGNED);
-				UpdateCore.warn(null,e);
-			}
-		} catch (SecurityException e) {
-			// Jar file is signed
-			// but content has changed since signed
-			result.setVerificationCode(IVerificationResult.TYPE_ENTRY_CORRUPTED);
-		} catch (InterruptedException e) {
-			result.setVerificationCode(IVerificationResult.VERIFICATION_CANCELLED);
-		} catch (Exception e) {
-			result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
-			result.setResultException(e);
-		} finally {
-			if (jarFile!=null){
-				try {jarFile.close();} catch (IOException e){}
-			}
-		}
-
-	}
-
-	/*
-	 * 
-	 */
-	private boolean alreadyValidated() {
-
-		if (result.getVerificationCode() == IVerificationResult.TYPE_ENTRY_NOT_SIGNED)
-			return (acceptUnsignedFiles);
-
-		if (getTrustedCertificates() != null) {
-			Iterator iter = getTrustedCertificates().iterator();
-			CertificatePair[] jarPairs = result.getRootCertificates();
-
-			// check if this is not a user accepted certificate for this feature	
-			while (iter.hasNext()) {
-				CertificatePair trustedCertificate = (CertificatePair) iter.next();
-				for (int i = 0; i < jarPairs.length; i++) {
-					if (trustedCertificate.equals(jarPairs[i])) {
-						return true;
-					}
-				}
-			}
-
-			// if certificate pair not found in trusted add it for next time
-			for (int i = 0; i < jarPairs.length; i++) {
-				addTrustedCertificate(jarPairs[i]);
-			}
-		}
-
-		return false;
-	}
-
-	/*
-	 * 
-	 */
-	private void addTrustedCertificate(CertificatePair pair) {
-		if (trustedCertificates == null)
-			trustedCertificates = new ArrayList();
-		if (pair != null)
-			trustedCertificates.add(pair);
-	}
-
-	/*
-	 * 
-	 */
-	private List getTrustedCertificates() {
-		if (trustedCertificates == null)
-			trustedCertificates = new ArrayList();
-		return trustedCertificates;
-	}
-
-	/**
-	 * @see IVerifier#setParent(IVerifier)
-	 */
-	public void setParent(IVerifier parentVerifier) {
-		super.setParent(parentVerifier);
-		initialize();
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
deleted file mode 100644
index b17cc6d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.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.internal.security;
-
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.util.*;
-
-import org.eclipse.update.internal.core.*;
-/**
- * Class to manage the different KeyStores we should
- * check for certificates of Signed JAR
- */
-public class KeyStores {
-
-
-	/**
-	 * java.policy files properties of the java.security file
-	 */
-	private static final String JAVA_POLICY_URL = "policy.url."; //$NON-NLS-1$
-
-	/**
-	 * Default keystore type in java.security file
-	 */	
-    private static final String DEFAULT_KEYSTORE_TYPE = "keystore.type"; //$NON-NLS-1$
-
-	/**
-	 * List of KeystoreHandle pointing of valid KeyStores
-	 * the URL of the KeystoreHandle is not tested yet...
-	 */
-	private List /* of KeystoreHandle */ listOfKeyStores;
-
-	/**
-	 * Iterator
-	 */
-	private Iterator iterator;
-	/**
-	 * KeyStores constructor comment.
-	 */
-	public KeyStores() {
-		super();
-		initializeDefaultKeyStores();
-	}
-	/**
-	 * 
-	 */
-	private Iterator getIterator() {
-		if (iterator == null)
-			iterator = listOfKeyStores.iterator();
-		return iterator;
-	}
-	/**
-	 * returns trus if there is more Keystores in the list
-	 */
-	public boolean hasNext() {
-		return getIterator().hasNext();
-	}
-	/**
-	 * populate the list of Keystores
-	 * should be done with Dialog with Cancel/Skip button if
-	 * the connection to the URL is down...
-	 */
-	private void initializeDefaultKeyStores() {
-
-		listOfKeyStores = new ArrayList(5);
-
-		// get JRE cacerts
-		try {
-			URL url = new URL("file", null, 0, System.getProperty("java.home") + File.separator + "lib" + File.separator + "security" + File.separator + "cacerts");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-			listOfKeyStores.add(new KeystoreHandle(url,Security.getProperty(DEFAULT_KEYSTORE_TYPE)));
-		}
-		catch (MalformedURLException e) {
-			// should not happen, hardcoded...
-		}
-
-		// get java.home .keystore
-		try {
-			URL url = new URL("file", null, 0, System.getProperty("user.home") + File.separator + ".keystore"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			listOfKeyStores.add(new KeystoreHandle(url,Security.getProperty(DEFAULT_KEYSTORE_TYPE)));
-		}
-		catch (MalformedURLException e) {
-			// should not happen, hardcoded...
-		}
-
-		// get KeyStores from policy files...
-		int index = 1;
-		String java_policy = Security.getProperty(JAVA_POLICY_URL+index);
-		while (java_policy!=null){
-			// retrieve keystore url from java.policy
-			// also retrieve keystore type
-			KeystoreHandle keystore = getKeystoreFromLocation(java_policy);
-			if (keystore!=null){
-				listOfKeyStores.add(keystore);
-			}
-			index++;	
-			java_policy = Security.getProperty(JAVA_POLICY_URL+index);			
-		}
-
-	}
-	/**
-	 * returns the URL for the Next KeystoreHandle
-	 */
-	public KeystoreHandle next() {
-		return (KeystoreHandle) getIterator().next();
-	}
-	
-	/**
-	 * retrieve the keystore from java.policy file
-	 */
-	private KeystoreHandle getKeystoreFromLocation(String location){
-		
-		InputStream in = null;
-		char[] buff = new char[4096];
-		
-		
-		int indexOf$ = location.indexOf("${"); //$NON-NLS-1$
-		int indexOfCurly = location.indexOf('}',indexOf$);
-		if (indexOf$!=-1 && indexOfCurly!=-1){
-			String prop = System.getProperty(location.substring(indexOf$+2,indexOfCurly));
-			String location2 = location.substring(0,indexOf$);
-			location2 += prop;
-			location2 += location.substring(indexOfCurly+1);
-			location = location2;
-		}
-		
-		
-		try {
-			URL url = new URL(location);
-			in = UpdateCore.getPlugin().get(url).getInputStream();
-			Reader reader = new InputStreamReader(in);
-			int result = reader.read(buff);
-			StringBuffer contentBuff = new StringBuffer();
-			while (result!=-1){
-				contentBuff.append(buff,0,result);
-				result = reader.read(buff);				
-			}
-
-			if (contentBuff.length()>0){			
-				String content = new String(contentBuff);
-				int indexOfKeystore = content.indexOf("keystore"); //$NON-NLS-1$
-				if (indexOfKeystore != -1){
-					int indexOfSemiColumn = content.indexOf(';',indexOfKeystore);
-					return getKeystoreFromString(content.substring(indexOfKeystore,indexOfSemiColumn),url);
-				}
-			}
-		} catch (MalformedURLException e){
-			log(e);
-		} catch (IOException e){
-			// url.openStream, reader.read (x2)
-			// only log, the keystore may not exist
-			log(e);	
-		} finally {
-			if (in!=null){
-				try {
-					in.close();
-				} catch (IOException e){}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * retrieve the keystore from java.policy file
-	 */
-	private KeystoreHandle getKeystoreFromString(String content,URL rootURL){
-		KeystoreHandle handle = null;
-		String keyStoreType = Security.getProperty(DEFAULT_KEYSTORE_TYPE);
-		
-		
-		int indexOfSpace = content.indexOf(' ');
-		if (indexOfSpace==-1) return null;
-		
-		int secondSpace = content.lastIndexOf(',');
-		if (secondSpace==-1) {
-			secondSpace = content.length();
-		} else {
-			keyStoreType = content.substring(secondSpace+1,content.length()).trim();
-		}
-		
-		URL url = null;
-		try {
-			url = new URL(content.substring(indexOfSpace,secondSpace));
-		} catch (MalformedURLException e){
-			log(e);
-			// the url maybe relative
-			try {
-			url = new URL(rootURL,content.substring(indexOfSpace,secondSpace));				
-			} catch (MalformedURLException e1){
-				log(e1);			
-			}
-		}
-
-		if (url!=null)
-			handle = new KeystoreHandle(url,keyStoreType);				
-			
-		return handle;
-	}	
-	
-	private void log(Exception e){
-		UpdateCore.warn("Cannot retrieve a KeyStore",e); //$NON-NLS-1$
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
deleted file mode 100644
index 45605ed..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.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.internal.security;
-
-import java.net.*;
-
-
- 
-/**
- * Manages a handle to a keystore
- */
-public class KeystoreHandle {
-	
-	private URL location;
-	private String type;
-	
-	public KeystoreHandle(URL url, String type){
-		this.location = url;
-		this.type = type;
-	}
-
-	/**
-	 * Gets the location.
-	 * @return Returns a URL
-	 */
-	public URL getLocation() {
-		return location;
-	}
-
-	/**
-	 * Sets the location.
-	 * @param location The location to set
-	 */
-	public void setLocation(URL location) {
-		this.location = location;
-	}
-
-	/**
-	 * Gets the type.
-	 * @return Returns a String
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * Sets the type.
-	 * @param type The type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.java
deleted file mode 100644
index 3a5d7f5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IBatchOperation.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.operations;
-
-/**
- * Batch of operations on feature. For example, a batch features installation.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IBatchOperation  extends IOperation {
-	/**
-	 * Returns the batch operations.
-	 * @return
-	 */
-	public abstract IFeatureOperation[] getOperations();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.java
deleted file mode 100644
index 3cd735c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IConfigFeatureOperation.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.operations;
-
-/**
- * Operation that enable a feature in a configuration.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IConfigFeatureOperation extends IFeatureOperation {
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java
deleted file mode 100644
index 0f95d4c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IFeatureOperation.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-
-/**
- * An operation that applies to a feature, such as install, uninstall, etc.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IFeatureOperation extends IOperation {
-	/**
-	 * Return the feature to which the operation applies.
-	 * @return
-	 */
-	public abstract IFeature getFeature();
-	/**
-	 * Returns the site in which the operation is applied.
-	 * @return
-	 */
-	public abstract IConfiguredSite getTargetSite();
-	/**
-	 * Returns the previous version of the feature (if any).
-	 * @return
-	 */
-	public abstract IFeature getOldFeature();
-	/**
-	 * Sets the site in which the feature is being operated on.
-	 * @param targetSite
-	 */
-	public abstract void setTargetSite(IConfiguredSite targetSite);
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.java
deleted file mode 100644
index 13ad604..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IInstallFeatureOperation.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.operations;
-
-import org.eclipse.update.core.*;
-
-/**
- * An installation operation.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IInstallFeatureOperation extends IFeatureOperation {
-	/**
-	 * Returns the list of optional features to be installed.
-	 * @return
-	 */
-	public IFeatureReference[] getOptionalFeatures();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java
deleted file mode 100644
index dc2248c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperation.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Base update manager operation.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IOperation {
-	/**
-	 * Returns true when the operation has been processed.
-	 * @return
-	 */
-	public abstract boolean isProcessed();
-	/**
-	 * Marks the operation as processed.
-	 */
-	public abstract void markProcessed();
-	/**
-	 * Executes operation.
-	 * @param pm Progress monitor for the operation
-	 * @param listener Operation listener
-	 * @return true if operation was successful and a restart is needed.
-	 * @throws CoreException
-	 * @throws InvocationTargetException
-	 */
-	public abstract boolean execute(IProgressMonitor pm, IOperationListener listener) throws CoreException, InvocationTargetException;
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java
deleted file mode 100644
index bb26f35..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationFactory.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-
-/**
- * A factory interface for creating operations.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IOperationFactory {
-	/**
-	 * Creates a "configure feature" operation.
-	 * @param targetSite
-	 * @param feature
-	 * @return
-	 */
-	public IConfigFeatureOperation createConfigOperation(
-		IConfiguredSite targetSite,
-		IFeature feature);
-		
-	/**
-	 * Creates an "unconfigure feature" operation.
-	 * @param targetSite
-	 * @param feature
-	 * @return
-	 */
-	public IUnconfigFeatureOperation createUnconfigOperation(
-		IConfiguredSite targetSite,
-		IFeature feature);
-	
-	/**
-	 * Creates a "intall feature" operation.
-	 * @param targetSite
-	 * @param feature
-	 * @param optionalFeatures
-	 * @param unconfiguredOptionalFeatures
-	 * @param verifier
-	 * @return
-	 */
-	public IInstallFeatureOperation createInstallOperation(
-		IConfiguredSite targetSite,
-		IFeature feature,
-		IFeatureReference[] optionalFeatures,
-		IFeature[] unconfiguredOptionalFeatures,
-		IVerificationListener verifier);
-		
-	/**
-	 * Creates an "uninstall feature" operation.
-	 * @param targetSite
-	 * @param feature
-	 * @return
-	 */
-	public IUninstallFeatureOperation createUninstallOperation(
-		IConfiguredSite targetSite,
-		IFeature feature);
-		
-	/**
-	 * Creates a "revert feature version" operation.
-	 * @param feature current feature
-	 * @param anotherFeature the new feature to be swapped in
-	 * @return
-	 */
-	public IConfigFeatureOperation createReplaceFeatureVersionOperation(
-		IFeature feature,
-		IFeature anotherFeature);
-		
-	/**
-	 * Creates a "batch install" operation.
-	 * @param operations
-	 * @return
-	 */
-	public IBatchOperation createBatchInstallOperation(IInstallFeatureOperation[] operations);
-	
-	/**
-	 * Creates an "enable/disable site" operation.
-	 * @param site
-	 * @return
-	 */
-	public IToggleSiteOperation createToggleSiteOperation(
-		IConfiguredSite site);
-		
-
-	/**
-	 * Creates a "revert to a previous configuration" operation.
-	 * @param config
-	 * @param problemHandler
-	 * @return
-	 */
-	public IRevertConfigurationOperation createRevertConfigurationOperation(
-		IInstallConfiguration config,
-		IProblemHandler problemHandler);
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.java
deleted file mode 100644
index 163e90b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationListener.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.operations;
-
-/**
- * Listener for operation lifecycle.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IOperationListener {
-	/**
-	 * May be called before an operation starts executing.
-	 * @param operation
-	 * @param data
-	 * @return
-	 */
-	public boolean beforeExecute(IOperation operation, Object data);
-	/**
-	 * May be called after an operation finishes executing.
-	 * @param operation
-	 * @param data
-	 * @return
-	 */
-	public boolean afterExecute(IOperation operation, Object data);
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.java
deleted file mode 100644
index 0adbdb2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IOperationValidator.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.operations;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-
-/**
- * Operation validator.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IOperationValidator {
-
-	/**
-	 * Called before performing install.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePendingInstall(IFeature oldFeature, IFeature newFeature);
-
-	/**
-	 * Called before performing operation.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePendingConfig(IFeature feature);
-	
-	/**
-	 * Called before performing operation.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePendingUnconfig(IFeature feature);
-	
-	/**
-	 * Called before performing operation.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePendingReplaceVersion(IFeature feature, IFeature anotherFeature);
-	
-	/**
-	 * Called before doing a revert/ restore operation
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePendingRevert(IInstallConfiguration config);
-
-	/**
-	 * Called by the UI before doing a batched processing of
-	 * several pending changes.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePendingChanges(IInstallFeatureOperation[] jobs);
-
-	/**
-	 * Check the current state.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validateCurrentState();
-	
-	/**
-	 * Checks if the platform configuration has been modified outside this program.
-	 * @return the error status, or null if no errors
-	 */
-	public IStatus validatePlatformConfigValid();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.java
deleted file mode 100644
index cbac609..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IReplaceFeatureVersionOperation.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.operations;
-
-/**
- * Operation that reverts a feature to another version.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IReplaceFeatureVersionOperation extends IFeatureOperation {
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java
deleted file mode 100644
index 866adf3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IRevertConfigurationOperation.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-/**
- * An operation in which the current configuration is replaced by a previous one.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IRevertConfigurationOperation extends IOperation {
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java
deleted file mode 100644
index 3f1640a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IToggleSiteOperation.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-/**
- * An operation in which the unconfigured/configured state of a site is toggled.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IToggleSiteOperation extends IOperation {
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.java
deleted file mode 100644
index e096d30..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUnconfigFeatureOperation.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.operations;
-
-/**
- * An operation that disables a feature in a site.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IUnconfigFeatureOperation  extends IFeatureOperation {
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java
deleted file mode 100644
index b11ce1a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUninstallFeatureOperation.java
+++ /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
- */
-package org.eclipse.update.operations;
-
-
-/**
- * A feature uninstall operation.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IUninstallFeatureOperation extends IFeatureOperation {
-	public final static String UNINSTALL = "uninstall"; //$NON-NLS-1$
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java
deleted file mode 100644
index 7b8acee..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/IUpdateModelChangedListener.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.operations;
-
-/**
- * Listener for update model changes. 
- * Usually, when features are installed, configured, etc.
- * a GUI may need to update its state, so it will have to register
- * with the OperationsManager for update events.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IUpdateModelChangedListener {
-	/**
-	 * Called after a feature/site/etc. is added
-	 * @param parent
-	 * @param children
-	 */
-	public void objectsAdded(Object parent, Object [] children);
-	/**
-	 * Called after a feature/site/etc. is removed.
-	 * @param parent
-	 * @param children
-	 */
-	public void objectsRemoved(Object parent, Object [] children);
-	/**
-	 * Called when there are changes to a site/feature/etc.
-	 * @param object
-	 * @param property
-	 */
-	public void objectChanged(Object object, String property);
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.java
deleted file mode 100644
index d9741a9..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/OperationsManager.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.update.operations;
-
-import java.util.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-
-/**
- * Entry point for update manager operations.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class OperationsManager {
-	private static IOperationValidator validator;
-	private static IOperationFactory operationFactory;
-	private static Vector listeners = new Vector();
-	private static Vector pendingOperations = new Vector();
-	
-	private static boolean inProgress;
-
-	private OperationsManager() {
-	}
-	
-	/**
-	 * Each update operations must be created by the operation factory. 
-	 * Use this method to obtain the factory.
-	 */
-	public static IOperationFactory getOperationFactory() {
-		if (operationFactory == null)
-			operationFactory = new OperationFactory();
-		return operationFactory;
-	}
-
-	/**
-	 * Check if the feature is the subject of an update operation such as install,
-	 * configure, etc. and return it. Currently there can only be one pending
-	 * operation on a feature.
-	 * @param feature
-	 * @return
-	 */
-	public static IFeatureOperation findPendingOperation(IFeature feature) {
-		for (int i = 0; i < pendingOperations.size(); i++) {
-			IFeatureOperation operation =
-				(IFeatureOperation) pendingOperations.elementAt(i);
-			if (operation.getFeature().equals(feature))
-				return operation;
-		}
-		return null;
-	}
-	
-	/**
-	 * Register a pending operation.
-	 * @param operation
-	 */
-	public static void addPendingOperation(IOperation operation) {
-		pendingOperations.add(operation);
-		//fireObjectsAdded(this, new Object[] { change });
-	}
-
-	/**
-	 * Unregister a pending operation.
-	 * @param operation
-	 */
-	public static void removePendingOperation(IOperation operation) {
-		pendingOperations.remove(operation);
-		//fireObjectsRemoved(this, new Object[] { change });
-	}
-
-	/**
-	 * Adds a model changed listener.
-	 * @param listener
-	 */
-	public static void addUpdateModelChangedListener(IUpdateModelChangedListener listener) {
-		if (!listeners.contains(listener))
-			listeners.add(listener);
-	}
-
-	/**
-	 * Removes an model changed listener.
-	 * @param listener
-	 */
-	public static void removeUpdateModelChangedListener(IUpdateModelChangedListener listener) {
-		if (listeners.contains(listener))
-			listeners.remove(listener);
-	}
-
-	/**
-	 * Notifies model changed listeners when features/sites/etc. are added.
-	 * @param parent
-	 * @param children
-	 */
-	public static void fireObjectsAdded(Object parent, Object[] children) {
-		for (Iterator iter = listeners.iterator(); iter.hasNext();) {
-			IUpdateModelChangedListener listener =
-				(IUpdateModelChangedListener) iter.next();
-			listener.objectsAdded(parent, children);
-		}
-	}
-
-	/**
-	 * Notifies model changed listeners when features/sites/etc are removed.
-	 * @param parent
-	 * @param children
-	 */
-	public static void fireObjectsRemoved(Object parent, Object[] children) {
-		for (Iterator iter = listeners.iterator(); iter.hasNext();) {
-			IUpdateModelChangedListener listener =
-				(IUpdateModelChangedListener) iter.next();
-			listener.objectsRemoved(parent, children);
-		}
-	}
-
-	/**
-	 * Notifies model changed listeners when features/sites/etc. have changed.
-	 * @param object
-	 * @param property
-	 */
-	public static void fireObjectChanged(Object object, String property) {
-		for (Iterator iter = listeners.iterator(); iter.hasNext();) {
-			IUpdateModelChangedListener listener =
-				(IUpdateModelChangedListener) iter.next();
-			listener.objectChanged(object, property);
-		}
-	}
-
-	/**
-	 * Returns true when any of the install operations requires a licence agreement.
-	 * @param jobs
-	 * @return
-	 */
-	public static boolean hasSelectedJobsWithLicenses(IInstallFeatureOperation[] jobs) {
-		for (int i = 0; i < jobs.length; i++) {
-			if (UpdateUtils.hasLicense(jobs[i].getFeature()))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns true when any of the features to install has optional features.
-	 * @param jobs
-	 * @return
-	 */
-	public static boolean hasSelectedJobsWithOptionalFeatures(IInstallFeatureOperation[] jobs) {
-		for (int i = 0; i < jobs.length; i++) {
-			if (UpdateUtils.hasOptionalFeatures(jobs[i].getFeature()))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the list of operations that need a licence agreement.
-	 * @param jobs
-	 * @return
-	 */
-	public static IInstallFeatureOperation[] getSelectedJobsWithLicenses(IInstallFeatureOperation[] jobs) {
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < jobs.length; i++) {
-			if (UpdateUtils.hasLicense(jobs[i].getFeature()))
-				list.add(jobs[i]);
-		}
-		return (IInstallFeatureOperation[]) list.toArray(
-			new IInstallFeatureOperation[list.size()]);
-	}
-
-	/**
-	 * Returns the list of operations that have optional features to install.
-	 * @param jobs
-	 * @return
-	 */
-	public static IInstallFeatureOperation[] getSelectedJobsWithOptionalFeatures(IInstallFeatureOperation[] jobs) {
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < jobs.length; i++) {
-			if (UpdateUtils.hasOptionalFeatures(jobs[i].getFeature()))
-				list.add(jobs[i]);
-		}
-		return (IInstallFeatureOperation[]) list.toArray(
-			new IInstallFeatureOperation[list.size()]);
-	}
-	
-	/**
-	 * Sets whether any operations is in progress.
-	 * @param inProgress
-	 */
-	public static synchronized void setInProgress(boolean inProgress) {
-		OperationsManager.inProgress = inProgress;
-	}
-	
-	/**
-	 * Returns true when some operation is being executed, false otherwise.
-	 * @return
-	 */
-	public static synchronized boolean isInProgress() {
-		return inProgress;
-	}
-
-	/**
-	 * Returns the operations validator.
-	 * @return
-	 */
-	public static IOperationValidator getValidator() {
-		if (validator == null)
-			validator = new OperationValidator();
-		return validator;
-	}
-	
-	/**
-	 * Sets a custom operation validator
-	 * @param validator
-	 */
-	public static void setValidator(IOperationValidator validator) {
-		OperationsManager.validator = validator;
-	}
-	
-	/**
-	 * Applies the changes made to the current configuration. 
-	 * Care must be taken when using this method. Normally, if you install a new
-	 * plugin it is safe to do it.
-	 */
-	public static void applyChangesNow() {
-		InstallConfiguration.applyChanges();
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html
deleted file mode 100644
index 277f616..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/operations/package.html
+++ /dev/null

@@ -1,22 +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.72 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides support for performing various install/update operations.
-<h2>
-Package Specification</h2>
-This package contains interfaces for performing update/install operations 
-without using the Update Manager user interface. 
-<p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
-</p>
-</body>
-</html>

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java
deleted file mode 100644
index 6ac3d05..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.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.search;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-
-/**
- * This class can be added to the update search request
- * to filter out features that are back-level (are
- * older or the same as the features already installed).
- * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see UpdateSearchRequest
- * @see IUpdateSearchFilter
- * @since 3.0
- */
-public class BackLevelFilter extends BaseFilter {
-	public boolean accept(IFeatureReference match) {
-		try {
-			PluginVersionIdentifier matchVid = match.getVersionedIdentifier().getVersion();
-			IFeature [] installed = UpdateUtils.getInstalledFeatures(match.getVersionedIdentifier(), false);
-			if (installed.length==0) return true;
-			
-			for (int i=0; i<installed.length; i++) {
-				PluginVersionIdentifier ivid = installed[i].getVersionedIdentifier().getVersion();
-				if (matchVid.isGreaterThan(ivid))
-					continue;
-				// installed version is the same or newer than
-				// the match - filter out
-				return false;
-			}
-			return true;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.java
deleted file mode 100644
index b778c23..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/BaseFilter.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.search;
-
-import org.eclipse.update.core.*;
-
-/**
- * Base filter class
- * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see UpdateSearchRequest
- * @see IUpdateSearchFilter
- * @since 3.0
- */
-public class BaseFilter implements IUpdateSearchFilter {
-	public boolean accept(IFeature match) {
-		return true;
-	}
-	public boolean accept(IFeatureReference match) {
-		return true;
-	}	
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java
deleted file mode 100644
index 6173e98..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.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.search;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * This class can be added to the update search request
- * to filter out features that do not match the current
- * environment settings.
- * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see UpdateSearchRequest
- * @see IUpdateSearchFilter
- * @since 3.0
- */
-public class EnvironmentFilter extends BaseFilter {
-	public boolean accept(IFeature match) {
-		return UpdateManagerUtils.isValidEnvironment(match);
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java
deleted file mode 100644
index 17a753b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IQueryUpdateSiteAdapter.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.search;
-
-/**
- * This interface is used for update site adapter used 
- * for specific query serches. It adds a mapping ID 
- * that can be used when mapping file is specified.
- * If a matching mapping is found for this ID, 
- * the replacement URL found in the mapping file will be
- * used instead of this adapter.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IQueryUpdateSiteAdapter extends IUpdateSiteAdapter {
-/**
- * Returns an ID that can be used for matching against the information in the address mapping file.
- * @return a mapping Id to compare against the address mapping file.
- */
-	public String getMappingId();
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.java
deleted file mode 100644
index 788feef..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchCategory.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.search;
-
-/**
- * This interface is used to encapsulate a particular Update
- * search pattern. Each search category is free to scan
- * sites using a specific algorithm. Search category must
- * have a unique ID. The actual search is performed in
- * search queries. A category can provide one or more
- * queries to run during the search.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-
-public interface IUpdateSearchCategory {
-/**
- * Returns the unique identifier of this search category.
- */
-	public String getId();
-/**
- * Accepts the identifier assigned to this category during
- * the registry reading.
- */
-	public void setId(String id);
-
-/**
- * Returns an array of update search queries that need to 
- * be run during the search.
- * @return an arry of update search queries
- */	
-	IUpdateSearchQuery [] getQueries();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.java
deleted file mode 100644
index b4170aa..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchFilter.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.search;
-
-import org.eclipse.update.core.*;
-
-/**
- * Classes that implement this interface can be used to filter the
- * results of the update search.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IUpdateSearchFilter {
-	/**
-	 * Tests a feature according to this filter's criteria.
-	 * @param match the feature to test
-	 * @return <samp>true</samp> if the feature has been accepted, <samp>false</samp> otherwise.
-	 */
-	boolean accept(IFeature match);
-
-	/**
-	 * Tests a feature reference according to this filter's criteria. 
-	 * This is a prefilter that allows rejecting a feature before a potentially lengthy download.
-	 * @param match the feature reference to test
-	 * @return <samp>true</samp> if the feature reference has been accepted, <samp>false</samp> otherwise.
-	 */
-	boolean accept(IFeatureReference match);
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java
deleted file mode 100644
index 1d9ca95..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.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.update.search;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * A search query.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-
-public interface IUpdateSearchQuery {
-/**
- * Returns an update site adapter that should be added to the scope
- * while running this query. Some search category may need to 
- * scan specific site adapter in addition to those specified in 
- * the search scope.
- * 
- * @return the query-specific site adapter or <samp>null</samp> if
- * not specified.
- * 
- */
-	public IQueryUpdateSiteAdapter getQuerySearchSite();
-
-/**
- * Executes the query. The implementors should scan the provided
- * update site (scipping certain categories if provided) and
- * pass the matches to the result collector. The query is also
- * responsible of scoping and moving the provided progress monitor.
- * 
- * @param site the update site to scan
- * @param categoriesToSkip an array of category names that need to be skipped or <samp>null</samp> if categories should not be taken into account.
- * @param filter a filter to apply before passing the match to collector
- * @param collector an object that is used for reporting search results
- * @param monitor a progress monitor to report search progress within the provided site
- */
-	public void run(ISite site, String [] categoriesToSkip, IUpdateSearchFilter filter, IUpdateSearchResultCollector collector, IProgressMonitor monitor);
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.java
deleted file mode 100644
index b00b1d5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchResultCollector.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.update.search;
-
-import org.eclipse.update.core.*;
-
-/**
- * Search results are collected by implementing this interface
- * and passing it to the search request. If the implementation is
- * visual, it is recommended that the match is shown as soon
- * as it is collected (rather than kept in a list and presented
- * at the end of the search).
-  * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IUpdateSearchResultCollector {
-/**
- * Called when a matching feature has been found during
- * the search.
- * @param match the matching feature
- */
-   void accept(IFeature match);
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.java
deleted file mode 100644
index 47763c8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchSite.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.search;
-
-/**
- * This interface is used to represent sites that need to be
- * searched within the search scope. In addition to being an
- * update site adapter, it also returns an array of categories
- * within the site that need not be searched (skipping categories
- * makes the search faster because fewer features need to
- * be checked and potentially downloaded from the server).
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public interface IUpdateSearchSite extends IUpdateSiteAdapter {
-/**
- * Returns an array of categories that need not be searched
- * when scanning this site or <samp>null</samp> if all the
- * features must be tested.
- * @return an array of category names or <samp>null</samp> if
- * all the features must be tested.
- */
-	String[] getCategoriesToSkip();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.java
deleted file mode 100644
index bfad4f3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSiteAdapter.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.search;
-
-import java.net.*;
-
-/**
- * This interface wraps an update site URL and adds 
- * a presentation label. It is used to encapsulate sites that need
- * to be visited during the update search.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-
-public interface IUpdateSiteAdapter {
-	/**
-	 * Returns the presentation string that can be used
-	 * for this site.
-	 * @return the update site label
-	 */
-	public String getLabel();
-	/**
-	 * Returns the URL of the update site.
-	 * @return the URL of the update site.
-	 */
-	public URL getURL();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java
deleted file mode 100644
index 14af404..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java
+++ /dev/null

@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.search;
-
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.search.UpdatePolicy;
-
-/**
- * This class is central to update search. The search pattern
- * is encapsulated in update search category, while the search
- * scope is defined in the scope object. When these two objects
- * are defined and set, search can be performed using the 
- * provided method. Search results are reported to the
- * result collector, while search progress is tracked using
- * the progress monitor.
- * <p>Classes that implement <samp>IUpdateSearchResultCollector</samp>
- * should call 'filter' to test if the match should be
- * accepted according to the filters added to the request.
- * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see UpdateSearchScope
- * @see IUpdateSearchCategory
- * @since 3.0
- */
-public class UpdateSearchRequest {
-	private IUpdateSearchCategory category;
-	private UpdateSearchScope scope;
-	private boolean searchInProgress = false;
-	private AggregateFilter aggregateFilter = new AggregateFilter();
-
-	class AggregateFilter implements IUpdateSearchFilter {
-		private ArrayList filters;
-		public void addFilter(IUpdateSearchFilter filter) {
-			if (filters == null)
-				filters = new ArrayList();
-			if (filters.contains(filter) == false)
-				filters.add(filter);
-		}
-		
-		public void removeFilter(IUpdateSearchFilter filter) {
-			if (filters == null)
-				return;
-			filters.remove(filter);
-		}
-	
-		public boolean accept(IFeature match) {
-			if (filters == null)
-				return true;
-			for (int i = 0; i < filters.size(); i++) {
-				IUpdateSearchFilter filter = (IUpdateSearchFilter) filters.get(i);
-				if (filter.accept(match) == false)
-					return false;
-			}
-			return true;
-		}
-		
-		public boolean accept(IFeatureReference match) {
-			if (filters == null)
-				return true;
-			for (int i = 0; i < filters.size(); i++) {
-				IUpdateSearchFilter filter = (IUpdateSearchFilter) filters.get(i);
-				if (filter.accept(match) == false)
-					return false;
-			}
-			return true;
-		}
-	}
-
-	/**
-	 * The constructor that accepts the search category and 
-	 * scope objects.
-	 * @param category the actual search pattern that should be applied
-	 * @param scope a list of sites that need to be scanned during the search
-	 */
-	public UpdateSearchRequest(
-		IUpdateSearchCategory category,
-		UpdateSearchScope scope) {
-		this.category = category;
-		this.scope = scope;
-	}
-	/**
-	 * Returns the search catagory used in this request.
-	 * @return the search category
-	 */
-	
-	public IUpdateSearchCategory getCategory() {
-		return category;
-	}
-	
-	/**
-	 * Returns the scope of this search request.
-	 * @return search scope
-	 */
-	
-	public UpdateSearchScope getScope() {
-		return scope;
-	}
-	/**
-	 * Adds a filter to this request. This method does nothing
-	 * if search is alrady in progress. 
-	 * @param filter the filter 
-	 * @see UpdateSearchRequest#removeFilter
-	 */
-	public void addFilter(IUpdateSearchFilter filter) {
-		if (searchInProgress)
-			return;
-		aggregateFilter.addFilter(filter);
-	}
-	/**
-	 * Removes the filter from this request. This method does
-	 * nothing if search is alrady in progress.
-	 * @param filter the filter to remove
-	 * @see UpdateSearchRequest#addFilter
-	 */
-
-	public void removeFilter(IUpdateSearchFilter filter) {
-		if (searchInProgress)
-			return;
-		aggregateFilter.removeFilter(filter);
-	}
-
-	/**
-	 * Sets the scope object. It is possible to reuse the search request
-	 * object by modifying the scope and re-running the search.
-	 * @param scope the new search scope
-	 */
-	public void setScope(UpdateSearchScope scope) {
-		this.scope = scope;
-	}
-	/**
-	 * Tests whether this search request is current running.
-	 * @return <samp>true</samp> if the search is currently running, <samp>false</samp> otherwise.
-	 */
-	public boolean isSearchInProgress() {
-		return searchInProgress;
-	}
-
-	/**
-	 * Runs the search using the category and scope configured into
-	 * this request. As results arrive, they are passed to the
-	 * search result collector object.
-	 * @param collector matched features are passed to this object
-	 * @param monitor used to track the search progress
-	 * @throws CoreException
-	 */
-	public void performSearch(
-		IUpdateSearchResultCollector collector,
-		IProgressMonitor monitor)
-		throws CoreException {
-		ArrayList statusList = new ArrayList();
-
-		searchInProgress = true;
-		IUpdateSearchQuery[] queries = category.getQueries();
-		IUpdateSearchSite[] candidates = scope.getSearchSites();
-		URL updateMapURL = scope.getUpdateMapURL();
-		boolean searchFeatureProvidedSites = scope.isFeatureProvidedSitesEnabled();
-
-		if (!monitor.isCanceled()) {
-			int nsearchsites = 0;
-			for (int i = 0; i < queries.length; i++) {
-				if (queries[i].getQuerySearchSite() != null)
-					nsearchsites++;
-			}
-			int ntasks = nsearchsites + queries.length * candidates.length;
-			if (updateMapURL!=null) ntasks++;
-
-			monitor.beginTask("Searching...", ntasks);
-
-			try {
-				UpdatePolicy updatePolicy=null;
-				if (updateMapURL!=null) {
-					updatePolicy = new UpdatePolicy();
-					IStatus status =loadUpdatePolicy(updatePolicy, updateMapURL, new SubProgressMonitor(monitor, 1));
-					if (status != null)
-						statusList.add(status);
-				}
-				for (int i = 0; i < queries.length; i++) {
-					IUpdateSearchQuery query = queries[i];
-					IQueryUpdateSiteAdapter qsite = query.getQuerySearchSite();
-					if (qsite != null && searchFeatureProvidedSites) {
-						// check for mapping
-						IUpdateSiteAdapter mappedSite = getMappedSite(updatePolicy, qsite);
-						// when there is no mapped site the feature is not updatable
-						if (mappedSite == null || mappedSite.getURL() == null)
-							continue;
-						SubProgressMonitor subMonitor =
-							new SubProgressMonitor(monitor, 1);
-						IStatus status =
-							searchOneSite(
-								mappedSite,
-								null,
-								query,
-								collector,
-								subMonitor);
-						if (status != null)
-							statusList.add(status);
-						if (monitor.isCanceled())
-							break;
-					}
-					for (int j = 0; j < candidates.length; j++) {
-						if (monitor.isCanceled()) {
-							break;
-						}
-						IUpdateSearchSite source = candidates[j];
-						SubProgressMonitor subMonitor =
-							new SubProgressMonitor(monitor, 1);
-						IStatus status =
-							searchOneSite(
-								source,
-								source.getCategoriesToSkip(),
-								query,
-								collector,
-								subMonitor);
-						if (status != null)
-							statusList.add(status);
-					}
-					if (monitor.isCanceled())
-						break;
-				}
-			} catch (CoreException e) {
-				searchInProgress = false;
-				monitor.done();
-				throw e;
-			}
-		}
-		searchInProgress = false;
-		monitor.done();
-
-		if (statusList.size() > 0) {
-			IStatus[] children =
-				(IStatus[]) statusList.toArray(new IStatus[statusList.size()]);
-			MultiStatus multiStatus =
-				new MultiStatus(
-					"org.eclipse.update.core",
-					ISite.SITE_ACCESS_EXCEPTION,
-					children,
-					Policy.bind("Search.networkProblems"),
-					null);
-			throw new CoreException(multiStatus);
-		}
-	}
-
-/*
- * Load the update map using the map URL found in the scope.
- */	
-	private IStatus loadUpdatePolicy(UpdatePolicy map, URL url, IProgressMonitor monitor) throws CoreException {
-		monitor.subTask("Loading update policy ...");
-		try {
-			map.load(url, monitor);
-			monitor.worked(1);
-		}
-		catch (CoreException e) {
-			IStatus status = e.getStatus();
-			if (status == null
-				|| status.getCode() != ISite.SITE_ACCESS_EXCEPTION)
-				throw e;
-			monitor.worked(1);
-			return status;
-		}
-		return null;
-	}
-/*
- * See if this query site adapter is mapped in the map file
- * to a different URL.
- */
-	private IUpdateSiteAdapter getMappedSite(UpdatePolicy policy, IQueryUpdateSiteAdapter qsite) {
-		if (policy!=null && policy.isLoaded()) {
-			IUpdateSiteAdapter mappedSite = policy.getMappedSite(qsite.getMappingId());
-			if (mappedSite!=null) return mappedSite;
-			// no match - use original site if fallback allowed, or nothing.
-			return policy.isFallbackAllowed()? qsite : null;
-		}
-		return qsite;
-	}
-
-/*
- * Search one site using the provided query.
- */
-	private IStatus searchOneSite(
-		IUpdateSiteAdapter siteAdapter,
-		String[] categoriesToSkip,
-		IUpdateSearchQuery query,
-		IUpdateSearchResultCollector collector,
-		SubProgressMonitor monitor)
-		throws CoreException {
-		String text = "Contacting " + siteAdapter.getLabel() + "...";
-		monitor.subTask(text);
-		monitor.beginTask("", 10);
-		URL siteURL = siteAdapter.getURL();
-
-		ISite site;
-		try {
-			site =
-				SiteManager.getSite(
-					siteURL,
-					new SubProgressMonitor(monitor, 1));
-		} catch (CoreException e) {
-			// Test the exception. If the exception is
-			// due to the site connection problems,
-			// allow the search to move on to 
-			// the next site. Otherwise,
-			// rethrow the exception, causing the search
-			// to terminate.
-			IStatus status = e.getStatus();
-			if (status == null)
-//				|| status.getCode() != ISite.SITE_ACCESS_EXCEPTION)
-				throw e;
-			monitor.worked(10);
-			return status;
-		}
-		// If frozen connection was canceled, there will be no site.
-		if (site == null) {
-			monitor.worked(9);
-			return null;
-		}
-
-		text = "Checking " + siteAdapter.getLabel() + "...";
-		monitor.getWrappedProgressMonitor().subTask(text);
-
-		query.run(
-			site,
-			categoriesToSkip,
-			aggregateFilter,
-			collector,
-			new SubProgressMonitor(monitor, 9));
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java
deleted file mode 100644
index 1ea98c5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchScope.java
+++ /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
- *******************************************************************************/
-package org.eclipse.update.search;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.update.internal.search.*;
-
-/**
- * This class encapsulates update scope of the update search.
- * Sites that need to be visited should be added to the scope.
- * If some categories should be skipped, their names must be
- * passed as array of strings to the method.
- *
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see UpdateSearchRequest
- * @since 3.0
- */
-
-public class UpdateSearchScope {
-	private Vector sites;
-	private URL updateMapURL;
-	private boolean isFeatureProvidedSitesEnabled = true;
-	
-	private static class UpdateSearchSite
-		extends UpdateSiteAdapter
-		implements IUpdateSearchSite {
-		private String[] categoriesToSkip;
-
-		public UpdateSearchSite(
-			String label,
-			URL siteURL,
-			String[] categoriesToSkip) {
-			super(label, siteURL);
-			this.categoriesToSkip = categoriesToSkip;
-		}
-		public String[] getCategoriesToSkip() {
-			return categoriesToSkip;
-		}
-	}
-
-	/**
-	 * The default constructor.
-	 */
-	public UpdateSearchScope() {
-		sites = new Vector();
-	}
-
-	/**
-	 * Sets the optional URL of the update map file. This file
-	 * is used to redirect search for new updates to other
-	 * servers and is typically used when a local
-	 * update site proxy (possibly behind the firewall) is
-	 * set up.
-	 * @param url the url of the Java properties file that
-	 * contains the redirection information.
-	 */
-	
-	public void setUpdateMapURL(URL url) {
-		this.updateMapURL = url;
-	}
-	
-	/**
-	 * Returns the optional URL of the update map file. By 
-	 * default, no map file is set.
-	 * @return the URL of the map file or <samp>null</samp>
-	 * if not set.
-	 */
-	
-	public URL getUpdateMapURL() {
-		return updateMapURL;
-	}
-
-	/**
-	 * Adds the site to scan to the search scope.
-	 * @param label the presentation name of the site to visit.
-	 * @param siteURL the URL of the site to visit.
-	 * @param categoriesToSkip an array of category names that should be skipped or <samp>null</samp> if all features should be considered.
-	 */
-	public void addSearchSite(
-		String label,
-		URL siteURL,
-		String[] categoriesToSkip) {
-		sites.add(new UpdateSearchSite(label, siteURL, categoriesToSkip));
-	}
-
-	/**
-	 * Returns the sites that should be visited during the search.
-	 * @return an array of site adapters
-	 */
-	public IUpdateSearchSite[] getSearchSites() {
-		return (UpdateSearchSite[]) sites.toArray(
-			new UpdateSearchSite[sites.size()]);
-	}
-	
-	/**
-	 * In addition to the sites added by addSearchSite(), features contribute their own update url's.
-	 * This method returns true if those sites are also searched.
-	 * @return true if update site provided by features are also searched. Default is true.
-	 */
-	public boolean isFeatureProvidedSitesEnabled(){
-		return isFeatureProvidedSitesEnabled;
-	}
-
-	/**
-	 * Enable or disable searching of feature provided update sites. 
-	 * If disabled, only sites added by addSearchSite() are searched.
-	 * @param enable false to disable searching of feature provided sites. By default, these sites are searched.
-	 */
-	public void setFeatureProvidedSitesEnabled(boolean enable){
-		this.isFeatureProvidedSitesEnabled = enable;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java b/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.java
deleted file mode 100644
index cc5ad0d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/VersionedIdentifiersFilter.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.search;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-
-/**
- * This class can be added to the update search request
- * to filter out features that are not part of the specified set.
- * 
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see UpdateSearchRequest
- * @see IUpdateSearchFilter
- * @since 3.0
- */
-public class VersionedIdentifiersFilter extends BaseFilter {
-	private ArrayList vids;
-	
-	public VersionedIdentifiersFilter() {
-		this(new VersionedIdentifier[0]);
-	}
-	
-	public VersionedIdentifiersFilter(VersionedIdentifier[] vids) {
-		this.vids = new ArrayList(vids.length);
-		for (int i=0; i<vids.length; i++)
-			this.vids.add(vids[i]);
-	}
-	
-	public void add(VersionedIdentifier vid) {
-		vids.add(vid);
-	}
-	
-	public boolean accept(IFeatureReference match) {
-		try {
-			for (int i=0; i<vids.size(); i++) {
-				VersionedIdentifier vid = (VersionedIdentifier)vids.get(i);
-				// installed version is the same as the match - accept
-				if (vid.equals(match.getVersionedIdentifier()))
-					return true;
-			}
-			return false;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html
deleted file mode 100644
index 62e8f20..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/search/package.html
+++ /dev/null

@@ -1,21 +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">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides support for performing searches and filtering of features.
-<h2>
-Package Specification</h2>
-This package contains interfaces and helper classes for creating and executing search operations. 
-
-<p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
-</p>
-</body>
-</html>

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.java
deleted file mode 100644
index 4c7fefa..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/AddSiteCommand.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.standalone;
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-
-/**
- * Adds a new site.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class AddSiteCommand extends ScriptedCommand {
-	private ISite site;
-	private File sitePath;
-	
-	/**
-	 * @param fromSite if specified, list only the features from the specified local install site
-	 */
-	public AddSiteCommand(String fromSite) throws Exception {
-		try {
-			if (fromSite != null) {
-				sitePath = new File(fromSite);
-				if (!sitePath.exists())
-					throw new Exception("Cannot find site: " + fromSite);
-					
-				URL fromSiteURL = sitePath.toURL();
-				site = SiteManager.getSite(fromSiteURL, null);
-				if (site == null) {
-					throw new Exception(
-						"Cannot find site : " + fromSite);
-				}
-				IConfiguredSite csite = site.getCurrentConfiguredSite();
-				if (csite != null)
-					throw new Exception("Site is already configured " + fromSite);
-			} else {
-				throw new Exception("No site specified");
-			}
-		
-		} catch (Exception e) {
-			throw e;
-		} 
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-			if (site == null)
-				return false;
-			
-			try {
-				IConfiguredSite csite = getConfiguration().createConfiguredSite(sitePath);
-				getConfiguration().addConfiguredSite(csite);
-				// update the sites array to pick up new site
-				getConfiguration().getConfiguredSites();
-				SiteManager.getLocalSite().save();
-				return true;
-			} catch (CoreException e) {
-				return false;
-			}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java
deleted file mode 100644
index f4eb2f9..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/CmdLineArgs.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.mirror.*;
-
-/**
- * This class parses the command line arguments for update standalone commands
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class CmdLineArgs {
-	private HashMap options = new HashMap();
-	public CmdLineArgs(String[] args) {
-//		// default command
-//		options.put("-command", "install");
-
-		for (int i = 0; i < args.length - 1; i++) {
-			if ("-command".equals(args[i])) {
-				if (isValidCommand(args[i + 1])) {
-					options.put("-command", args[i + 1]);
-					i++;
-				} else {
-					StandaloneUpdateApplication.exceptionLogged();
-					UpdateCore.log(
-						Utilities.newCoreException(
-							"Invalid command:" + args[i + 1],
-							null));
-					return;
-				}
-			}
-			if (isValidParam(args[i])) {
-				options.put(args[i], args[i + 1]);
-				i++;
-			}
-			// -to should specify a directory
-			// if -to specifies file URL, change it to a directory
-			String to = (String) options.get("-to");
-			if (to != null && to.startsWith("file:")) {
-				try {
-					URL url = new URL(to);
-					options.put("-to", url.getFile());
-				} catch (MalformedURLException mue) {
-				}
-			}
-		}
-	}
-
-	private boolean isValidParam(String param) {
-		return param.equals("-command")
-			|| param.equals("-version")
-			|| param.equals("-to")
-			|| param.equals("-from")
-			|| param.equals("-featureId")
-			|| param.equals("-verifyOnly")
-			|| param.equals("-mirrorURL");
-	}
-
-	private boolean isValidCommand(String cmd) {
-		if (cmd == null)
-			return false;
-		else
-			return cmd.equals("install")
-			|| cmd.equals("enable")
-			|| cmd.equals("disable")
-			|| cmd.equals("search")
-			|| cmd.equals("update")
-			|| cmd.equals("mirror")
-			|| cmd.equals("uninstall")
-			|| cmd.equals("listFeatures")
-			|| cmd.equals("addSite")
-			|| cmd.equals("removeSite");
-	}
-
-	public ScriptedCommand getCommand() {
-		try {
-			String cmd = (String) options.get("-command");
-			if (cmd == null)
-				return null;
-			if (cmd.equals("install"))
-				return new InstallCommand(
-					(String) options.get("-featureId"),
-					(String) options.get("-version"),
-					(String) options.get("-from"),
-					(String) options.get("-to"),
-					(String) options.get("-verifyOnly"));
-			else if (cmd.equals("enable"))
-				return new EnableCommand(
-					(String) options.get("-featureId"),
-					(String) options.get("-version"),
-					(String) options.get("-to"),
-					(String) options.get("-verifyOnly"));
-			else if (cmd.equals("disable"))
-				return new DisableCommand(
-					(String) options.get("-featureId"),
-					(String) options.get("-version"),
-					(String) options.get("-to"),
-					(String) options.get("-verifyOnly"));
-			else if (cmd.equals("search"))
-				return new SearchCommand((String) options.get("-from"));
-			else if (cmd.equals("update"))
-				return new UpdateCommand(
-					(String) options.get("-featureId"),
-					(String) options.get("-verifyOnly"));
-			else if (cmd.equals("mirror"))
-				return new MirrorCommand(
-					(String) options.get("-featureId"),
-					(String) options.get("-version"),
-					(String) options.get("-from"),
-					(String) options.get("-to"),
-					(String) options.get("-mirrorURL"));
-			else if (cmd.equals("uninstall"))
-				return new UninstallCommand(
-					(String) options.get("-featureId"),
-					(String) options.get("-version"),
-					(String) options.get("-to"),
-					(String) options.get("-verifyOnly"));
-			else if (cmd.equals("listFeatures"))
-				return new ListFeaturesCommand((String) options.get("-from"));
-			else if (cmd.equals("addSite"))
-				return new AddSiteCommand((String) options.get("-from"));
-			else if (cmd.equals("removeSite"))
-				return new RemoveSiteCommand((String) options.get("-to"));
-			else
-				return null;
-		} catch (Exception e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return null;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java
deleted file mode 100644
index 3ab52c1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/DisableCommand.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Command to disable (unconfigure) a feature
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class DisableCommand extends ScriptedCommand {
-
-	private IConfiguredSite targetSite;
-	private IFeature feature;
-
-	public DisableCommand(
-		String featureId,
-		String version,
-		String toSite,
-		String verifyOnly)
-		throws Exception {
-
-		super(verifyOnly);
-
-		try {
-			IConfiguredSite[] sites = getConfiguration().getConfiguredSites();
-
-			// Get site containing the feature to disable
-			if (toSite != null) {
-				URL toSiteURL = new File(toSite).toURL();
-				if (SiteManager.getSite(toSiteURL, null) == null) {
-					throw new Exception("Cannot find site " + toSite);
-				}
-				targetSite =
-					SiteManager
-						.getSite(toSiteURL, null)
-						.getCurrentConfiguredSite();
-			}
-			if (targetSite == null) {
-				for (int i = 0; i < sites.length; i++) {
-					if (sites[i].isProductSite()) {
-						targetSite = sites[i];
-						break;
-					}
-				}
-			}
-
-			IFeature[] features =
-				UpdateUtils.searchSite(featureId, targetSite, true);
-			if (features == null || features.length == 0) {
-				throw new Exception(
-					"There are no configured features with id:" + featureId);
-			}
-			if (version == null || version.trim().length() == 0)
-				feature = features[0]; // pick the first feature
-			else
-				for (int i = 0; features != null && i < features.length; i++) {
-					if (features[i]
-						.getVersionedIdentifier()
-						.getVersion()
-						.toString()
-						.equals(version)) {
-						feature = features[i];
-						break;
-					}
-				}
-			if (feature == null) {
-				throw new Exception(
-					"Cannot find configured feature "
-						+ featureId
-						+ " with version "
-						+ version);
-			}
-
-		} catch (MalformedURLException e) {
-			throw e;
-		} catch (CoreException e) {
-			throw e;
-		}
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		if (isVerifyOnly()) {
-			IStatus status =
-				OperationsManager.getValidator().validatePendingUnconfig(
-					feature);
-			if (status != null && status.getCode() == IStatus.WARNING)
-				UpdateCore.log(status);
-			return status == null || status.getCode() == IStatus.WARNING;
-		}
-
-		final IUnconfigFeatureOperation configOperation =
-			OperationsManager.getOperationFactory().createUnconfigOperation(
-				targetSite,
-				feature);
-
-		try {
-			configOperation.execute(monitor, this);
-			return true;
-		} catch (CoreException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		} catch (InvocationTargetException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java
deleted file mode 100644
index 533049a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/EnableCommand.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Command to enable (configure) a feature.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class EnableCommand extends ScriptedCommand {
-
-	private IConfiguredSite targetSite;
-	private IFeature feature;
-
-	public EnableCommand(
-		String featureId,
-		String version,
-		String toSite,
-		String verifyOnly)
-		throws Exception {
-
-		super(verifyOnly);
-
-		try {
-			IConfiguredSite[] sites = getConfiguration().getConfiguredSites();
-
-			// Get site to enable to
-			if (toSite != null) {
-				URL toSiteURL = new File(toSite).toURL();
-				if (SiteManager.getSite(toSiteURL, null) == null) {
-					throw new Exception("Cannot find site " + toSite);
-				}
-				targetSite =
-					SiteManager
-						.getSite(toSiteURL, null)
-						.getCurrentConfiguredSite();
-			}
-			if (targetSite == null) {
-				for (int i = 0; i < sites.length; i++) {
-					if (sites[i].isProductSite()) {
-						targetSite = sites[i];
-						break;
-					}
-				}
-			}
-
-			IFeature[] features =
-				UpdateUtils.searchSite(featureId, targetSite, false);
-			if (features == null || features.length == 0) {
-				throw new Exception(
-					"There are no unconfigured features with id:" + featureId);
-			}
-			if (version == null || version.trim().length() == 0)
-				feature = features[0]; // pick the first feature
-			else
-				for (int i = 0; features != null && i < features.length; i++) {
-					if (features[i]
-						.getVersionedIdentifier()
-						.getVersion()
-						.toString()
-						.equals(version)
-						&& !targetSite.isConfigured(features[i])) {
-						feature = features[i];
-						break;
-					}
-				}
-			if (feature == null) {
-				throw new Exception(
-					"Cannot find unconfigured feature "
-						+ featureId
-						+ " with version "
-						+ version);
-			}
-
-		} catch (MalformedURLException e) {
-			throw e;
-		} catch (CoreException e) {
-			throw e;
-		}
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		if (isVerifyOnly()) {
-			IStatus status =
-				OperationsManager.getValidator().validatePendingConfig(feature);
-			if (status != null && status.getCode() == IStatus.WARNING)
-				UpdateCore.log(status);
-			return status == null || status.getCode() == IStatus.WARNING;
-		}
-
-		final IConfigFeatureOperation configOperation =
-			OperationsManager.getOperationFactory().createConfigOperation(
-				targetSite,
-				feature);
-
-		try {
-			configOperation.execute(monitor, this);
-			return true;
-		} catch (CoreException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		} catch (InvocationTargetException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.java
deleted file mode 100644
index bc1c90a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/InstallCommand.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.update.standalone;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.search.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-/**
- * Command to install a feature.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class InstallCommand extends ScriptedCommand {
-
-	private IConfiguredSite targetSite;
-	private UpdateSearchRequest searchRequest;
-	private UpdateSearchResultCollector collector;
-	private URL remoteSiteURL;
-	private String featureId;
-	private String version;
-
-	public InstallCommand(
-		String featureId,
-		String version,
-		String fromSite,
-		String toSite,
-		String verifyOnly)
-		throws Exception {
-
-		super(verifyOnly);
-
-		try {
-			this.featureId = featureId;
-			this.version = version;
-
-			this.remoteSiteURL = new URL(URLDecoder.decode(fromSite, "UTF-8"));
-
-			// Get site to install to
-			IConfiguredSite[] sites = getConfiguration().getConfiguredSites();
-			if (toSite != null) {
-				File sitePath = new File(toSite);
-				if (!sitePath.exists())
-					sitePath.mkdirs();
-				URL toSiteURL = sitePath.toURL();
-				ISite site = SiteManager.getSite(toSiteURL, null);
-				if (site == null) {
-					throw new Exception(
-						"Cannot find site to install to: " + toSite);
-				}
-				targetSite = site.getCurrentConfiguredSite();
-				if (targetSite == null) {
-					targetSite = getConfiguration().createConfiguredSite(sitePath);
-					getConfiguration().addConfiguredSite(targetSite);
-					// update the sites array to pick up new site
-					sites = getConfiguration().getConfiguredSites();
-				}
-			}
-			if (targetSite == null) {
-				for (int i = 0; i < sites.length; i++) {
-					if (sites[i].isProductSite()) {
-						targetSite = sites[i];
-						break;
-					}
-				}
-			}
-			UpdateSearchScope searchScope = new UpdateSearchScope();
-			searchScope.addSearchSite(
-				"remoteSite",
-				remoteSiteURL,
-				new String[0]);
-
-			searchRequest =
-				new UpdateSearchRequest(new SiteSearchCategory(), searchScope);
-			VersionedIdentifier vid =
-				new VersionedIdentifier(featureId, version);
-			searchRequest.addFilter(
-				new VersionedIdentifiersFilter(
-					new VersionedIdentifier[] { vid }));
-			searchRequest.addFilter(new EnvironmentFilter());
-			searchRequest.addFilter(new BackLevelFilter());
-
-			collector = new UpdateSearchResultCollector();
-
-		} catch (MalformedURLException e) {
-			throw e;
-		} catch (CoreException e) {
-			throw e;
-		}
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		try {
-			monitor.beginTask("Installing feature", 4);
-			searchRequest.performSearch(collector, new SubProgressMonitor(monitor,1));
-			IInstallFeatureOperation[] operations = collector.getOperations();
-			if (operations == null || operations.length == 0) {
-				throw Utilities.newCoreException(
-					"Feature "
-						+ featureId
-						+ " "
-						+ version
-						+ " cannot be found on "
-						+ remoteSiteURL
-						+ "\nor a newer version is already installed.",
-					null);
-			}
-			JobTargetSite[] jobTargetSites =
-				new JobTargetSite[operations.length];
-			for (int i = 0; i < operations.length; i++) {
-				jobTargetSites[i] = new JobTargetSite();
-				jobTargetSites[i].job = operations[i];
-				jobTargetSites[i].targetSite = operations[i].getTargetSite();
-			}
-
-			// Check for duplication conflicts
-			ArrayList conflicts =
-				DuplicateConflictsValidator.computeDuplicateConflicts(
-					jobTargetSites,
-					getConfiguration());
-			if (conflicts != null) {
-				throw Utilities.newCoreException("Duplicate conflicts", null);
-			}
-
-			if (isVerifyOnly()) {
-				return (operations != null && operations.length > 1);
-			}
-
-			IBatchOperation installOperation =
-				OperationsManager
-					.getOperationFactory()
-					.createBatchInstallOperation(
-					operations);
-			try {
-				installOperation.execute(new SubProgressMonitor(monitor,3), this);
-				System.out.println(
-					"Feature "
-						+ featureId
-						+ " "
-						+ version
-						+ " has successfully been installed");
-				return true;
-			} catch (Exception e) {
-				throw Utilities.newCoreException(
-					"Cannot install feature " + featureId + " " + version,
-					e);
-			}
-		} catch (CoreException ce) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(ce);
-			return false;
-		} finally {
-			monitor.done();
-		}
-	}
-
-
-	class UpdateSearchResultCollector implements IUpdateSearchResultCollector {
-		private ArrayList operations = new ArrayList();
-
-		public void accept(IFeature feature) {
-			if (feature
-				.getVersionedIdentifier()
-				.getIdentifier()
-				.equals(featureId)
-				&& feature
-					.getVersionedIdentifier()
-					.getVersion()
-					.toString()
-					.equals(
-					version)) {
-				operations.add(
-					OperationsManager
-						.getOperationFactory()
-						.createInstallOperation(
-						targetSite,
-						feature,
-						null,
-						null,
-						null));
-			}
-		}
-		public IInstallFeatureOperation[] getOperations() {
-			IInstallFeatureOperation[] opsArray =
-				new IInstallFeatureOperation[operations.size()];
-			operations.toArray(opsArray);
-			return opsArray;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.java
deleted file mode 100644
index c7b7592..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ListFeaturesCommand.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.standalone;
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-
-
-/**
- * Lists installed features.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class ListFeaturesCommand extends ScriptedCommand {
-	private IConfiguredSite[] sites = getConfiguration().getConfiguredSites();
-	
-	/**
-	 * @param fromSite if specified, list only the features from the specified local install site
-	 */
-	public ListFeaturesCommand(String fromSite) throws Exception {
-		try {
-			if (fromSite != null) {
-				File sitePath = new File(fromSite);
-				if (!sitePath.exists())
-					throw new Exception("Cannot find site: " + fromSite);
-					
-				URL fromSiteURL = sitePath.toURL();
-				ISite site = SiteManager.getSite(fromSiteURL, null);
-				if (site == null) {
-					throw new Exception(
-						"Cannot find site : " + fromSite);
-				}
-				IConfiguredSite csite = site.getCurrentConfiguredSite();
-				if (csite == null)
-					throw new Exception("Cannot find configured site: " + fromSite);
-				sites = new IConfiguredSite[] { csite };
-			} 
-		
-		} catch (Exception e) {
-			throw e;
-		} 
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		try {
-			if (sites != null) {
-				for (int i = 0; i < sites.length; i++) {
-					System.out.println("Site: " + sites[i].getSite().getURL());
-					IFeatureReference[] features = sites[i]
-							.getFeatureReferences();
-					for (int f = 0; f < features.length; f++) {
-						boolean configured = sites[i].isConfigured(features[f]
-								.getFeature(null));
-						System.out.println("  Feature: "
-								+ features[f].getVersionedIdentifier()
-										.getIdentifier()
-								+ " "
-								+ features[f].getVersionedIdentifier()
-										.getVersion() + "  "
-								+ (configured ? "enabled" : "disabled"));
-					}
-				}
-			}
-			return true;
-		} catch (CoreException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java
deleted file mode 100644
index ab246fa..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/RemoveSiteCommand.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-
-
-/**
- * Removes a configured site.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class RemoveSiteCommand extends ScriptedCommand {
-	private IConfiguredSite csite;
-	private File sitePath;
-	
-	/**
-	 * @param toSite if specified, list only the features from the specified local install site
-	 */
-	public RemoveSiteCommand(String toSite) throws Exception {
-		try {
-			if (toSite != null) {
-				sitePath = new File(toSite);
-				if (!sitePath.getName().equals("eclipse"))
-					sitePath = new File(sitePath, "eclipse");
-				if (!sitePath.exists())
-					throw new Exception("Cannot find site: " + toSite);
-					
-				IConfiguredSite[] csites = SiteManager.getLocalSite().getCurrentConfiguration().getConfiguredSites();
-				for (int i=0; i<csites.length; i++) {
-					File f = new File(csites[i].getSite().getURL().getFile());
-					if (f.equals(sitePath)) {
-						csite = csites[i];
-						break;
-					}
-				}
-				
-				if (csite == null)
-					throw new Exception("Site is not configured " + toSite);
-			} else {
-				throw new Exception("No site specified");
-			}
-		
-		} catch (Exception e) {
-			throw e;
-		} 
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-			
-			try {
-				getConfiguration().removeConfiguredSite(csite);
-				// update the sites array
-				getConfiguration().getConfiguredSites();
-				SiteManager.getLocalSite().save();
-				return true;
-			} catch (CoreException e) {
-				return false;
-			}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.java
deleted file mode 100644
index 665dd9c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/ScriptedCommand.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.standalone;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Parent class for all the update manager standalone commands.
- * Subclasses will provide specific operations and the implementation of the run() method.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public abstract class ScriptedCommand implements IOperationListener {
-
-	private IInstallConfiguration config;
-	protected boolean verifyOnly;
-
-	/**
-	 * Constructor
-	 *
-	 */
-	public ScriptedCommand() {
-		this(null);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param verifyOnly if true, the command is not executed, but will only attempt to run the command. 
-	 * This is mostly used when wanted to know if the command would fail.
-	 */
-	public ScriptedCommand(String verifyOnly) {
-		this.verifyOnly = "true".equals(verifyOnly);
-	}
-
-	/**
-	 * @return  true if the command should only be run in simulation mode,
-	 * to verify if it can execute.
-	 */
-	protected final boolean isVerifyOnly() {
-		return verifyOnly;
-	}
-
-	/**
-	 * Convenience method that executes the command with a null progress monitor.
-	 */
-	public final boolean run() {
-		return run(new NullProgressMonitor());
-	}
-	
-	/**
-	 * Executes the command. Subclasses are responsible for implementing this method.
-	 * If the command was constructed with verifyOnly=true, the command should not execute, but only verify it can execute.
-	 * @param monitor progress monitor during command execution.
-	 */
-	public abstract boolean run(IProgressMonitor monitor);
-
-	/**
-	 * Applies the changes made to the current configuration.
-	 */
-	public void applyChangesNow() {
-		InstallConfiguration.applyChanges();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperationListener#afterExecute(org.eclipse.update.operations.IOperation)
-	 */
-	public boolean afterExecute(IOperation operation, Object data) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperationListener#beforeExecute(org.eclipse.update.operations.IOperation)
-	 */
-	public boolean beforeExecute(IOperation operation, Object data) {
-		return true;
-	}
-
-	/**
-	 * @return the installation configuration affected by the command
-	 */
-	public final IInstallConfiguration getConfiguration() {
-//		if (config == null) {
-			try {
-				ILocalSite localSite = SiteManager.getLocalSite();
-				config = localSite.getCurrentConfiguration();
-//				if (!isVerifyOnly()) {
-//					config = UpdateUtils.createInstallConfiguration();
-//					UpdateUtils.makeConfigurationCurrent(config, null);
-//				}
-			} catch (CoreException e) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(e);
-			}
-//		}
-		return config;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.java
deleted file mode 100644
index a02f880..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/SearchCommand.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.standalone;
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.search.*;
-import org.eclipse.update.search.*;
-
-/**
- * Command to search an update site and list its features.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class SearchCommand extends ScriptedCommand {
-
-	private URL remoteSiteURL;
-	private UpdateSearchRequest searchRequest;
-	private IUpdateSearchResultCollector collector;
-
-	public SearchCommand(String fromSite) {
-		try {
-			this.remoteSiteURL = new URL(URLDecoder.decode(fromSite, "UTF-8"));
-			UpdateSearchScope searchScope = new UpdateSearchScope();
-			searchScope.addSearchSite(
-				"remoteSite",
-				remoteSiteURL,
-				new String[0]);
-			searchRequest =
-				new UpdateSearchRequest(new SiteSearchCategory(), searchScope);
-			collector = new UpdateSearchResultCollector();
-		} catch (MalformedURLException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-		} catch (UnsupportedEncodingException e) {
-		}
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		try {
-			System.out.println("Searching on " + remoteSiteURL.toString());
-			searchRequest.performSearch(collector, monitor);
-			System.out.println("Done.");
-			return true;
-		} catch (CoreException ce) {
-			IStatus status = ce.getStatus();
-			if (status != null
-				&& status.getCode() == ISite.SITE_ACCESS_EXCEPTION) {
-				// Just show this but do not throw exception
-				// because there may be results anyway.
-				System.out.println("Connection Error");
-			} else {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(ce);
-			}
-			return false;
-		}
-	}
-
-
-	class UpdateSearchResultCollector implements IUpdateSearchResultCollector {
-		public void accept(IFeature feature) {
-			System.out.println(
-				"\""
-					+ feature.getLabel()
-					+ "\" "
-					+ feature.getVersionedIdentifier().getIdentifier()
-					+ " "
-					+ feature.getVersionedIdentifier().getVersion());
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
deleted file mode 100644
index 63569e1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/StandaloneUpdateApplication.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-
-import org.eclipse.core.runtime.*;
-
-/**
- * The application class used to launch standalone update commands.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class StandaloneUpdateApplication implements IPlatformRunnable {
-
-	public final static Integer EXIT_ERROR = new Integer(1);
-	private static boolean loggedException = false;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.boot.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		if (args == null)
-			return EXIT_ERROR;
-		if (args instanceof String[]) {
-			String[] params = (String[]) args;
-			CmdLineArgs cmdLineArgs = new CmdLineArgs(params);
-			ScriptedCommand cmd = cmdLineArgs.getCommand();
-			if (cmd == null) {
-
-				System.out.println(
-						"Command failed.  Please check "
-							+ Platform.getLogFileLocation().toOSString()
-							+ " log file for details.");
-				return EXIT_ERROR;
-			}
-			loggedException = false;
-			boolean result = cmd.run();
-			if (result) {
-				if (loggedException) {
-					System.out.println(
-						"Command completed with errors.  Please check "
-							+ Platform.getLogFileLocation().toOSString()
-							+ " log file for details.");
-				} else {
-					System.out.println("Command completed successfully.");
-				}
-				return IPlatformRunnable.EXIT_OK;
-			} else {
-				if (loggedException) {
-					System.out.println(
-						"Command failed.  Please check "
-							+ Platform.getLogFileLocation().toOSString()
-							+ " log file for details.");
-				} else {
-					System.out.println("Command failed.");
-				}
-				return EXIT_ERROR;
-			}
-		}
-		return EXIT_ERROR;
-	}
-	public static void exceptionLogged() {
-		loggedException = true;
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java
deleted file mode 100644
index 85f08a2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UninstallCommand.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Command to uninstall a feature. The feature must be disabled before uninstalling it.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class UninstallCommand extends ScriptedCommand {
-
-	private IConfiguredSite targetSite;
-	private IFeature feature;
-
-	public UninstallCommand(
-		String featureId,
-		String version,
-		String toSite,
-		String verifyOnly)
-		throws Exception {
-
-		super(verifyOnly);
-
-		try {
-			IConfiguredSite[] sites = getConfiguration().getConfiguredSites();
-
-			// Get site that contains the feature to uninstall
-			if (toSite != null) {
-				URL toSiteURL = new File(toSite).toURL();
-				if (SiteManager.getSite(toSiteURL, null) == null) {
-					throw new Exception("Cannot find site " + toSite);
-				}
-				targetSite =
-					SiteManager
-						.getSite(toSiteURL, null)
-						.getCurrentConfiguredSite();
-			}
-			if (targetSite == null) {
-				for (int i = 0; i < sites.length; i++) {
-					if (sites[i].isProductSite()) {
-						targetSite = sites[i];
-						break;
-					}
-				}
-			}
-
-			IFeature[] features =
-				UpdateUtils.searchSite(featureId, targetSite, false);
-			if (features == null || features.length == 0) {
-				throw new Exception(
-					"There are no unconfigured features with id:" + featureId);
-			}
-			if (version == null || version.trim().length() == 0)
-				feature = features[0]; // pick the first feature
-			else
-				for (int i = 0; features != null && i < features.length; i++) {
-					if (features[i]
-						.getVersionedIdentifier()
-						.getVersion()
-						.toString()
-						.equals(version)
-						&& !targetSite.isConfigured(features[i])) {
-						feature = features[i];
-						break;
-					}
-				}
-			if (feature == null) {
-				throw new Exception(
-					"Cannot find unconfigured feature "
-						+ featureId
-						+ " with version "
-						+ version);
-			}
-
-		} catch (MalformedURLException e) {
-			throw e;
-		} catch (CoreException e) {
-			throw e;
-		}
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		if (InstallRegistry.getInstance().get("feature_"+ feature.getVersionedIdentifier()) == null) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(Utilities.newCoreException("Feature " + feature + " was not installed by the update manager, so it cannot be uninstalled.",null));
-			return false;
-		}
-							
-		if (isVerifyOnly()) {
-			// if reached this point, it is safe to uninstall
-			return true;
-		}
-
-		final IUninstallFeatureOperation uninstallOperation =
-			OperationsManager.getOperationFactory().createUninstallOperation(
-				targetSite,
-				feature);
-
-		try {
-			uninstallOperation.execute(monitor, this);
-			return true;
-		} catch (CoreException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		} catch (InvocationTargetException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-			return false;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java
deleted file mode 100644
index e72e9ae..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/UpdateCommand.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-/**
- * Command to udpate and existing feature.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 3.0
- */
-public class UpdateCommand extends ScriptedCommand {
-
-	private IConfiguredSite targetSite;
-	private UpdateSearchRequest searchRequest;
-	private UpdateSearchResultCollector collector;
-	private String featureId;
-	private IFeature currentFeature;
-
-	public UpdateCommand(String featureId, String verifyOnly)
-		throws Exception {
-
-		super(verifyOnly);
-
-		try {
-			this.featureId = featureId;
-			if (featureId != null) {
-				this.targetSite =
-					UpdateUtils.getSiteWithFeature(
-						getConfiguration(),
-						featureId);
-				if (targetSite == null) {
-					throw new Exception(
-						"Cannot find configured site for " + featureId);
-				}
-				IFeature[] currentFeatures =
-					UpdateUtils.searchSite(featureId, targetSite, true);
-				if (currentFeatures == null || currentFeatures.length == 0) {
-					throw new Exception(
-						"Cannot find configured feature " + featureId);
-				}
-				this.currentFeature = currentFeatures[0];
-			} else {
-				// Get site to install to
-				IConfiguredSite[] sites =
-					getConfiguration().getConfiguredSites();
-				for (int i = 0; i < sites.length; i++) {
-					if (sites[i].isProductSite()) {
-						targetSite = sites[i];
-						break;
-					}
-				}
-			}
-			if (currentFeature == null)
-				searchRequest = UpdateUtils.createNewUpdatesRequest(null);
-			else
-				searchRequest =
-					UpdateUtils.createNewUpdatesRequest(
-						new IFeature[] { currentFeature });
-
-			collector = new UpdateSearchResultCollector();
-
-		} catch (MalformedURLException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-		} catch (CoreException e) {
-			StandaloneUpdateApplication.exceptionLogged();
-			UpdateCore.log(e);
-		}
-	}
-
-	/**
-	 */
-	public boolean run(IProgressMonitor monitor) {
-		try {
-			monitor.beginTask("Updating feature", 4);
-			searchRequest.performSearch(collector, new SubProgressMonitor(monitor,1));
-			IInstallFeatureOperation[] operations = collector.getOperations();
-			if (operations == null || operations.length == 0) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(
-					Utilities.newCoreException(
-						"Feature " + featureId + " cannot be updated.",
-						null));
-				return false;
-			}
-			JobTargetSite[] jobTargetSites =
-				new JobTargetSite[operations.length];
-			for (int i = 0; i < operations.length; i++) {
-				jobTargetSites[i] = new JobTargetSite();
-				jobTargetSites[i].job = operations[i];
-				jobTargetSites[i].targetSite = operations[i].getTargetSite();
-			}
-
-			// Check for duplication conflicts
-			ArrayList conflicts =
-				DuplicateConflictsValidator.computeDuplicateConflicts(
-					jobTargetSites,
-					getConfiguration());
-			if (conflicts != null) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(
-					Utilities.newCoreException("Duplicate conflicts", null));
-				return false;
-			}
-
-			if (isVerifyOnly())
-				return true;
-
-			IBatchOperation installOperation =
-				OperationsManager
-					.getOperationFactory()
-					.createBatchInstallOperation(
-					operations);
-			try {
-				installOperation.execute(new SubProgressMonitor(monitor,3), this);
-				System.out.println(
-					"Feature " + featureId + " has successfully been updated");
-				return true;
-			} catch (Exception e) {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(
-					Utilities.newCoreException(
-						"Cannot update feature " + featureId,
-						e));
-				return false;
-			}
-		} catch (CoreException ce) {
-			IStatus status = ce.getStatus();
-			if (status != null
-				&& status.getCode() == ISite.SITE_ACCESS_EXCEPTION) {
-				// Just show this but do not throw exception
-				// because there may be results anyway.
-				System.out.println("Connection Error");
-			} else {
-				StandaloneUpdateApplication.exceptionLogged();
-				UpdateCore.log(ce);
-			}
-			return false;
-		} finally {
-			monitor.done();
-		}
-	}
-
-
-	class UpdateSearchResultCollector implements IUpdateSearchResultCollector {
-		private ArrayList operations = new ArrayList();
-
-		public void accept(IFeature feature) {
-
-			IInstallFeatureOperation op =
-				OperationsManager.getOperationFactory().createInstallOperation(
-					null,
-					feature,
-					null,
-					null,
-					null);
-
-			IConfiguredSite site =
-				UpdateUtils.getDefaultTargetSite(getConfiguration(), op);
-			if (site == null)
-				site = UpdateUtils.getAffinitySite(getConfiguration(), feature);
-			if (site == null)
-				site = targetSite;
-
-			op.setTargetSite(site);
-			operations.add(op);
-		}
-		public IInstallFeatureOperation[] getOperations() {
-			IInstallFeatureOperation[] opsArray =
-				new IInstallFeatureOperation[operations.size()];
-			operations.toArray(opsArray);
-			return opsArray;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html
deleted file mode 100644
index 7aa8db2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/standalone/package.html
+++ /dev/null

@@ -1,23 +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.72 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides support for performing various install/update operations from the command line.
-<h2>
-Package Specification</h2>
-This package contains interfaces for performing update/install operations 
-without using the Update Manager user interface. In general, it is best to use these
-classes for command line invocation, but it is possible to also use them programmatically.
-<p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
-</p>
-</body>
-</html>

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.scheduler/.classpath b/update/org.eclipse.update.scheduler/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/update/org.eclipse.update.scheduler/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/update/org.eclipse.update.scheduler/.cvsignore b/update/org.eclipse.update.scheduler/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/update/org.eclipse.update.scheduler/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/update/org.eclipse.update.scheduler/.project b/update/org.eclipse.update.scheduler/.project
deleted file mode 100644
index 2321d8c..0000000
--- a/update/org.eclipse.update.scheduler/.project
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.update.scheduler</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.views</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-		<project>org.eclipse.update.core</project>
-		<project>org.eclipse.update.core.linux</project>
-		<project>org.eclipse.update.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.scheduler/about.html b/update/org.eclipse.update.scheduler/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.scheduler/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.scheduler/build.properties b/update/org.eclipse.update.scheduler/build.properties
deleted file mode 100644
index c0f5125..0000000
--- a/update/org.eclipse.update.scheduler/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-bin.includes = plugin.properties,\
-               *.jar,\
-               plugin.xml,\
-               about.html
-src.includes = about.html
-source.scheduler.jar = src/

diff --git a/update/org.eclipse.update.scheduler/plugin.properties b/update/org.eclipse.update.scheduler/plugin.properties
deleted file mode 100644
index 5469fc3..0000000
--- a/update/org.eclipse.update.scheduler/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
-###############################################################################
-#
-# Update Scheduler plugin.xml resources
-#
-pluginName = Automatic Updates Scheduler
-providerName = Eclipse.org
-automaticUpdatesPrefPage = Automatic Updates
\ No newline at end of file

diff --git a/update/org.eclipse.update.scheduler/plugin.xml b/update/org.eclipse.update.scheduler/plugin.xml
deleted file mode 100644
index 98f9ad6..0000000
--- a/update/org.eclipse.update.scheduler/plugin.xml
+++ /dev/null

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.update.scheduler"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.update.internal.scheduler.UpdateScheduler">
-
-   <runtime>
-      <library name="scheduler.jar">
-         <export name="*"/>
-         <packages prefixes="org.eclipse.update.internal.scheduler"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.eclipse.update.core"/>
-      <import plugin="org.eclipse.update.ui"/>
-      <import plugin="org.eclipse.ui"/>
-   </requires>
-
-   <extension
-         point="org.eclipse.ui.startup">
-      <startup class="org.eclipse.update.internal.scheduler.SchedulerStartup">
-      </startup>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%automaticUpdatesPrefPage"
-            category="org.eclipse.update.internal.ui.preferences.MainPreferencePage"
-            class="org.eclipse.update.internal.scheduler.preferences.AutomaticUpdatesPreferencePage"
-            id="org.eclipse.update.scheduler.AutomaticUpdatesPreferencePage">
-      </page>
-   </extension>
-
-</plugin>

diff --git a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/AutomaticUpdatesJob.java b/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/AutomaticUpdatesJob.java
deleted file mode 100644
index e1619b7..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/AutomaticUpdatesJob.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.scheduler;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.UpdateUtils;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-public class AutomaticUpdatesJob extends Job {
-	
-	private class AutomaticSearchResultCollector implements IUpdateSearchResultCollector {
-		public void accept(IFeature feature) {
-			IInstallFeatureOperation operation =
-				OperationsManager
-					.getOperationFactory()
-					.createInstallOperation(null, feature, null, null, null);
-			updates.add(operation);
-		}
-	}
-	
-	// job family	
-	public static final Object family = new Object();
-	private IUpdateSearchResultCollector resultCollector;
-	
-	private static final IStatus OK_STATUS =
-		new Status(
-			IStatus.OK,
-			UpdateScheduler.getPluginId(),
-			IStatus.OK,
-			"", //$NON-NLS-1$
-			null);
-	private UpdateSearchRequest searchRequest;
-	private ArrayList updates;
-
-	public AutomaticUpdatesJob() {
-		super(UpdateScheduler.getString("AutomaticUpdatesJob.AutomaticUpdateSearch")); //$NON-NLS-1$
-		updates = new ArrayList();
-		setPriority(Job.DECORATE);
-	}
-
-
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	public boolean belongsTo(Object family) {
-		return AutomaticUpdatesJob.family == family;
-	}
-	
-	public IStatus run(IProgressMonitor monitor) {
-		if (UpdateCore.DEBUG) {
-			UpdateCore.debug("Automatic update search started."); //$NON-NLS-1$
-		}
-		searchRequest = UpdateUtils.createNewUpdatesRequest(null);
-		try {
-			if (resultCollector == null)
-				resultCollector = new AutomaticSearchResultCollector();
-			searchRequest.performSearch(resultCollector, monitor);
-			if (UpdateCore.DEBUG) {
-				UpdateCore.debug("Automatic update search finished - " //$NON-NLS-1$
-				+ updates.size()
-				+ " results."); //$NON-NLS-1$
-			}
-			if (updates.size() > 0) {
-				boolean download = UpdateCore.getPlugin().getPluginPreferences().getBoolean(UpdateScheduler.P_DOWNLOAD);
-				// silently download if download enabled 
-				if (download)
-				{
-					if (UpdateCore.DEBUG) {
-						UpdateCore.debug("Automatic download of updates started."); //$NON-NLS-1$
-					}
-					for (int i=0; i<updates.size(); i++) {
-						IInstallFeatureOperation op = (IInstallFeatureOperation)updates.get(i);
-						IFeature feature = op.getFeature();
-						UpdateUtils.downloadFeatureContent(feature, monitor);
-					}
-					if (UpdateCore.DEBUG) {
-						UpdateCore.debug("Automatic download of updates finished."); //$NON-NLS-1$
-					}
-				}
-				// prompt the user
-				if (!InstallWizard.isRunning()) {
-					if (download) {
-						getStandardDisplay().asyncExec(new Runnable() {
-							public void run() {
-								asyncNotifyDownloadUser();
-							}
-						});
-					} else {
-						getStandardDisplay().asyncExec(new Runnable() {
-							public void run() {
-								asyncNotifyUser();
-							}
-						});	
-					}
-				}
-				return Job.ASYNC_FINISH;
-			}
-		} catch (CoreException e) {
-			return e.getStatus();
-		}
-		return OK_STATUS;
-	}
-
-	private void asyncNotifyUser() {
-		// ask the user to install updates
-		getStandardDisplay().beep();
-		if (MessageDialog
-			.openQuestion(
-				UpdateScheduler.getActiveWorkbenchShell(),
-				UpdateScheduler.getString("AutomaticUpdatesJob.EclipseUpdates1"), //$NON-NLS-1$
-				UpdateScheduler.getString("AutomaticUpdatesJob.UpdatesAvailable"))) { //$NON-NLS-1$
-			BusyIndicator.showWhile(getStandardDisplay(), new Runnable() {
-				public void run() {
-					openInstallWizard();
-				}
-			});
-		}
-		// notify the manager that the job is done
-		done(OK_STATUS);
-	}
-	
-	private void asyncNotifyDownloadUser() {
-		// ask the user to install updates
-		getStandardDisplay().beep();
-		if (MessageDialog
-			.openQuestion(
-				UpdateScheduler.getActiveWorkbenchShell(),
-				UpdateScheduler.getString("AutomaticUpdatesJob.EclipseUpdates2"), //$NON-NLS-1$
-				UpdateScheduler.getString("AutomaticUpdatesJob.UpdatesDownloaded"))) { //$NON-NLS-1$
-			BusyIndicator.showWhile(getStandardDisplay(), new Runnable() {
-				public void run() {
-					openInstallWizard();
-				}
-			});
-		} else {
-			// Don't discard downloaded data, as next time we compare timestamps.
-			
-			// discard all the downloaded data from cache (may include old data as well)
-			//Utilities.flushLocalFile();
-		}
-		// notify the manager that the job is done
-		done(OK_STATUS);
-	}
-
-	private void openInstallWizard() {
-		if (InstallWizard.isRunning())
-			// job ends and a new one is rescheduled
-			return;
-			
-		InstallWizard wizard = new InstallWizard(searchRequest, updates);
-		WizardDialog dialog =
-			new ResizableWizardDialog(
-				UpdateScheduler.getActiveWorkbenchShell(),
-				wizard);
-		dialog.create();
-		dialog.getShell().setText(UpdateScheduler.getString("AutomaticUpdatesJob.Updates")); //$NON-NLS-1$
-		SWTUtil.setDialogSize(dialog, 600, 500);
-		if (dialog.open() == IDialogConstants.OK_ID)
-			UpdateUI.requestRestart(wizard.isRestartNeeded());
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/SchedulerStartup.java b/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/SchedulerStartup.java
deleted file mode 100644
index 22647fb..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/SchedulerStartup.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.update.internal.scheduler;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.ui.*;
-
-
-/**
- * This plug-in is loaded on startup to fork a job that
- * searches for new plug-ins.
- */
-public class SchedulerStartup implements IStartup {
-	// Preferences
-	public static final String P_ENABLED = "enabled"; //$NON-NLS-1$
-
-	public static final String P_SCHEDULE = "schedule"; //$NON-NLS-1$
-	public static final String VALUE_ON_STARTUP = "on-startup"; //$NON-NLS-1$
-	public static final String VALUE_ON_SCHEDULE = "on-schedule"; //$NON-NLS-1$
-	
-	public static final String P_DOWNLOAD = "download"; // value is true or false, default is false //$NON-NLS-1$
-
-	// values are to be picked up from the arryas DAYS and HOURS 
-	public static final String P_DAY = "day"; //$NON-NLS-1$
-	public static final String P_HOUR = "hour"; //$NON-NLS-1$
-
-	// Keeps track of running job
-	private Job job;
-	// Listener for job changes
-	private UpdateJobChangeAdapter jobListener;
-
-	public static final String[] DAYS =
-		{
-			UpdateScheduler.getString("SchedulerStartup.day"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Monday"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Tuesday"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Wednesday"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Thursday"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Friday"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Saturday"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.Sunday") }; //$NON-NLS-1$
-
-	public static final String[] HOURS =
-		{
-			UpdateScheduler.getString("SchedulerStartup.1AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.2AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.3AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.4AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.5AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.6AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.7AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.8AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.9AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.10AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.11AM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.12PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.1PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.2PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.3PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.4PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.5PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.6PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.7PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.8PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.9PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.10PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.11PM"), //$NON-NLS-1$
-			UpdateScheduler.getString("SchedulerStartup.12AM"), //$NON-NLS-1$
-			};
-
-	private class UpdateJobChangeAdapter extends JobChangeAdapter {
-		public void done(Job job, IStatus result) {
-			if (job == SchedulerStartup.this.job) {
-				scheduleUpdateJob();
-			}
-		}
-	}
-	
-	/**
-	 * The constructor.
-	 */
-	public SchedulerStartup() {
-		UpdateScheduler.setScheduler(this);
-		jobListener = new UpdateJobChangeAdapter();
-		Platform.getJobManager().addJobChangeListener(jobListener);
-	}
-
-	public void earlyStartup() {
-		scheduleUpdateJob();
-	}
-
-	public void scheduleUpdateJob() {
-		Preferences pref = UpdateScheduler.getDefault().getPluginPreferences();
-		// See if automatic search is enabled at all
-		if (pref.getBoolean(P_ENABLED) == false)
-			return;
-
-		String schedule = pref.getString(P_SCHEDULE);
-		long delay = -1L;
-		if (schedule.equals(VALUE_ON_STARTUP))
-			// have we already started a job ?
-			if (job == null)
-				delay = 0L;
-			else
-				delay = -1L;
-		else
-			delay = computeDelay(pref);
-		if (delay == -1L)
-			return;
-		startSearch(delay);
-	}
-
-	private int getDay(Preferences pref) {
-		String day = pref.getString(P_DAY);
-		for (int d = 0; d < DAYS.length; d++)
-			if (DAYS[d].equals(day))
-				switch (d) {
-					case 0 :
-						return -1;
-					case 1 :
-						return Calendar.MONDAY;
-					case 2 :
-						return Calendar.TUESDAY;
-					case 3 :
-						return Calendar.WEDNESDAY;
-					case 4 :
-						return Calendar.THURSDAY;
-					case 5 :
-						return Calendar.FRIDAY;
-					case 6 :
-						return Calendar.SATURDAY;
-					case 7 :
-						return Calendar.SUNDAY;
-				}
-		return -1;
-	}
-
-	private int getHour(Preferences pref) {
-		String hour = pref.getString(P_HOUR);
-		for (int h = 0; h < HOURS.length; h++)
-			if (HOURS[h].equals(hour))
-				return h + 1;
-		return 1;
-	}
-	/*
-	 * Computes the number of milliseconds from this moment
-	 * to the next scheduled search. If that moment has
-	 * already passed, returns 0L (start immediately).
-	 */
-	private long computeDelay(Preferences pref) {
-
-		int target_d = getDay(pref);
-		int target_h = getHour(pref);
-
-		Calendar calendar = Calendar.getInstance();
-		// may need to use the BootLoader locale
-		int current_d = calendar.get(Calendar.DAY_OF_WEEK);
-		// starts with SUNDAY
-		int current_h = calendar.get(Calendar.HOUR_OF_DAY);
-		int current_m = calendar.get(Calendar.MINUTE);
-		int current_s = calendar.get(Calendar.SECOND);
-		int current_ms = calendar.get(Calendar.MILLISECOND);
-
-		long delay = 0L; // milliseconds
-
-		if (target_d == -1) {
-			// Compute the delay for "every day at x o'clock"
-			// Is it now ?
-			if (target_h == current_h && current_m == 0 && current_s == 0)
-				return delay;
-
-			int delta_h = target_h - current_h;
-			if (target_h <= current_h)
-				delta_h += 24;
-			delay =
-				((delta_h * 60 - current_m) * 60 - current_s) * 1000 - current_ms;
-			return delay;
-		} else {
-			// Compute the delay for "every Xday at x o'clock"
-			// Is it now ?
-			if (target_d == current_d
-				&& target_h == current_h
-				&& current_m == 0
-				&& current_s == 0)
-				return delay;
-
-			int delta_d = target_d - current_d;
-			if (target_d < current_d
-				|| target_d == current_d
-				&& (target_h < current_h
-					|| target_h == current_h
-					&& current_m > 0))
-				delta_d += 7;
-
-			delay =
-				(((delta_d * 24 + target_h - current_h) * 60 - current_m) * 60 - current_s)* 1000 - current_ms;
-
-			return delay;
-		}
-		//return -1L;
-	}
-
-	private void startSearch(long delay) {
-		if (job != null) {
-			// cancel old job.
-			// We need to deregister the listener first,so we won't automatically start another job
-			Platform.getJobManager().removeJobChangeListener(jobListener);
-			Platform.getJobManager().cancel(AutomaticUpdatesJob.family);
-			Platform.getJobManager().addJobChangeListener(jobListener);
-		}
-		job = new AutomaticUpdatesJob();
-		job.schedule(delay);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateScheduler.java b/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateScheduler.java
deleted file mode 100644
index 2e793b2..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateScheduler.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.scheduler;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.*;
-
-/**
- * This plug-in is loaded on startup to fork a job that
- * searches for new plug-ins.
- */
-public class UpdateScheduler extends AbstractUIPlugin{
-	// Preferences
-	public static final String P_ENABLED = "enabled"; //$NON-NLS-1$
-	public static final String P_SCHEDULE = "schedule"; //$NON-NLS-1$
-	public static final String VALUE_ON_STARTUP = "on-startup"; //$NON-NLS-1$
-	public static final String VALUE_ON_SCHEDULE = "on-schedule"; //$NON-NLS-1$
-	public static final String P_DOWNLOAD = "download"; // value is true or false, default is false //$NON-NLS-1$
-
-	//The shared instance.
-	private static UpdateScheduler plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	// singleton
-	private static SchedulerStartup scheduler;
-
-	/**
-	 * The constructor.
-	 */
-	public UpdateScheduler() {
-		plugin = this;
-	}
-
-
-	public ResourceBundle getResourceBundle() {
-		if (resourceBundle == null)
-			try {
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.update.internal.scheduler.UpdateSchedulerResources"); //$NON-NLS-1$
-			} catch (MissingResourceException x) {
-				resourceBundle = null;
-			}
-		return resourceBundle;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UpdateScheduler getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getString(String key) {
-		ResourceBundle bundle =
-			UpdateScheduler.getDefault().getResourceBundle();
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static String getFormattedMessage(String key, String[] args) {
-		String text = getString(key);
-		return java.text.MessageFormat.format(text, args);
-	}
-
-	public static String getFormattedMessage(String key, String arg) {
-		String text = getString(key);
-		return java.text.MessageFormat.format(text, new String[] { arg });
-	}
-
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	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 (status.getSeverity() != IStatus.INFO) {
-			if (showErrorDialog)
-				ErrorDialog.openError(
-					getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-//			 Should log on the update plugin's log
-//			Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status); //$NON-NLS-1$
-			Bundle bundle = Platform.getBundle("org.eclipse.update.scheduler");  //$NON-NLS-1$
-			Platform.getLog(bundle).log(status);
-		} else {
-			MessageDialog.openInformation(
-				getActiveWorkbenchShell(),
-				null,
-				status.getMessage());
-		}
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		UpdateScheduler plugin = getDefault();
-		IWorkbenchWindow window =
-			plugin.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null)
-			return window.getActivePage();
-		return null;
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		return window != null ? window.getShell() : null;
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	private void initializeDefaultPreferences() {
-		Preferences pref = getPluginPreferences();
-		pref.setDefault(P_ENABLED, false);
-		pref.setDefault(P_SCHEDULE, VALUE_ON_STARTUP);
-		pref.setDefault(P_DOWNLOAD, false);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		initializeDefaultPreferences();
-	}
-	
-	public static SchedulerStartup getScheduler() {
-		// If the scheduler was disabled, it does not get initialized
-		if (scheduler == null)
-			scheduler = new SchedulerStartup();
-		return scheduler;
-	}
-	
-	static void setScheduler(SchedulerStartup scheduler) {
-		UpdateScheduler.scheduler = scheduler;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateSchedulerResources.properties b/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateSchedulerResources.properties
deleted file mode 100644
index e543dad..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateSchedulerResources.properties
+++ /dev/null

@@ -1,40 +0,0 @@
-#Messages for Update Scheduler plug-in
-
-SchedulerStartup.day=Every day
-SchedulerStartup.Monday=Every Monday
-SchedulerStartup.Tuesday=Every Tuesday
-SchedulerStartup.Wednesday=Every Wednesday
-SchedulerStartup.Thursday=Every Thursday
-SchedulerStartup.Friday=Every Friday
-SchedulerStartup.Saturday=Every Saturday
-SchedulerStartup.Sunday=Every Sunday
-SchedulerStartup.1AM=1:00 AM
-SchedulerStartup.2AM=2:00 AM
-SchedulerStartup.3AM=3:00 AM
-SchedulerStartup.4AM=4:00 AM
-SchedulerStartup.5AM=5:00 AM
-SchedulerStartup.6AM=6:00 AM
-SchedulerStartup.7AM=7:00 AM
-SchedulerStartup.8AM=8:00 AM
-SchedulerStartup.9AM=9:00 AM
-SchedulerStartup.10AM=10:00 AM
-SchedulerStartup.11AM=11:00 AM
-SchedulerStartup.12PM=12:00 PM
-SchedulerStartup.1PM=1:00 PM
-SchedulerStartup.2PM=2:00 PM
-SchedulerStartup.3PM=3:00 PM
-SchedulerStartup.4PM=4:00 PM
-SchedulerStartup.5PM=5:00 PM
-SchedulerStartup.6PM=6:00 PM
-SchedulerStartup.7PM=7:00 PM
-SchedulerStartup.8PM=8:00 PM
-SchedulerStartup.9PM=9:00 PM
-SchedulerStartup.10PM=10:00 PM
-SchedulerStartup.11PM=11:00 PM
-SchedulerStartup.12AM=12:00 AM
-AutomaticUpdatesJob.AutomaticUpdateSearch=Automatic Update Search
-AutomaticUpdatesJob.EclipseUpdates1=Eclipse Updates
-AutomaticUpdatesJob.UpdatesAvailable=New updates are available. Do you want to review and install them now?
-AutomaticUpdatesJob.EclipseUpdates2=Eclipse Updates
-AutomaticUpdatesJob.UpdatesDownloaded=New updates are available and downloaded. Do you want to review and install them now?
-AutomaticUpdatesJob.Updates=Updates

diff --git a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/preferences/AutomaticUpdatesPreferencePage.java b/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/preferences/AutomaticUpdatesPreferencePage.java
deleted file mode 100644
index 27652f7..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/preferences/AutomaticUpdatesPreferencePage.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.update.internal.scheduler.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.update.internal.scheduler.*;
-import org.eclipse.update.internal.scheduler.UpdateScheduler;
-
-public class AutomaticUpdatesPreferencePage
-	extends PreferencePage
-	implements IWorkbenchPreferencePage {
-
-	private Button enabledCheck;
-	private Button onStartupRadio;
-	private Button onScheduleRadio;
-	private Combo dayCombo;
-	private Combo hourCombo;
-	private Button searchOnlyRadio;
-	private Button searchAndDownloadRadio;
-
-	public void init(IWorkbench workbench) {
-	}
-
-	protected Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		container.setLayout(layout);
-
-		enabledCheck = new Button(container, SWT.CHECK);
-		enabledCheck.setText("Automatically &find new updates and notify me");
-
-		createSpacer(container, 1);
-
-		Group group = new Group(container, SWT.NONE);
-		group.setText("Update &Schedule");
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(gd);
-
-		onStartupRadio = new Button(group, SWT.RADIO);
-		onStartupRadio.setText(
-			"Look for updates each time platform is started");
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		onStartupRadio.setLayoutData(gd);
-		onStartupRadio.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-
-		onScheduleRadio = new Button(group, SWT.RADIO);
-		onScheduleRadio.setText("Look for updates on the following schedule:");
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		onScheduleRadio.setLayoutData(gd);
-		onScheduleRadio.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-
-		dayCombo = new Combo(group, SWT.READ_ONLY);
-		dayCombo.setItems(SchedulerStartup.DAYS);
-		gd = new GridData();
-		gd.widthHint = 200;
-		gd.horizontalIndent = 30;
-		dayCombo.setLayoutData(gd);
-		
-		Label label = new Label(group, SWT.NULL);
-		label.setText("at");
-		
-		hourCombo = new Combo(group, SWT.READ_ONLY);
-		hourCombo.setItems(SchedulerStartup.HOURS);
-		gd = new GridData();
-		gd.widthHint = 100;
-		hourCombo.setLayoutData(gd);
-	
-		createSpacer(container, 1);
-		
-		group = new Group(container, SWT.NONE);
-		group.setText("&Download Options");
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(gd);
-
-		searchOnlyRadio = new Button(group, SWT.RADIO);
-		searchOnlyRadio.setText(
-			"Search for updates and notify me when they are available");
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		searchOnlyRadio.setLayoutData(gd);
-		searchOnlyRadio.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-
-		searchAndDownloadRadio = new Button(group, SWT.RADIO);
-		searchAndDownloadRadio.setText("Download new updates automatically and notify me when ready to install them");
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		searchAndDownloadRadio.setLayoutData(gd);
-		searchAndDownloadRadio.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-			
-		initialize();
-
-		enabledCheck.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-
-	protected void createSpacer(Composite composite, int columnSpan) {
-		Label label = new Label(composite, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = columnSpan;
-		label.setLayoutData(gd);
-	}
-
-	private void initialize() {
-		Preferences pref = UpdateScheduler.getDefault().getPluginPreferences();
-		enabledCheck.setSelection(pref.getBoolean(UpdateScheduler.P_ENABLED));
-		setSchedule(pref.getString(UpdateScheduler.P_SCHEDULE));
-
-		dayCombo.setText(SchedulerStartup.DAYS[getDay(pref)]);
-		hourCombo.setText(SchedulerStartup.HOURS[getHour(pref)]);
-		
-		searchOnlyRadio.setSelection(!pref.getBoolean(UpdateScheduler.P_DOWNLOAD));
-		searchAndDownloadRadio.setSelection(pref.getBoolean(UpdateScheduler.P_DOWNLOAD));
-
-		pageChanged();
-	}
-
-	private void setSchedule(String value) {
-		if (value.equals(UpdateScheduler.VALUE_ON_STARTUP))
-			onStartupRadio.setSelection(true);
-		else
-			onScheduleRadio.setSelection(true);
-	}
-
-	private void pageChanged() {
-		boolean master = enabledCheck.getSelection();
-		onStartupRadio.setEnabled(master);
-		onScheduleRadio.setEnabled(master);
-		dayCombo.setEnabled(master && onScheduleRadio.getSelection());
-		hourCombo.setEnabled(master && onScheduleRadio.getSelection());
-		searchOnlyRadio.setEnabled(master);
-		searchAndDownloadRadio.setEnabled(master);
-	}
-
-	protected void performDefaults() {
-		super.performDefaults();
-		Preferences pref = UpdateScheduler.getDefault().getPluginPreferences();
-		enabledCheck.setSelection(
-			pref.getDefaultBoolean(UpdateScheduler.P_ENABLED));
-	}
-
-	/** 
-	 * Method declared on IPreferencePage.
-	 * Subclasses should override
-	 */
-	public boolean performOk() {
-		Preferences pref = UpdateScheduler.getDefault().getPluginPreferences();
-		pref.setValue(UpdateScheduler.P_ENABLED, enabledCheck.getSelection());
-		if (onStartupRadio.getSelection())
-			pref.setValue(UpdateScheduler.P_SCHEDULE, UpdateScheduler.VALUE_ON_STARTUP);
-		else 
-			pref.setValue(UpdateScheduler.P_SCHEDULE, UpdateScheduler.VALUE_ON_SCHEDULE);
-			
-		pref.setValue(SchedulerStartup.P_DAY, dayCombo.getText());
-		pref.setValue(SchedulerStartup.P_HOUR, hourCombo.getText());
-		
-		pref.setValue(UpdateScheduler.P_DOWNLOAD, searchAndDownloadRadio.getSelection());
-		
-		UpdateScheduler.getDefault().savePluginPreferences();
-		
-		UpdateScheduler.getScheduler().scheduleUpdateJob();
-		return true;
-	}
-	
-	private int getDay(Preferences pref) {
-		String day = pref.getString(SchedulerStartup.P_DAY);
-		for (int i=0; i<SchedulerStartup.DAYS.length; i++)
-			if (SchedulerStartup.DAYS[i].equals(day))
-				return i;
-		return 0;
-	}
-	
-	private int getHour(Preferences pref) {
-		String hour = pref.getString(SchedulerStartup.P_HOUR);
-		for (int i=0; i<SchedulerStartup.HOURS.length; i++)
-			if (SchedulerStartup.HOURS[i].equals(hour))
-				return i;
-		return 0;
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/.classpath b/update/org.eclipse.update.tests.core/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/update/org.eclipse.update.tests.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-	<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 fc1ca7f..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.eclipse.core.boot</project>

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

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

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

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

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

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

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

-		<project>org.eclipse.update.core.linux</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/mirrors/update-site1/.project b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.project
deleted file mode 100644
index 5d52069..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>update-site1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/build.log b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/build.log
deleted file mode 100644
index 3bce194..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/build.log
+++ /dev/null

@@ -1,318 +0,0 @@
-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin3.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin3.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin4.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin4.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature3_1.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Build finished.


diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/sitebuild.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/sitebuild.xml
deleted file mode 100644
index 1e700b9..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/.sitebuild/sitebuild.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="update.feature1" version="1.0.0"/>
-   <feature id="update.feature2" version="1.0.0"/>
-   <feature id="update.feature3" version="1.0.0"/>
-</site-build>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature1_1.0.0.jar
deleted file mode 100644
index c812b0b..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature2_1.0.0.jar
deleted file mode 100644
index fbf1754..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature3_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature3_1.0.0.jar
deleted file mode 100644
index 8682a62..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/features/update.feature3_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin1_1.0.0.jar
deleted file mode 100644
index 8bbc7f3..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin2_1.0.0.jar
deleted file mode 100644
index 5d42583..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin3_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin3_1.0.0.jar
deleted file mode 100644
index aa94e52..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin3_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin4_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin4_1.0.0.jar
deleted file mode 100644
index c8cca28..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/plugins/com.plugin4_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/site.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site1/site.xml
deleted file mode 100644
index 163f7bb..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site1/site.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/update.feature1_1.0.0.jar" id="update.feature1" version="1.0.0">
-      <category name="Site1-Category1"/>
-   </feature>
-   <feature url="features/update.feature2_1.0.0.jar" id="update.feature2" version="1.0.0">
-      <category name="Site1-Category2"/>
-   </feature>
-   <feature url="features/update.feature3_1.0.0.jar" id="update.feature3" version="1.0.0">
-      <category name="Site1-Category3"/>
-   </feature>
-   <category-def name="Site1-Category1" label="Site1-Category1-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-   <category-def name="Site1-Category2" label="Site1-Category2-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-   <category-def name="Site1-Category3" label="Site1-Category3-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-</site>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.project b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.project
deleted file mode 100644
index a4b687e..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>update-site2</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/build.log b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/build.log
deleted file mode 100644
index e977850..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/build.log
+++ /dev/null

@@ -1,203 +0,0 @@
-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin2.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature2_1.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Build finished.


diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/sitebuild.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/sitebuild.xml
deleted file mode 100644
index 2258820..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/.sitebuild/sitebuild.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="update.feature1" version="1.0.1"/>
-   <feature id="update.feature2" version="1.0.1"/>
-</site-build>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature1_1.0.0.jar
deleted file mode 100644
index 5175b4a..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature2_1.0.0.jar
deleted file mode 100644
index d1660b9..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/features/update.feature2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin1_1.0.0.jar
deleted file mode 100644
index d815f20..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin2_1.0.0.jar
deleted file mode 100644
index dec5f4c..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/plugins/com.plugin2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/site.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site2/site.xml
deleted file mode 100644
index f1d4b71..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site2/site.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/update.feature1_1.0.1.jar" id="update.feature1" version="1.0.1"/>
-   <feature url="features/update.feature2_1.0.1.jar" id="update.feature2" version="1.0.1"/>
-</site>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.project b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.project
deleted file mode 100644
index 0ddb6b7..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>update-site3</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/build.log b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/build.log
deleted file mode 100644
index 4a2ee01..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/build.log
+++ /dev/null

@@ -1,318 +0,0 @@
-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2a.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin2a.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin2.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature2b_2.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Build finished.


diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/sitebuild.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/sitebuild.xml
deleted file mode 100644
index e3510b0..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/.sitebuild/sitebuild.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="update.feature1b" version="2.0.0"/>
-   <feature id="update.feature2b" version="2.0.0"/>
-</site-build>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature1b_2.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature1b_2.0.0.jar
deleted file mode 100644
index 6b9a876..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature1b_2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature2b_2.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature2b_2.0.0.jar
deleted file mode 100644
index 97bb70f..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/features/update.feature2b_2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1_1.0.0.jar
deleted file mode 100644
index ee2d41d..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1a_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1a_1.0.1.jar
deleted file mode 100644
index 97183c7..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin1a_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2_1.0.0.jar
deleted file mode 100644
index e31b28e..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2a_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2a_1.0.1.jar
deleted file mode 100644
index 557ba5d..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/plugins/com.plugin2a_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/site.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site3/site.xml
deleted file mode 100644
index e28506b..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site3/site.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/update.feature1b_2.0.0.jar" id="update.feature1b" version="2.0.0">
-      <category name="Site3-Category1"/>
-   </feature>
-   <feature url="features/update.feature2b_2.0.0.jar" id="update.feature2b" version="2.0.0">
-      <category name="Site3-Category2"/>
-   </feature>
-   <category-def name="Site3-Category1" label="Site3-Category1-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-   <category-def name="Site3-Category2" label="Site3-Category2-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-</site>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.project b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.project
deleted file mode 100644
index 8a07aaf..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>update-site4</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/build.log b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/build.log
deleted file mode 100644
index 1cfe8e3..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/build.log
+++ /dev/null

@@ -1,791 +0,0 @@
-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin1.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin1.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin1.jar

-Target finished: plugin1.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin1.jar

-Target finished: plugin1.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin1a.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin1a.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.features

-Target started: all.plugins

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature1c_3.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature1_1.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature1_1.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature1b_2.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Task finished: ant

-Target finished: all.features

-Target started: all.plugins

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Build finished.


diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/sitebuild.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/sitebuild.xml
deleted file mode 100644
index 47cb017..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/.sitebuild/sitebuild.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="update.feature1c" version="3.0.0"/>
-</site-build>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.0.jar
deleted file mode 100644
index 78d2f28..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.1.jar
deleted file mode 100644
index eeb0b6f..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1b_2.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1b_2.0.0.jar
deleted file mode 100644
index 31b6bcb..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1b_2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1c_3.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1c_3.0.0.jar
deleted file mode 100644
index 3753305..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/features/update.feature1c_3.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1_1.0.0.jar
deleted file mode 100644
index 3e0760f..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1a_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1a_1.0.1.jar
deleted file mode 100644
index 634eb07..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/plugins/com.plugin1a_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/site.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site4/site.xml
deleted file mode 100644
index 2c73cbe..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site4/site.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/update.feature1c_3.0.0.jar" id="update.feature1c" version="3.0.0">
-      <category name="Site4-Category1"/>
-   </feature>
-   <category-def name="Site4-Category1" label="Site4-Category1-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-</site>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.project b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.project
deleted file mode 100644
index 0a93302..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>update-site5</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/build.log b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/build.log
deleted file mode 100644
index db44faa..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/build.log
+++ /dev/null

@@ -1,791 +0,0 @@
-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin2.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2.jar

-Target finished: plugin2.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2a.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: javac

-Message logged: Compile failed; see the compiler error output for details.

-Task finished: javac

-Task started: copy

-Task finished: copy

-Task started: mkdir

-Task finished: mkdir

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: plugin2a.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.update.jar

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: build.jars

-Task started: available

-Task finished: available

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: plugin2.jar

-Target finished: plugin2.jar

-Task finished: antcall

-Target finished: build.jars

-Task finished: antcall

-Task started: antcall

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: copy

-Task finished: copy

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: zip

-Task finished: zip

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Task finished: ant

-Target finished: all.features

-Target started: all.plugins

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Task started: property

-Task finished: property

-Task started: delete

-Task finished: delete

-Task started: mkdir

-Task finished: mkdir

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: gather.bin.parts

-Task started: antcall

-Target started: children

-Target finished: children

-Task finished: antcall

-Task started: mkdir

-Task finished: mkdir

-Task started: copy

-Task finished: copy

-Task started: eclipse.idReplacer

-Task finished: eclipse.idReplacer

-Task started: antcall

-Target started: ROOTFILES*_*_*

-Target finished: ROOTFILES*_*_*

-Task finished: antcall

-Target finished: gather.bin.parts

-Task finished: antcall

-Task started: jar

-Task finished: jar

-Task started: delete

-Task finished: delete

-Target finished: build.update.jar

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature2c_3.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature2_1.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature2_1.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Message logged: Project ${update.feature2b_2.0.0} does not exist and cannot be refreshed.

-Task finished: eclipse.refreshLocal

-Task started: antcall

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: all.features

-Target finished: all.features

-Target started: all.plugins

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Task started: ant

-Target started: properties

-Task started: property

-Task finished: property

-Target finished: properties

-Target started: init

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Task started: property

-Task finished: property

-Target finished: init

-Target started: refresh

-Task started: eclipse.convertPath

-Task finished: eclipse.convertPath

-Task started: eclipse.refreshLocal

-Task finished: eclipse.refreshLocal

-Target finished: refresh

-Task finished: ant

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Task finished: ant

-Target finished: all.features

-Target started: all.plugins

-Target finished: all.plugins

-Target started: update.feature

-Target finished: update.feature

-Target started: all.children

-Target finished: all.children

-Task finished: antcall

-Target finished: refresh

-Build finished.


diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/sitebuild.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/sitebuild.xml
deleted file mode 100644
index 49243d3..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/.sitebuild/sitebuild.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="update.feature1c" version="3.0.0"/>
-   <feature id="update.feature2c" version="3.0.0"/>
-</site-build>

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.0.jar
deleted file mode 100644
index 152d9e2..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.1.jar
deleted file mode 100644
index eeb0b6f..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1b_2.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1b_2.0.0.jar
deleted file mode 100644
index 49b0764..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1b_2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1c_3.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1c_3.0.0.jar
deleted file mode 100644
index d426f86..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature1c_3.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2_1.0.0.jar
deleted file mode 100644
index b070ccd..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2b_2.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2b_2.0.0.jar
deleted file mode 100644
index e48ac05..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2b_2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2c_3.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2c_3.0.0.jar
deleted file mode 100644
index 00037df..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/features/update.feature2c_3.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1_1.0.0.jar
deleted file mode 100644
index 3543749..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1a_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1a_1.0.1.jar
deleted file mode 100644
index 632cc3f..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin1a_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2_1.0.0.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2_1.0.0.jar
deleted file mode 100644
index dbc8a88..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2a_1.0.1.jar b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2a_1.0.1.jar
deleted file mode 100644
index a3cd0fb..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/plugins/com.plugin2a_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/site.xml b/update/org.eclipse.update.tests.core/data/mirrors/update-site5/site.xml
deleted file mode 100644
index 6e26db1..0000000
--- a/update/org.eclipse.update.tests.core/data/mirrors/update-site5/site.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/update.feature1c_3.0.0.jar" id="update.feature1c" version="3.0.0">
-      <category name="Site5-Category1"/>
-   </feature>
-   <feature url="features/update.feature2c_3.0.0.jar" id="update.feature2c" version="3.0.0">
-      <category name="Site5-Category2"/>
-   </feature>
-   <category-def name="Site5-Category1" label="Site5-Category1-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-   <category-def name="Site5-Category2" label="Site5-Category2-Label">
-      <description>
-         ecetera.
-      </description>
-   </category-def>
-</site>

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/bundleAndPluginManifests_1.0.3/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleAndPluginManifests_1.0.3/META-INF/MANIFEST.MF
deleted file mode 100644
index c223e4f..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleAndPluginManifests_1.0.3/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Generated-from: 1077062603708
-Bundle-Name: Test
-Bundle-Version: 1.0.3
-Bundle-SymbolicName: org.eclipse.update.core.tests.bundleAndPluginManifestsBUNDLEPARSED
-Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: plugin.jar
-Legacy: true
-Bundle-Activator: org.eclipse.update.core.tests.bundleAndPluginManifests.Activator
-Require-Bundle: 
- org.eclipse.core.runtime,
- org.eclipse.ui

diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleAndPluginManifests_1.0.3/plugin.xml b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleAndPluginManifests_1.0.3/plugin.xml
deleted file mode 100644
index 6b59ddb..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleAndPluginManifests_1.0.3/plugin.xml
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.bundleAndPluginManifests" version="1.0.3" vendor-name="Eclipse.org">
-</plugin>
\ No newline at end of file

diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleManifest_1.0.1/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleManifest_1.0.1/META-INF/MANIFEST.MF
deleted file mode 100644
index 656e680..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/bundleManifest_1.0.1/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Generated-from: 1077062603708
-Bundle-Name: Test
-Bundle-Version: 1.0.1
-Bundle-SymbolicName: org.eclipse.update.core.tests.bundleManifest; singleton=true
-Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: plugin.jar
-Legacy: true
-Bundle-Activator: org.eclipse.update.core.tests.bundleManifest.Activator
-Require-Bundle: 
- org.eclipse.core.runtime,
- org.eclipse.ui

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/siteTestLocalSite/plugins/notBundleManifest_1.0.2/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/notBundleManifest_1.0.2/META-INF/MANIFEST.MF
deleted file mode 100644
index 866fb0f..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/notBundleManifest_1.0.2/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Generated-from: 1077062603708
-Bundle-Name: Not Valid Bundle Manifest
-Bundle-Version: 1.0.2
-Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: plugin.jar
-Require-Bundle: 
- org.eclipse.core.runtime,
- org.eclipse.ui

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/eclipse/.eclipseextension b/update/org.eclipse.update.tests.core/data/validation/site4/eclipse/.eclipseextension
deleted file mode 100644
index acc84e9..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site4/eclipse/.eclipseextension
+++ /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/validation/site6/children/children/eclipse/.eclipseextension b/update/org.eclipse.update.tests.core/data/validation/site6/children/children/eclipse/.eclipseextension
deleted file mode 100644
index 597f9f8..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site6/children/children/eclipse/.eclipseextension
+++ /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 abde72c..0000000
--- a/update/org.eclipse.update.tests.core/plugin.xml
+++ /dev/null

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin

-   id="org.eclipse.update.tests.core"

-   name="%name"

-   version="3.0.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.eclipse.core.resources"/>

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

-      <import plugin="org.eclipse.tomcat"/>

-      <import plugin="org.eclipse.help.appserver"/>

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

-   </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 e4945f9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.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.update.tests;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-import org.eclipse.update.tests.api.AllAPITests;

-import org.eclipse.update.tests.branding.*;

-import org.eclipse.update.tests.configurations.AllConfigurationsTests;

-import org.eclipse.update.tests.core.boot.AllPlatformConfigurationTests;

-import org.eclipse.update.tests.mirror.*;

-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.standalone.*;

-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(AllMirrorTests.suite());	

-		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());

-		suite.addTest(AllBrandingTests.suite());

-		//suite.addTest(AllStandaloneTests.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 dec76cc..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.asLocalURL(Platform.resolve(dataDesc.getInstallURL()));

-		URL dataURL = new URL(resolvedURL, DATA_PATH);

-		dataPath = dataURL.getFile();

-		String homePath = (System.getProperty("java.io.tmpdir")).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);

-		// cleanup info about just installed plugins

-		InstallRegistry.cleanup();

-		

-		// setup cache site to false. 

-		// Note: the standalone tests will set it back to true

-		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);

-			InstallRegistry.unregisterPlugin(entries[i]);

-		}

-	}

-}


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 be16c12..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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;

-import org.osgi.framework.*;

-

-/**

- * 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 BundleContext bundleContext;

-	private static boolean initialized=false;

-

-	public static UpdateTestsPlugin getPlugin() {

-		return plugin;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		bundleContext = context;

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		WebappManager.stop("org.eclipse.update.tests.core.updatetests");

-		plugin = null;

-		bundleContext = null;

-		super.stop(context);

-	}

-

-	/**

-	 * 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 f6bcf81..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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, null);

-		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(null);

-		remoteFeature = new DefaultFeature(feature,site);

-

-		}

-		return remoteFeature;

-	}

-

-	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,null);

-			

-			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());

-		

-

-	}

-

-

-

-	public void testSite() throws MalformedURLException, CoreException{

-		String ident1 = Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/";		

-

-			ISite site = SiteManager.getSite(SOURCE_FILE_SITE,null);

-			

-			URL id = UpdateManagerUtils.getURL(site.getURL(),ident1,null);			

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(id);

-			assertEquals(site,remoteFeature.getSite());

-

-	}

-

-

-	public void testLabel() throws CoreException,MalformedURLException {

-		String label = "dummy label";

-		Feature feature = getFeature();

-		feature.setLabel(label);

-		assertEquals(label,feature.getLabel());

-	}

-

-

-	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());

-

-	} 

-

-

-	

-	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]);

-		}

-

-	}

-

-

-	public void testProvider() throws CoreException,MalformedURLException {

-		String provider = "not so dummy provider";

-		IFeature feature = getFeature();

-		((Feature)feature).setProvider(provider);

-		assertEquals(provider,feature.getProvider());

-	}

-

-

-

-	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());

-	}

-	

-

-	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());

-	}	

-	

-

-	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 c9261b2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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, null);

-		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;

-	}

-

-	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, null);

-			

-			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());

-	}

-

-

-	public void testSite() throws MalformedURLException, CoreException {

-		String ident1 = "org.eclipse.test.feature_1.0.0.jar";		

-

-			ISite site = SiteManager.getSite(SOURCE_FILE_SITE, null);

-			

-			URL id = UpdateManagerUtils.getURL(site.getURL(),ident1,null);		

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(id);	

-			assertEquals(site,remoteFeature.getSite());

-

-	}

-

-

-	public void testLabel() throws CoreException, MalformedURLException {

-		String label = "dummy label";

-		Feature feature = getFeature();

-		feature.setLabel(label);

-		assertEquals(label,feature.getLabel());

-	}

-

-	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());

-

-	} 

-

-

-	

-	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]);

-		}

-

-

-	}

-

-

-	public void testProvider() throws CoreException, MalformedURLException {

-		String provider = "not so dummy provider";

-		Feature feature = getFeature();

-		feature.setProvider(provider);

-		assertEquals(provider,feature.getProvider());

-	}

-

-

-

-	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());

-	}

-	

-

-	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());

-	}	

-	

-	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 6d58f15..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.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 org.eclipse.update.core.FeatureContentProvider;
-import org.eclipse.update.internal.core.FeatureExecutableContentProvider;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-
-public class TestFeatureContentProvider_FileFilterAPI extends UpdateManagerTestCase {
-	
-	
-	/**
-	 * 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 c5e33e3..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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/"), null);

-		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 testBundleManifestParsing() throws Exception {

-

-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"siteTestLocalSite/"),null);

-		IArchiveReference[] info = site.getArchives();

-		

-		if (info.length<=0){

-			fail("no plugins in site: "+site.getURL().toExternalForm());

-		}

-		 

-		boolean found1 = false;

-		boolean found2 = false;

-		boolean found3 = false;

-		String name1= "plugins/org.eclipse.update.core.tests.bundleManifest_1.0.1.jar";

-		String name2 = "plugins/org.eclipse.update.core.tests.bundleAndPluginManifestsBUNDLEPARSED_1.0.3.jar";

-		String name3 = "plugins/org.eclipse.update.core.tests.bundleAndPluginManifests_1.0.3.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 (info[i].getPath().equals(name3)) found3 = 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");

-		}

-		if (found3){

-			fail("Plugin manifest parsed instead of bundle manifest.");

-		}

-		

-

-	}

-	

-	

-	public void testCategories() throws Exception {

-

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE, null);

-		

-		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 867c5a7..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"),null);
-		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(null);
-		return feature;
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getChildFeature() throws MalformedURLException, CoreException {
-
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/"), null);
-		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(null);
-		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(null));
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getRootFeature2() throws MalformedURLException, CoreException {
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest2/site.xml"),null);
-		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(null);
-		return feature;
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getChildFeature2() throws MalformedURLException, CoreException {
-
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest2/site.xml"),null);
-		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(null);
-		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(null));
-	}
-
-//	/**
-//	 * the feature to test
-//	 */
-//	private IFeature getRootFeature3() throws MalformedURLException, CoreException {
-//		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest3/site.xml"), null);
-//		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(null);
-//		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(null);
-//		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 aea7791..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/"), null);

-

-		}

-		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 f12a428..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, null);

-		assertEquals(new File(site.getURL().getFile()),new File(SOURCE_FILE_SITE.getFile()));

-		

-		ISite site2 = SiteManager.getSite(SOURCE_HTTP_SITE, null);

-		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 53266a3..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.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.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,null);

-		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,null);

-		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,null);

-		IFeature remoteFeature = remoteSite.getFeatureReferences()[0].getFeature(null);

-		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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-

-	}

-	

-

-}

-


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/branding/AllBrandingTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/AllBrandingTests.java
deleted file mode 100644
index 05af134..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/AllBrandingTests.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.branding;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-/**
- * Manages the API tests
- */
-public class AllBrandingTests extends UpdateManagerTestCase {
-	/**
-	 * Constructor
-	 */
-	public AllBrandingTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * List of API tests
-	 */
-	public static Test suite() throws Exception {
-		TestSuite suite = new TestSuite();
-		suite.setName("Branding Tests");
-
-		suite.addTest(new TestSuite(BundleProviderTest.class));	
-		suite.addTest(new TestSuite(ProductTest.class));	
-
-		return suite;
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/BundleProviderTest.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/BundleProviderTest.java
deleted file mode 100644
index 6575d39..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/BundleProviderTest.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.update.tests.branding;
-
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.internal.configurator.branding.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import org.osgi.framework.*;
-
-public class BundleProviderTest extends UpdateManagerTestCase {
-
-	public BundleProviderTest(String testcase){
-		super(testcase);
-	}
-
-	public void testMain() throws Exception {
-		
-		IBundleGroupProvider[] bundleGroupProviders = Platform.getBundleGroupProviders();
-		for (int i=0; i<bundleGroupProviders.length; i++) {
-			System.out.println("BundleGroupProvider:"+bundleGroupProviders[i].getName());
-			IBundleGroup[] bundleGroups = bundleGroupProviders[i].getBundleGroups();
-			for (int j=0; j<bundleGroups.length; j++) {
-				System.out.println("BundleGroup name:"+bundleGroups[j].getName() +"\n" +
-						"description:" + bundleGroups[j].getDescription() + "\n"+
-						"id:" + bundleGroups[j].getIdentifier() + "\n" +
-						"provider:" + bundleGroups[j].getProviderName() + "\n" +
-						"version:" + bundleGroups[j].getVersion() + "\n" +
-						"license:" + bundleGroups[j].getProperty(IBundleGroupConstants.LICENSE_HREF) + "\n" +
-						"featureImage:" + bundleGroups[j].getProperty(IBundleGroupConstants.FEATURE_IMAGE) + "\n" +
-						"tips and tricks:" + bundleGroups[j].getProperty(IBundleGroupConstants.TIPS_AND_TRICKS_HREF) + "\n" +
-						"welcomePage:" + bundleGroups[j].getProperty(IBundleGroupConstants.WELCOME_PAGE) + "\n" +
-						"welcomePerspective:" + bundleGroups[j].getProperty(IBundleGroupConstants.WELCOME_PERSPECTIVE));
-				System.out.println("bundles:");
-				Bundle[] bundles = bundleGroups[j].getBundles();
-				for (int b=0; b<bundles.length; b++)
-					System.out.println(bundles[b].getSymbolicName());
-				System.out.println();
-			}
-		}
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/ProductTest.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/ProductTest.java
deleted file mode 100644
index 98dbe72..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/branding/ProductTest.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.branding;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.internal.configurator.branding.*;
-import org.eclipse.update.tests.*;
-
-public class ProductTest extends UpdateManagerTestCase {
-
-	public ProductTest(String testcase){
-		super(testcase);
-	}
-
-	public void testMain() throws Exception {
-		
-		IProduct product = Platform.getProduct();
-		if (product == null)
-			System.out.println("No product defined");
-		else
-			System.out.println("Product is: \n" +
-					"name=" + product.getName() + "\n" +
-					"application=" + product.getApplication() + "\n" +
-					"description=" + product.getDescription() + "\n" +
-					"id="+ product.getId() + "\n" +
-					"about_text:"+product.getProperty(IProductConstants.ABOUT_TEXT) +"\n" +
-					"about_image:"+product.getProperty(IProductConstants.ABOUT_IMAGE) +"\n" +
-					"app_name:"+product.getProperty(IProductConstants.APP_NAME) +"\n" +
-					"window_image:"+product.getProperty(IProductConstants.WINDOW_IMAGE) +"\n" +
-					"window_images:"+product.getProperty(IProductConstants.WINDOW_IMAGES) );
-				
-	}
-}

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 1c6fbda..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 0e70ff9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.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.update.tests.configurations;

-import java.io.File;

-

-

-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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE,null);

-		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(null),oldConfigSite);	

-		oldConfigSite.install(featureRef.getFeature(null),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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().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 14a543f..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
+++ /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

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

-package org.eclipse.update.tests.configurations;

-import java.io.File;

-import java.net.URL;

-

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

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

-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(siteLocal.getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE,null);

-		IFeatureReference featureRef = remoteSite.getFeatureReferences()[0];

-		IFeatureReference featureRef2 = remoteSite.getFeatureReferences()[1];

-		IFeature feature = featureRef.getFeature(null);

-		

-		// 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(null));

-

-		// install another feature

-		IFeature feature2 = featureRef2.getFeature(null);

-		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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().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(siteLocal.getLocationURL().getFile());;

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().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 4e16407..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 junit.framework.Assert;

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

-import org.eclipse.update.configurator.IPlatformConfiguration.*;

-

-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 = ConfiguratorUtils.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,0);

-		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 = ConfiguratorUtils.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+ "platform.xml");

-		} 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 {

-			ConfiguratorUtils.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 = ConfiguratorUtils.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 1ca0b01..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.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.core.boot;

-

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

-

-

-public class TestPlatCfgDefault

-	extends PlatformConfigurationTestCase {

-		

-	public TestPlatCfgDefault(String arg0) {

-		super(arg0);

-	}

-	

-	public void testInitial() throws Exception {

-		IPlatformConfiguration cfig = null;

-		cfig = ConfiguratorUtils.getCurrentPlatformConfiguration();

-		IPlatformConfiguration.ISiteEntry se = cfig.getConfiguredSites()[0];

-		IPlatformConfiguration.ISitePolicy sp = cfig.createSitePolicy(IPlatformConfiguration.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 5359b23..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
+++ /dev/null

@@ -1,266 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.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;

-	}

-

-

-	public IConfiguredSite getCurrentConfiguredSite() {

-		return null;

-	}

-

-	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 1a79b19..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.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.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 {

-				if (siteStream != null)

-					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/mirror/AllMirrorTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/AllMirrorTests.java
deleted file mode 100644
index d699186..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/AllMirrorTests.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.mirror;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class AllMirrorTests extends UpdateManagerTestCase {
-	
-	public AllMirrorTests(String name){
-		super(name);
-	}
-	
-	public static Test suite(){
-		TestSuite suite = new TestSuite();
-		suite.setName("Mirror Tests");
-		
-		// the following will take all the test methods in the class that starts with "test"
-		
-		suite.addTest(new TestSuite(TestRemoteFeatureVersionMirror.class));
-		suite.addTest(new TestSuite(TestRemoteEmbeddedFeatureMirror.class));
-		suite.addTest(new TestSuite(TestRemoteDoubleEmbeddedFeatureMirror.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/mirror/MirrorManagerTestCase.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/MirrorManagerTestCase.java
deleted file mode 100644
index 0d9fb98..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/MirrorManagerTestCase.java
+++ /dev/null

@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.mirror;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.internal.core.UpdateCore;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-public class MirrorManagerTestCase extends UpdateManagerTestCase{
-	public static int exitValue=-1;
-	public static StringBuffer errOutput;
-	
-	public MirrorManagerTestCase(String arg0){
-		super(arg0);
-	}
-	
-	//WatchDog thread to kill mirroring process if it hangs (or takes too long)
-	public static class Timer extends Thread{
-		private Process proc;
-		
-		public Timer(Process proc){
-			super();
-			this.setDaemon(true);
-			this.proc = proc;
-		}
-		
-		public void run(){
-			try {
-				// Note: normal test on 2.2Ghz P4 is 2.9s 
-				//:. giving 100x leeway to complete process before killing it
-				sleep(300000); 
-				proc.destroy();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	// structure to hold category definition names and descriptions
-	class CategoryDefinition {
-		private String name;
-		private String desc;
-		public void setName(String name) {
-			this.name = name;
-		}
-		public void setDesc(String desc) {
-			this.desc = desc;
-		}
-		public String getName() {
-			return name;
-		}
-		public String getDesc() {
-			return desc;
-		}
-	}
-	
-	// structure to hold feature IDs and their category names
-	public class FeatureCategory{
-		private String featureId;
-		private ArrayList category;
-		
-		public FeatureCategory(){
-			category = new ArrayList();
-		}
-		
-		public void setFeatureID(String fid){
-			featureId = fid;
-		}
-		
-		public void addCategory(String cat){
-			category.add(cat);
-		}
-		
-		public String getFeatureID(){
-			return featureId;
-		}
-		
-		public String[] getCategories(){
-			return (String[])category.toArray(new String[category.size()]);
-		}
-	}
-	
-	// StreamConsumer to display output to output files or console
-	public static class StreamConsumer extends Thread {
-		private BufferedReader bReader;
-
-		public StreamConsumer(InputStream inputStream) {
-			super();
-			setDaemon(true);
-			bReader = new BufferedReader(new InputStreamReader(inputStream));
-		}
-
-		public void run() {
-			try {
-				String line;
-				while (null != (line = bReader.readLine())) {
-					System.out.println(line);
-					errOutput.append(line);
-					errOutput.append("\n");
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	/**
-	 * Returns a string array consisting of commands and their arguments to
-	 * be run.
-	 * @param remoteLoc - path of remote site (site being mirrored)
-	 * @param toLocalSiteUrl - path of local site (new mirror site)
-	 * @param fid - feature id of featuring being mirror (optional - can be null)
-	 * @param ver - version of feature to be mirrored (optional - can be null)
-	 * @param mirUrl - directory location of policy.xml (optional - can be mull)
-	 * @return
-	 */
-	public String[] getCommand(
-		String remoteLoc,
-		String toLocalSiteUrl,
-		String fid,
-		String ver,
-		String mirUrl) {
-		final String classpath = "startup.jar";
-		final String launcher = "org.eclipse.core.launcher.Main";
-		final String command = "mirror";
-		final String application = "org.eclipse.update.core.standaloneUpdate";
-		final String FLAG_CP = "-cp";
-		final String FLAG_APP = "-application";
-		final String FLAG_CMD = "-command";
-		final String FLAG_FID = "-featureId";
-		final String FLAG_DATA = "-data";
-		final String FLAG_VERSION = "-version";
-		final String FLAG_FROM = "-from";
-		final String FLAG_TO = "-to";
-		final String FLAG_URL = "-mirrorURL";
-		final String FLAG_SPLASH = "-nosplash";
-		final String FLAG_CONSOLELOG = "-consolelog";
-		final String data =
-			UpdateCore.getPlugin().getStateLocation().toOSString();
-		String[] cmd =
-			new String[] {
-				getJavaVMPath(),
-				FLAG_CP,
-				classpath,
-				launcher,
-				FLAG_APP,
-				application,
-				FLAG_CMD,
-				command,
-				FLAG_FROM,
-				(remoteLoc !=null ? remoteLoc : ""),
-				FLAG_TO,
-				toLocalSiteUrl,
-				(fid != null ? FLAG_FID : ""),
-				(fid != null ? fid : ""),
-				(ver != null ? FLAG_VERSION : ""),
-				(ver != null ? ver : ""),
-				(mirUrl != null ? FLAG_URL : ""),
-				(mirUrl != null ? mirUrl : ""),
-				FLAG_SPLASH,
-				FLAG_DATA,
-				data,
-				FLAG_CONSOLELOG};
-		return cmd;
-	}
-	
-	public boolean checkFeatureInSiteXMLExists(String url, String fid, String ver){
-		File site = new File(url + "/site.xml");
-		assertTrue(site.exists());
-		BufferedReader breader;
-		FileReader freader;
-		String text = new String();
-		String jarName = fid + "_" + ver + ".jar";
-		String feature = "<feature url=\"" +
-			"features/" + jarName + 
-			"\" id=\"" + fid + 
-			"\" version=\"" + ver+"\">";
-		try {
-			freader = new FileReader(site);
-			breader = new BufferedReader(freader);
-		} catch (FileNotFoundException e) {
-			// would have been caught by assert above
-			return false;
-		}
-		try {
-			while ((text = breader.readLine()) != null) {
-				text = text.trim();
-				if (text.equals(feature)){
-					breader.close();
-					freader.close();
-					return true;
-				}
-			}
-
-			breader.close();
-			freader.close();
-			return false;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	public void checkSiteXML(String url) throws Exception {
-		File mirror = new File(url);
-		File site = new File(url + "/site.xml");
-		assertTrue(mirror.isDirectory());
-		assertTrue(mirror.exists());
-		assertTrue(site.exists());
-	}
-
-	public void checkPolicyXML(String url) throws Exception {
-		File mirror = new File(url);
-		File site = new File(url + "/policy.xml");
-		assertTrue(mirror.isDirectory());
-		assertTrue(mirror.exists());
-		assertTrue(site.exists());
-	}
-	public boolean checkPolicyURL(String url, String mirrorUrl){
-		File site = new File(url + "/policy.xml");
-		assertTrue(site.exists());
-		BufferedReader breader;
-		FileReader freader;
-		String text = new String();
-
-		try {
-			freader = new FileReader(site);
-			breader = new BufferedReader(freader);
-		} catch (FileNotFoundException e) {
-			// would have been caught by assert above
-			return false;
-		}
-
-		try {
-			while ((text = breader.readLine()) != null) {
-				if (text.indexOf(mirrorUrl)!=-1){
-					breader.close();
-					freader.close();	
-					return true;
-				}
-			}
-
-			breader.close();
-			freader.close();
-			return false;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	public boolean doesCategoryDefinitionExist(String url) {
-		File site = new File(url + "/site.xml");
-		assertTrue(site.exists());
-		BufferedReader breader;
-		FileReader freader;
-		String text = new String();
-
-		try {
-			freader = new FileReader(site);
-			breader = new BufferedReader(freader);
-		} catch (FileNotFoundException e) {
-			// would have been caught by assert above
-			return false;
-		}
-
-		try {
-			while ((text = breader.readLine()) != null) {
-				if (text.indexOf("category-def")!=-1)
-					return true;
-			}
-
-			breader.close();
-			freader.close();
-			return false;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		}
-
-	}
-	
-	public String getEclipseRoot() {
-		return ConfiguratorUtils.getInstallURL().toExternalForm().replaceFirst(
-			"file:",
-			"");
-	}
-	
-	public FeatureCategory[] getFeatureCategories(String url){
-		File site = new File(url + "/site.xml");
-		assertTrue(site.exists());
-		BufferedReader breader;
-		FileReader freader;
-		String text = new String();
-		ArrayList featureCategories = new ArrayList();
-		
-		try {
-			freader = new FileReader(site);
-			breader = new BufferedReader(freader);
-		} catch (FileNotFoundException e) {
-			// would have been caught by assert above
-			return new FeatureCategory[0];
-		}
-
-		try {
-			FeatureCategory currTok = new FeatureCategory();
-			boolean add = false;
-			while((text =breader.readLine())!=null){
-				StringTokenizer strTok = new StringTokenizer(text);
-				while (strTok.hasMoreTokens()){
-					String temp = strTok.nextToken();
-					if (temp.equals("</feature>")){
-						add = true;
-					} else if (temp.startsWith("id")){
-						currTok.setFeatureID(temp.split("\"")[1]);
-					} else if (temp.startsWith("name")){
-						currTok.addCategory(temp.split("\"")[1]);
-					}
-				}
-				if (add){
-					featureCategories.add(currTok);
-					currTok = new FeatureCategory();
-					add = false;
-				}
-			}
-
-			breader.close();
-			freader.close();
-			return (FeatureCategory[])featureCategories.toArray(new FeatureCategory[featureCategories.size()]);
-		} catch (IOException e) {
-			System.err.println(e);
-			return new FeatureCategory[0];
-		}
-	}
-	
-	public String getJavaVMPath() {
-		// Create command string for launching the process
-		String vm = System.getProperty("java.vm.name");
-		String executable = "J9".equals(vm) ? "j9" : "java";
-		if (org.eclipse.osgi.service.environment.Constants.OS_WIN32.equals(Platform.getOS()))
-			executable += "w.exe";
-
-		String javaInstallDir =
-			System.getProperty("java.home") + File.separator + "bin";
-		return javaInstallDir + File.separator + executable;
-	}
-	
-	public CategoryDefinition[] getCategoryDefinitions(String url) {
-		File site = new File(url + "/site.xml");
-		assertTrue(site.exists());
-		BufferedReader breader;
-		FileReader freader;
-		String text = new String();
-		ArrayList catDef = new ArrayList();
-
-		try {
-			freader = new FileReader(site);
-			breader = new BufferedReader(freader);
-		} catch (FileNotFoundException e) {
-			// would have been caught by assert above
-			return new CategoryDefinition[0];
-		}
-
-		try {
-			boolean add = false;
-			boolean isDesc = false;
-			CategoryDefinition temp = new CategoryDefinition();
-			while ((text = breader.readLine()) != null) {
-				if (text.trim().startsWith("<category-def")
-					&& text.indexOf("name") != -1) {
-					temp.setName(text.split("\"")[1]);
-					add = false;
-				} else if (text.trim().equals("<description>")) {
-					isDesc = true;
-				} else if (text.trim().equals("</description>")) {
-					isDesc = false;
-				} else if (isDesc) {
-					temp.setDesc(text.trim());
-				} else if (text.trim().equals("</category-def>")) {
-					add = true;
-				}
-				if (add) {
-					catDef.add(temp);
-					add = false;
-					temp = new CategoryDefinition();
-				}
-			}
-
-			breader.close();
-			freader.close();
-			return (CategoryDefinition[])catDef.toArray(new CategoryDefinition[catDef.size()]);
-		} catch (IOException e) {
-			System.err.println(e);
-			return new CategoryDefinition[0];
-		}
-
-	}
-	
-	public int performMirror(String[] cmd_mirror) {
-		File file = new File(getEclipseRoot());
-		try {
-			System.out.println("Launching:");
-			for(int i=0; i<cmd_mirror.length; i++){
-				System.out.print(cmd_mirror[i]+" ");
-			}
-			System.out.println();
-			Process proc =
-				Runtime.getRuntime().exec(cmd_mirror, (String[]) null, file);
-
-			StreamConsumer outputs = new StreamConsumer(proc.getInputStream());
-			outputs.start();
-			StreamConsumer errors = new StreamConsumer(proc.getErrorStream());
-			errors.start();
-			Timer timer = new Timer(proc);
-			timer.start();
-
-			return proc.waitFor();
-		} catch (IOException e) {
-			System.err.println(e);
-		} catch (InterruptedException e) {
-			System.err.println(e);
-		} catch (Exception e) {
-			System.err.println(e);
-		}
-		return -1;
-	}
-
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		assertEquals(exitValue, 0);
-	}
-	
-	// ensure output string buffer ends with "Mirror command completed
-	// successfully."
-	// note: output may instead by "Command completed successfully."
-	public void testMirrorSuccess() throws Exception {
-		StringTokenizer tokenizer =
-			new StringTokenizer(
-				errOutput.toString(),
-				"\n");
-		String lastLine = new String();
-		while (tokenizer.hasMoreTokens()){
-			lastLine = tokenizer.nextToken();
-		}
-		assertTrue(
-			lastLine.equals("Mirror command completed successfully.")
-				|| lastLine.equals("Command completed successfully."));
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteDoubleEmbeddedFeatureMirror.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteDoubleEmbeddedFeatureMirror.java
deleted file mode 100644
index e4cad27..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteDoubleEmbeddedFeatureMirror.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.tests.mirror;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.update.tests.UpdateTestsPlugin;
-
-public class TestRemoteDoubleEmbeddedFeatureMirror extends MirrorManagerTestCase {
-	private static boolean isMirrored;
-
-	public TestRemoteDoubleEmbeddedFeatureMirror(String arg0) {
-		super(arg0);
-		errOutput = new StringBuffer();
-		isMirrored = false;
-	}
-
-	public void umSetUp() {
-		String featureId = "update.feature1c";
-		String version = "3.0.0";
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		String mirrorURL = "http://update.eclipse.org/my-mirror-url";
-		// first mirror
-		String fromRemoteSiteUrl =
-			"file:"
-				+ dataPath
-				+ "mirrors/update-site1";
-		if (!isMirrored) {
-			exitValue =
-				performMirror(
-					getCommand(fromRemoteSiteUrl,toLocalSiteUrl, null, null, mirrorURL));
-		
-		// end of first mirror
-		fromRemoteSiteUrl =
-			"file:"
-			+ dataPath
-			+ "mirrors/update-site5";
-			exitValue =
-				performMirror(
-					getCommand(fromRemoteSiteUrl,toLocalSiteUrl, featureId, version, mirrorURL));
-			isMirrored = true;
-		}
-	}
-
-	// make sure each feature is under its correct category names
-	public void testFeatureCategories() throws Exception{
-		String fromRemoteSiteUrl =
-		        dataPath
-				+ "mirrors/update-site5";
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		FeatureCategory[] mirrorFeatures = getFeatureCategories(toLocalSiteUrl);
-		FeatureCategory[] required = new FeatureCategory[1];
-		required[0] = new FeatureCategory();
-		required[0].setFeatureID("update.feature1c");
-		required[0].addCategory("Site5-Category1");
-		assertTrue(checkFeatureCategoriesContained(required, mirrorFeatures));
-	}
-	
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		super.testExitValue();
-	}
-	
-	// ensure category definitions exist
-	public void testCategoryDefinitionsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		assertTrue(doesCategoryDefinitionExist(toLocalSiteUrl));
-	}
-
-	// ensure feature exists per site.xml
-	public void testFeatureInSiteXMLExists() {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		String featureId = "update.feature1c";
-		String version = "3.0.0";
-		assertTrue(
-			checkFeatureInSiteXMLExists(toLocalSiteUrl, featureId, version));
-	}
-
-	// ensure site.xml is generated
-	public void testSiteXMLExists() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		checkSiteXML(toLocalSiteUrl);
-	}
-
-	// ensure policy.xml is generated
-	public void testPolicyXMLExists() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		checkPolicyXML(toLocalSiteUrl);
-	}
-
-	// ensure policy.xml references the correct mirrorURL
-	public void testPolicyURL() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		String mirrorURL = "http://update.eclipse.org/my-mirror-url";
-		assertTrue(checkPolicyURL(toLocalSiteUrl, mirrorURL));
-	}
-
-	// ensure all jars in features directory mirrored
-	public void testAllFeatureJarsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		String[] featureJars = { "update.feature1b_2.0.0.jar" };
-		assertTrue(checkAllFeatureJars(toLocalSiteUrl, featureJars));
-	}
-
-	// ensure all jars in plugins directory mirrored
-	public void testAllPluginJarsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteDoubleEmbeddedFeatureMirror";
-		String[] pluginJars =
-			{ "com.plugin1_1.0.0.jar", "com.plugin1a_1.0.1.jar" };
-		assertTrue(checkAllPluginJars(toLocalSiteUrl, pluginJars));
-	}
-
-	// ensure output string buffer ends with "Mirror command completed
-	// successfully."
-	// note: output may instead by "Command completed successfully."
-	public void testMirrorSuccess() throws Exception {
-		super.testMirrorSuccess();
-	}
-	
-	public boolean checkAllFeatureJars(String url, String[] jarNames) {
-		File featuresDir = new File(url + "/features");
-		assertTrue(featuresDir.exists());
-		assertTrue(featuresDir.isDirectory());
-		String[] list = featuresDir.list();
-
-		ArrayList ls = new ArrayList();
-		for (int i = 0; i < list.length; i++) {
-			ls.add(list[i]);
-		}
-
-		for (int j = 0; j < jarNames.length; j++) {
-			assertTrue(ls.contains(jarNames[j]));
-		}
-		return true;
-	}
-
-	public boolean checkAllPluginJars(String url, String[] jarNames) {
-		File pluginsDir = new File(url + "/plugins");
-		assertTrue(pluginsDir.exists());
-		assertTrue(pluginsDir.isDirectory());
-		String[] list = pluginsDir.list();
-
-		ArrayList ls = new ArrayList();
-		for (int i = 0; i < list.length; i++) {
-			ls.add(list[i]);
-		}
-
-		for (int j = 0; j < jarNames.length; j++) {
-			assertTrue(ls.contains(jarNames[j]));
-		}
-		return true;
-	}
-
-	public boolean checkFeatureCategoriesContained(FeatureCategory[] required,FeatureCategory[] localDefs){
-		boolean hasMatch;
-		for (int i = 0 ; i<required.length; i++){
-			hasMatch = false;
-			for (int j = 0; j<localDefs.length; j++){
-				if (localDefs[j].getFeatureID().equals(required[i].getFeatureID()) &&
-					checkCategoriesMatch(localDefs[j].getCategories(), required[i].getCategories())){
-						hasMatch = true;
-						j=localDefs.length;
-				}
-			}
-			if (!hasMatch)
-				return false;
-		}
-		return true;
-	}
-	
-	public boolean checkCategoriesMatch(String[] localCat, String[] remoteCat){
-		boolean hasMatch;
-		for (int i = 0; i<localCat.length; i++){
-			hasMatch = false;
-			for (int j = 0; j<remoteCat.length; i++){
-				if (localCat[i].equals(remoteCat[j])){
-					hasMatch = true;
-					j=remoteCat.length;
-				}
-			}
-			if(!hasMatch)
-				return false;
-		}
-		return true;
-	}
-
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteEmbeddedFeatureMirror.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteEmbeddedFeatureMirror.java
deleted file mode 100644
index 86ea260..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteEmbeddedFeatureMirror.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.update.tests.mirror;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.update.tests.UpdateTestsPlugin;
-
-public class TestRemoteEmbeddedFeatureMirror extends MirrorManagerTestCase {
-	private static boolean isMirrored;
-
-	public TestRemoteEmbeddedFeatureMirror(String arg0) {
-		super(arg0);
-		errOutput = new StringBuffer();
-		isMirrored = false;
-	}
-
-	public void umSetUp() {
-		String featureId = "update.feature1c";
-		String version = "3.0.0";
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		String mirrorURL = "http://update.eclipse.org/my-mirror-url";
-		String fromRemoteSiteUrl =
-				"file:"
-				+ dataPath
-				+ "mirrors/update-site4";
-		if (!isMirrored) {
-			exitValue =
-				performMirror(
-					getCommand(fromRemoteSiteUrl,toLocalSiteUrl, featureId, version, mirrorURL));
-			isMirrored = true;
-		}
-	}
-
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		super.testExitValue();
-	}
-
-	// ensure all category definitions exist
-	public void testCategoryDefinitionsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		assertTrue(doesCategoryDefinitionExist(toLocalSiteUrl));
-	}
-
-	public void testFeatureInSiteXMLExists() {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		String featureId = "update.feature1c";
-		String version = "3.0.0";
-		assertTrue(
-			checkFeatureInSiteXMLExists(toLocalSiteUrl, featureId, version));
-	}
-
-	// ensure site.xml is generated
-	public void testSiteXMLExists() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		checkSiteXML(toLocalSiteUrl);
-	}
-
-	// ensure policy.xml is generated
-	public void testPolicyXMLExists() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		checkPolicyXML(toLocalSiteUrl);
-	}
-
-	// ensure policy.xml uses the correct mirrorURL
-	public void testPolicyURL() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		String mirrorURL = "http://update.eclipse.org/my-mirror-url";
-		assertTrue(checkPolicyURL(toLocalSiteUrl, mirrorURL));
-	}
-
-	// ensure all jars in features directory mirrored
-	public void testAllFeatureJarsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		String[] featureJars = { "update.feature1_1.0.0.jar", "update.feature1_1.0.1.jar", "update.feature1b_2.0.0.jar", "update.feature1c_3.0.0.jar" };
-		assertTrue(checkAllFeatureJars(toLocalSiteUrl, featureJars));
-	}
-
-	// ensure all jars in plugins directory mirrored
-	public void testAllPluginJarsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		String[] pluginJars =
-			{ "com.plugin1_1.0.0.jar", "com.plugin1a_1.0.1.jar" };
-		assertTrue(checkAllPluginJars(toLocalSiteUrl, pluginJars));
-	}
-
-	// ensure output string buffer ends with "Mirror command completed
-	// successfully."
-	// note: output may instead by "Command completed successfully."
-	public void testMirrorSuccess() throws Exception {
-		super.testMirrorSuccess();
-	}
-
-	public boolean checkAllFeatureJars(String url, String[] jarNames) {
-		File featuresDir = new File(url + "/features");
-		assertTrue(featuresDir.exists());
-		assertTrue(featuresDir.isDirectory());
-		String[] list = featuresDir.list();
-
-		ArrayList ls = new ArrayList();
-		for (int i = 0; i < list.length; i++) {
-			ls.add(list[i]);
-		}
-
-		assertEquals(list.length, jarNames.length);
-		for (int j = 0; j < jarNames.length; j++) {
-			assertTrue(ls.contains(jarNames[j]));
-		}
-		return true;
-	}
-
-	public boolean checkAllPluginJars(String url, String[] jarNames) {
-		File pluginsDir = new File(url + "/plugins");
-		assertTrue(pluginsDir.exists());
-		assertTrue(pluginsDir.isDirectory());
-		String[] list = pluginsDir.list();
-
-		ArrayList ls = new ArrayList();
-		for (int i = 0; i < list.length; i++) {
-			ls.add(list[i]);
-		}
-
-		assertEquals(list.length, jarNames.length);
-		for (int j = 0; j < jarNames.length; j++) {
-			assertTrue(ls.contains(jarNames[j]));
-		}
-		return true;
-	}
-
-	public boolean checkCategoryDefinitionsContained(CategoryDefinition[] localDefs, CategoryDefinition[] remoteDefs){
-		boolean hasMatch;
-		for (int i = 0 ; i<localDefs.length; i++){
-			hasMatch = false;
-			for (int j = 0; j<remoteDefs.length; j++){
-				if (localDefs[i].getName().equals(remoteDefs[j].getName())
-						&& localDefs[i].getDesc().equals(remoteDefs[j].getDesc()))
-					hasMatch = true;
-			}
-			if (!hasMatch)
-				return false;
-		}
-		return true;
-	}
-	
-
-
-	// start testing category definitions
-	public void testCategoryDefinitions() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteEmbeddedFeatureMirror";
-		String fromRemoteSiteUrl =
-		        dataPath
-				+ "mirrors/update-site4";
-		CategoryDefinition[] localDefs = getCategoryDefinitions(toLocalSiteUrl);
-		CategoryDefinition[] remoteDefs = getCategoryDefinitions(fromRemoteSiteUrl);
-		assertTrue(checkCategoryDefinitionsContained(localDefs, remoteDefs));
-	}
-
-
-
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteFeatureVersionMirror.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteFeatureVersionMirror.java
deleted file mode 100644
index f3a0b25..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/mirror/TestRemoteFeatureVersionMirror.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.update.tests.mirror;
-
-import java.io.File;
-
-import org.eclipse.update.tests.UpdateTestsPlugin;
-
-public class TestRemoteFeatureVersionMirror extends MirrorManagerTestCase {
-	private static boolean isMirrored;
-	
-	public TestRemoteFeatureVersionMirror(String arg0) {
-		super(arg0);
-		errOutput = new StringBuffer();
-		isMirrored = false;
-	}
-
-	public void umSetUp() {
-		String featureId = "update.feature1";
-		String version = "1.0.0";
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		String mirrorURL = "http://update.eclipse.org/my-mirror-url";
-		String fromRemoteSiteUrl = "file:" + dataPath + "mirrors/update-site1";
-		if (!isMirrored) {
-			exitValue =
-				performMirror(
-					getCommand(fromRemoteSiteUrl,toLocalSiteUrl, featureId, version, mirrorURL));
-			isMirrored = true;
-		}
-	}
-
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		super.testExitValue();
-	}
-
-	// ensure all category definitions exist
-	public void testCategoryDefinitionsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		assertTrue(doesCategoryDefinitionExist(toLocalSiteUrl));
-	}
-
-	// ensure feature exists per site.xml
-	public void testFeatureInSiteXMLExists(){
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		String featureId = "update.feature1";
-		String version = "1.0.0";
-		assertTrue(checkFeatureInSiteXMLExists(toLocalSiteUrl, featureId, version));
-	}
-	
-	// ensure site.xml is generated
-	public void testSiteXMLExists() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		checkSiteXML(toLocalSiteUrl);
-	}
-
-	// ensure policy.xml is generated
-	public void testPolicyXMLExists() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		checkPolicyXML(toLocalSiteUrl);
-	}
-	
-	// ensure policy.xml uses the correct mirrorURL
-	public void testPolicyURL() throws Exception{
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		String mirrorURL = "http://update.eclipse.org/my-mirror-url";
-		assertTrue(checkPolicyURL(toLocalSiteUrl, mirrorURL));
-	}
-
-	// ensure all jars for features and plugins mirrored
-	public void testAllJarsExist() throws Exception {
-		String toLocalSiteUrl =
-			UpdateTestsPlugin.getPlugin().getStateLocation()
-				+ "/temp/testRemoteFeatureVersionMirror";
-		String featureId = "update.feature1";
-		String version = "1.0.0";
-		String jarName = featureId + "_" + version + ".jar";
-		File file = new File(toLocalSiteUrl + "/features/" + jarName);
-		assertTrue(file.exists());
-	}
-
-	// ensure output string buffer ends with "Mirror command completed
-	// successfully."
-	// note: output may instead by "Command completed successfully."
-	public void testMirrorSuccess() throws Exception {
-		super.testMirrorSuccess();
-	}
-
-}

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 4bdd470..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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;

-		

-		System.out.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";

-		System.out.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));

-	}

-	

-//	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 dc20265..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 {

-		

-		StringWriter strWriter=new StringWriter();

-		PrintWriter w = new PrintWriter(strWriter);

-

-		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 {

-			System.out.println(strWriter);

-			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 baa9ac0..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.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.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 {
-		
-		//cleanup target 
-		File target = new File(TARGET_FILE_SITE.getFile());
-		UpdateManagerUtils.removeFromFileSystem(target);		
-		InstallRegistry.cleanup();
-		
-
-		ISite remoteSite =
-			SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/site.xml"),null);
-		IFeature remoteFeature = remoteSite.getFeatureReferences()[0].getFeature(null);
-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);
-		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[i].getVersionedIdentifier().toString();
-			pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-			InstallRegistry.unregisterPlugin(entries[i]);
-		}
-		UpdateManagerUtils.removeFromFileSystem(featureFile);
-
-		// verify child Feature
-		IFeature childFeature =
-			remoteFeature.getIncludedFeatureReferences()[0].getFeature(null);
-		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()));
-		InstallRegistry.cleanup();
-	}
-
-	/**
-	 * 
-	 */
-	public void testHTTPSite() throws Exception {
-
-		ISite remoteSite =
-			SiteManager.getSite(new URL(SOURCE_HTTP_SITE, "nestedFeatureSiteTest/"),null);
-		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(null);
-				break;
-			}
-		}
-
-		assertNotNull("Cannot find rootfeature.jar on site", remoteFeature);
-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);
-		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[i].getVersionedIdentifier().toString();
-			pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-			InstallRegistry.unregisterPlugin(entries[i]);
-		}
-		UpdateManagerUtils.removeFromFileSystem(featureFile);
-
-		// verify child Feature
-		IFeature childFeature =
-			remoteFeature.getIncludedFeatureReferences()[0].getFeature(null);
-		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(localURL.getFile());
-//		UpdateManagerUtils.removeFromFileSystem(localFile);
-//		InstallRegistry.cleanup();
-//
-//		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,null);
-//		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(null);
-//				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 7d43cbf..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,null);

-

-		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,null);

-

-		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,null);

-

-		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 9422ee6..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, null);

-		URL url = UpdateManagerUtils.getURL(remoteSite.getURL(), xmlFile, null);

-

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(remoteSite);

-		ref.setURL(url);

-		IFeature feature = ref.getFeature(null);

-

-		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 2fc4c88..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,null);

-

-		//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,null);

-

-		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(null);

-		} 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(null);

-		} 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 7efe479..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.*;
-import java.net.*;
-
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.configurator.IPlatformConfiguration;
-import org.eclipse.update.configurator.IPlatformConfiguration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.*;
-
-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
-		IPlatformConfiguration cfig = ConfiguratorUtils.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
-		IPlatformConfiguration cfig = ConfiguratorUtils.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 8d203bc..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,null);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		IFeature remoteFeature = null;

-		

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

-			remoteFeature = featuresRef[i].getFeature(null);

-			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,null);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		IFeature remoteFeature = null;

-		

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

-			remoteFeature = featuresRef[i].getFeature(null);

-			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 7807c10..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
+++ /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

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

-package org.eclipse.update.tests.regularInstall;

-

-import java.io.File;

-import java.util.Locale;

-

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

-import org.eclipse.update.internal.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);		

-		InstallRegistry.cleanup();

-		

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED,null);

-		IFeatureReference[] remoteFeatureReference = remoteSite.getFeatureReferences();

-		IFeature remoteFeature = remoteFeatureReference[0].getFeature(null);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		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);

-		if (Locale.getDefault().toString().indexOf("us") != -1)

-			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 b3c89b5..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,null);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		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(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);

-

-

-	}

-	

-	

-	/**

-	 * 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,null);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		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(null);

-			} 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 6ece689..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,null);

-		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,null);

-		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 64481df..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 java.util.Locale;

-

-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(null);

-	}

-

-	public void testFileSite() throws Exception {

-

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE,null);

-		IFeature remoteFeature = getFeature1(remoteSite);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		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,null);

-		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(null);

-				break;

-			}

-		}

-

-		assertNotNull("Cannot find feature2.jar on site", remoteFeature);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		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...

-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().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,null);

-		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(null);

-				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);

-		if (Locale.getDefault().toString().indexOf("fr") != -1)

-			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);

-		InstallRegistry.unregisterPlugin(entries[0]);

-		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,null);

-		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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-

-		try {

-			SiteManager.getSite(new URL("http://www.eclipse.org/"),null);

-			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 2782bc8..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
+++ /dev/null

@@ -1,332 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.*;

-import java.net.*;

-import java.util.Locale;

-

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

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

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

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

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

-

-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(null);

-	}

-

-	public void testFileSite() throws Exception {

-

-		ISite remoteSite =

-			SiteManager.getSite(new URL(SOURCE_FILE_SITE, Site.SITE_XML),true,null);

-		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,true,null);

-		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()));

-		InstallRegistry.cleanup();

-	}

-

-	/**

-	 * 

-	 */

-	public void testHTTPSite() throws Exception {

-

-		// clean

-		File targetFile  = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(targetFile);

-		InstallRegistry.cleanup();

-

-		ISite remoteSite =

-			SiteManager.getSite(new URL(SOURCE_HTTP_SITE, Site.SITE_XML),true,null);

-		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(null);

-				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,true,null);

-		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()));

-		InstallRegistry.cleanup();

-	}

-

-	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);		

-		/*

-		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,true,null);

-		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(null);

-				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);

-		if (Locale.getDefault().toString().indexOf("fr") != -1)

-			assertTrue("plugin info not installed locally:"+pluginFile, pluginFile.exists());

-

-		File featureFile =

-			new File(

-				sitePath,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		if (Locale.getDefault().toString().indexOf("fr") != -1 ||

-				Locale.getDefault().toString().indexOf("us") != -1 ||

-				Locale.getDefault().toString().indexOf("de") != -1)

-		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()));

-		InstallRegistry.cleanup();

-		

-		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),true,null);

-//		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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().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 88ce2a3..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
+++ /dev/null

@@ -1,422 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.*;

-import java.net.*;

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

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

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

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

-import org.eclipse.update.internal.model.*;

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

-

-public class TestLocalSite extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestLocalSite(String arg0) {

-		super(arg0);

-	}

-	

-	public void testCreationConfigFile() throws Exception {

-

-		//clean up

-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		InternalSiteManager.localSite=null;	

-

-

-		ILocalSite site = SiteManager.getLocalSite();

-		site.save();

-		assertTrue("config file hasn't been saved in :"+localFile.getAbsolutePath(), localFile.exists());

-		

-		// cleanup

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		

-

-	}

-	

-	public void testDefaultConfigFile() throws Exception {

-

-		//clean up

-

-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		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	

-		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

-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED,null);

-		IFeature feature = remoteSite.getFeatureReferences()[0].getFeature(null);

-		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,"platform.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(null);			

-			if ("org.eclipse.update.core.tests.feature3_1.0.0".equals(feature3.getVersionedIdentifier().toString())){

-				feature2 = feature3;

-				break;

-			}		

-		}

-		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(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().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(file);		

-	}

-

-	public void testRetriveConfigHTTPInstall() throws Exception {

-

-		//clean up

-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE,null);

-		IFeature feature = remoteSite.getFeatureReferences()[0].getFeature(null);

-		

-		// 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(null);

-		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,"platform.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; !found && i < refs.length; i++) {

-			IFeature feature3 = refs[i].getFeature(null);			

-			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(location.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(file);		

-		localFile = new File(feature2.getURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-	}

-	

-//TODO uncomment this once site disabling is supported

-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(null);

-		

-	// 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(null);

-	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(location.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; !found && i < refs.length; i++) {

-		IFeature feature3 = refs[i].getFeature(null);			

-		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(null);			

-		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 5e6e4a9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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,true,null);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		File file = new File(testURL.getFile());

-		if (!file.exists()) file.mkdirs();

-		ISite localSite = SiteManager.getSite(testURL,true,null);

-		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(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 = 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);

-		InstallRegistry.cleanup();

-		

-		String path = bundle.getString("HTTP_PATH_3");

-		ISite remoteSite = SiteManager.getSite(new URL("http",getHttpHost(),getHttpPort(),path),true,null);		

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,true,null);

-		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(null);

-			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);

-		InstallRegistry.cleanup();

-

-	}

-		

-		

-}


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 18eb120..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(null);

-	}

-

-	public void testRemoveFeature() throws Exception {

-

-		// install feature

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE,null);

-		IFeature remoteFeature = getFeature1(remoteSite);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE,null);

-		IFeatureReference ref = localSite.install(remoteFeature, null, null);

-

-		// then remove it

-		assertNotNull("Feature is null",ref.getFeature(null));

-		String featureRef = ref.getFeature(null).getVersionedIdentifier().toString();

-		localSite.remove(ref.getFeature(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 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 645a27a..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.*;
-import java.net.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.configurator.IPlatformConfiguration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.tests.*;
-
-public class TestSiteValidation extends UpdateManagerTestCase {
-
-
-	/**
-	 * Constructor 
-	 */
-	public TestSiteValidation(String arg0) {
-		super(arg0);
-	}
-
-	private void removeConfigSite(URL url) throws Exception {
-		// get new config object
-		IPlatformConfiguration cfig = ConfiguratorUtils.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/eclipse");
-		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/eclipse/");
-		File file = new File(remoteUrl.getFile());
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		IConfiguredSite configuredSite;
-		try {
-		 configuredSite = currentConfig.createConfiguredSite(file);
-		} catch (CoreException e){
-			return;
-		}
-		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/eclipse/");
-		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/eclipse/");
-		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();
-		IPlatformConfiguration cfig = ConfiguratorUtils.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/eclipse/");
-		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/standalone/AllStandaloneTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/AllStandaloneTests.java
deleted file mode 100644
index ed89309..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/AllStandaloneTests.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.update.tests.standalone;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-public class AllStandaloneTests extends UpdateManagerTestCase{
-
-	public AllStandaloneTests(String name){
-		super(name);
-	}
-	
-	public static Test suite(){
-		TestSuite suite = new TestSuite();
-		suite.setName("Standalone Tests");
-		
-		// the following will take all the test methods in 
-		// the class that start with "test"
-		suite.addTest(new TestSuite(TestFeatureInstall.class));
-		suite.addTest(new TestSuite(TestFeatureUpdate.class));
-		suite.addTest(new TestSuite(TestFeatureEnable.class));
-		suite.addTest(new TestSuite(TestFeatureDisable.class));
-		suite.addTest(new TestSuite(TestFeatureUninstall.class));
-		suite.addTest(new TestSuite(TestBundlesInstall.class));
-		//and this one's for fun :)
-//		suite.addTest(new TestSuite(TestSiteSearch.class));
-		
-		return suite;
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/StandaloneManagerTestCase.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/StandaloneManagerTestCase.java
deleted file mode 100644
index 36204e2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/StandaloneManagerTestCase.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.update.tests.standalone;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.*;
-
-public class StandaloneManagerTestCase extends UpdateManagerTestCase {
-	public static StringBuffer errOutput;
-	public static Integer exitValue= new Integer(-1);
-	public static URL TARGET_FILE_SITE;
-	private boolean oldCache = false;
-	
-	static {
-		File targetDir = new File(System.getProperty("java.io.tmpdir"));
-		targetDir = new File(targetDir, "standalone");
-		targetDir = new File(targetDir, "mytarget");
-		if (targetDir.exists())
-			deleteDirectory(targetDir);
-		try {
-			TARGET_FILE_SITE = targetDir.toURL();
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public StandaloneManagerTestCase (String arg0){
-		super(arg0);
-	}
-	
-	/**
-	 * Sets up the fixture, for example, open a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected void umSetUp() {
-		// setup cache site to true
-		oldCache = InternalSiteManager.globalUseCache;
-		InternalSiteManager.globalUseCache = true;
-	}
-	
-	/**
-	 * Tears down the fixture, for example, close a network connection.
-	 * This method is called after a test is executed.
-	 */
-	protected void umTearDown() {
-		// do nothing.
-		InternalSiteManager.globalUseCache = oldCache;
-	}
-	
-	public void checkConfiguredSites(){
-		ILocalSite localSite;
-		System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
-		try {
-			localSite = SiteManager.getLocalSite();
-			System.out.println("LocalSite: " + localSite.getCurrentConfiguration().getLabel());
-		
-		//Get site to install to
-		IInstallConfiguration currentConfig = localSite.getCurrentConfiguration();
-		IConfiguredSite[] sites = currentConfig.getConfiguredSites();
-//	
-//			// start of config site print
-		System.out.println("GETTING CONFIGURED SITES...");
-		for (int i = 0; i<sites.length; i++){
-			System.out.println("site #" + i + ": " + sites[i].getSite().getURL().getFile());
-		}
-		System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
-		} catch (CoreException e) {
-			System.err.println(e);
-		}
-	}
-	
-	// get the first configured site found because this is the one we're most likely to 
-	// have installed into
-	public ISite getConfiguredSite(URL target){
-		try {
-			ILocalSite local = SiteManager.getLocalSite();
-			IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-			IConfiguredSite[] sites = currentConfig.getConfiguredSites();
-			System.out.println("\nretrieving configured sites...");
-			String targetFile = new File(target.getFile()).getAbsolutePath();
-			for (int i = 0; i<sites.length ; i++){
-				System.out.println("site["+i+"]: " + sites[i].getSite().getURL());
-				String siteFile = new File(sites[i].getSite().getURL().getFile()).getAbsolutePath();
-				if (targetFile.equals(siteFile))
-					return sites[i].getSite();
-			}
-			if (sites.length == 0)
-				return null;
-			return sites[0].getSite();
-		} catch (CoreException e) {
-			System.err.println(e);
-			return null;
-		}
-	}
-	//WatchDog thread to kill mirroring process if it hangs (or takes too long)
-	public static class Timer extends Thread{
-		private Process proc;
-		
-		public Timer(Process proc){
-			super();
-			this.setDaemon(true);
-			this.proc = proc;
-		}
-		
-		public void run(){
-			try {
-				// sleep time 5min
-				sleep(300000); 
-				System.out.println("destroying process");
-				proc.destroy();
-			} catch (Exception e) {
-				System.err.println(e);
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	// StreamConsumer to display output to output files or console
-	public static class StreamConsumer extends Thread {
-		private BufferedReader bReader;
-
-		public StreamConsumer(InputStream inputStream) {
-			super();
-			setDaemon(true);
-			bReader = new BufferedReader(new InputStreamReader(inputStream));
-			errOutput = new StringBuffer();
-		}
-
-		public void run() {
-			try {
-				String line;
-				while (null != (line = bReader.readLine())) {
-					System.err.println(line);
-					errOutput.append(line);
-					errOutput.append("\n");
-				}
-			} catch (IOException e) {
-				System.err.println(e);
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	/**
-	 * @param command : command argument to run on site/feature 
-	 * (i.e. 'install', 'enable', 'disable', 'update') *<i>required</i>*
-	 * @param fid : feature id of the feature being installed, enabled, etc.
-	 * (optional - can be null)
-	 * @param ver : version of feature being installed, enabled, etc. (optional - can be null)
-	 * @param config : location of configuration info (i.e. file:D:\temp\.config\)
-	 * @param remoteLoc : remote site url (required for installing/searching from remote site)
-	 * @param localLoc : target site directory (required unless updating/searching)
-	 * @return a string array consisting of commands and their arguments to
-	 * be run
-	 */
-	public String[] getCommand(
-		String command,
-		String fid,
-		String ver,
-		String config,
-		String remoteLoc,
-		String localLoc){
-		final String classpath = "startup.jar";
-		final String launcher = "org.eclipse.core.launcher.Main";
-		final String application = "org.eclipse.update.core.standaloneUpdate";
-		final String FLAG_CP = "-cp";
-		final String FLAG_APP = "-application";
-		final String FLAG_CMD = "-command";
-		final String FLAG_FID = "-featureId";
-		final String FLAG_DATA = "-data";
-		final String FLAG_VERSION = "-version";
-		final String FLAG_FROM = "-from";
-		final String FLAG_TO = "-to";
-		final String FLAG_CONFIG = "-configuration";
-//		final String FLAG_URL = "-mirrorURL";
-		final String FLAG_SPLASH = "-nosplash";
-		final String FLAG_CONSOLELOG = "-consolelog";
-		final String data =
-			UpdateCore.getPlugin().getStateLocation().toOSString();
-		String[] cmd =
-			new String[] {
-				getJavaVMPath(),
-				FLAG_CP,
-				classpath,
-				launcher,
-				FLAG_APP,
-				application,
-				FLAG_CMD,
-				command,
-				(remoteLoc !=null ? FLAG_FROM : ""),
-				(remoteLoc !=null ? remoteLoc : ""),
-				(localLoc !=null ? FLAG_TO : ""),
-				(localLoc !=null ?localLoc.replaceFirst("file:", "") : ""),
-				(fid != null ? FLAG_FID : ""),
-				(fid != null ? fid : ""),
-				(ver != null ? FLAG_VERSION : ""),
-				(ver != null ? ver : ""),
-				(config != null ? FLAG_CONFIG : ""),
-				(config != null ? config : ""),
-				FLAG_SPLASH,
-				FLAG_DATA,
-				data,
-				FLAG_CONSOLELOG};
-		for (int i = 0 ;i<cmd.length; i++){
-			System.out.print(cmd[i] + " ");			
-		}System.out.println();
-		return cmd;
-	}
-	
-	public String getJavaVMPath() {
-		// Create command string for launching the process
-		String vm = System.getProperty("java.vm.name");
-		String executable = "J9".equals(vm) ? "j9" : "java";
-		if (org.eclipse.osgi.service.environment.Constants.OS_WIN32.equals(Platform.getOS()))
-			executable += "w.exe";
-
-		String javaInstallDir =
-			System.getProperty("java.home") + File.separator + "bin";
-		return javaInstallDir + File.separator + executable;
-	}
-	
-	public int performAction(String[] cmd) {
-		File file = new File(getEclipseRoot());
-		try {
-
-			Process proc =
-				Runtime.getRuntime().exec(cmd, (String[]) null, file);
-
-			StreamConsumer outputs = new StreamConsumer(proc.getInputStream());
-			outputs.start();
-			StreamConsumer errors = new StreamConsumer(proc.getErrorStream());
-			errors.start();
-			Timer timer = new Timer(proc);
-			timer.start();
-
-			return proc.waitFor();
-		} catch (IOException e) {
-			System.err.println(e);
-		} catch (InterruptedException e) {
-			System.err.println(e);
-		} catch (Exception e) {
-			System.err.println(e);
-		}
-		return -1;
-	}
-	
-	public String getEclipseRoot() {
-		return ConfiguratorUtils.getInstallURL().toExternalForm().replaceFirst(
-			"file:",
-			"");
-	}
-	
-	public ArrayList getArrayList(String[] list){
-		ArrayList temp = new ArrayList();
-		for(int i = 0; i< list.length; i++){
-			temp.add(list[i]);
-		}
-		return temp;
-	}
-	
-	public File getLatestConfigurationFile(File localFile) {
-
-		try {
-			System.out.println("reading from : " + localFile.getAbsolutePath());
-				FileReader freader = new FileReader(localFile);
-				BufferedReader breader = new BufferedReader(freader);
-				String configFileName="", line;
-				while (breader.ready()) {
-					line = breader.readLine();
-//					System.out.println(line);
-					if (line.trim().startsWith("<config url")) {
-						configFileName = line.split("\"")[1];
-					}
-				}
-				// read config file
-				File parent = new File(localFile.getParent());
-				System.out.println("parent: " + parent.getAbsolutePath());
-				String[] parList = parent.list();
-				int latest = 0; 
-				for (int i = parList.length-1; i>=0; i--){
-					System.out.println("parList[" + i + "]: " + parList[i]);
-					if (parList[i].startsWith("platform")){
-						latest = i;
-						break;
-					}
-				}
-				File configFile = new File(parent.getAbsolutePath() + File.separator + parList[latest]);
-				return configFile;
-				// end of config file read
-		} catch (Exception e) {
-			System.err.println(e);
-			e.printStackTrace();
-		}
-		return localFile;
-	}
-	
-	private static 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/standalone/TestBundlesInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestBundlesInstall.java
deleted file mode 100644
index fe2ab90..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestBundlesInstall.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.update.tests.standalone;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.standalone.*;
-
-
-public class TestBundlesInstall extends StandaloneManagerTestCase {
-	private static boolean isInstalled;
-
-	public TestBundlesInstall(String arg0) {
-		super(arg0);
-		isInstalled = false;
-	}
-
-	public void umSetUp() {
-		super.umSetUp();
-		//System.out.println("looking at configured sites available....");
-		//checkConfiguredSites();
-		
-		String featureId = "com.example.bundle.feature";
-		String version = "1.0.0";
-
-		String fromRemoteSiteUrl = "http://"+getHttpHost()+":"+ getHttpPort()+ "/org.eclipse.update.tests.core.updatetests/bundleSite/";;
-		if (!isInstalled) {
-			System.out.println(
-				"==============" + this.getClass() + "=============");
-			StandaloneUpdateApplication app = new StandaloneUpdateApplication();
-			try {
-				exitValue = (Integer)app.run(getCommand(
-					"install",
-					featureId,
-					version,
-					null,
-					fromRemoteSiteUrl,
-					TARGET_FILE_SITE.getFile()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			isInstalled = true;
-		}
-		
-	}
-
-	public void testPluginsExist() {
-		ISite localSite = getConfiguredSite(TARGET_FILE_SITE);
-		
-		System.out.println("localSite: " + localSite.getURL().getFile());
-		IPluginEntry[] pluginEntries = localSite.getPluginEntries();
-		ArrayList list = new ArrayList();
-		if (pluginEntries == null || pluginEntries.length == 0){
-			System.err.println("No plugin entries on the target site");
-			fail("No plugin entries on the target site");
-		} else{
-			for (int i = 0; i < pluginEntries.length; i++){
-				System.out.println("found plugin: " + pluginEntries[i].getVersionedIdentifier().toString());
-				list.add(pluginEntries[i].getVersionedIdentifier().toString());
-			}
-		}
-
-		String[] pluginNames =
-			{	"com.example.bundle.plugin_1.0.0",
-				"com.example.bundle.plugin.ui_2.0.0",
-				"com.example.bundle.fragment_1.0.0",
-				"com.example.budle.fragment.ui_1.0.0"};
-		assertTrue(checkFilesInList(pluginNames, list));
-	}
-
-	public void testFeaturesExist() {
-		try {
-			ISite localSite =  getConfiguredSite(TARGET_FILE_SITE);
-
-			System.out.println("localSite: " + localSite.getURL().getFile());
-			// get feature references 
-			IFeatureReference[] localFeatures =
-				localSite.getFeatureReferences();
-			System.out.println("local currentCOnfigSite: " + localSite.getCurrentConfiguredSite());
-			ArrayList list = new ArrayList();
-			if (localFeatures == null || localFeatures.length == 0){
-				System.err.println("No features on the target site");
-				fail("No features on the target site");
-			} else {
-				for (int i = 0; i < localFeatures.length; i++)
-					list.add(localFeatures[i].getVersionedIdentifier().toString());
-			}
-			String[] featureNames =
-				{
-					"com.example.bundle.feature_1.0.0"};
-			assertTrue(checkFilesInList(featureNames, list));
-		} catch (CoreException e) {
-			System.err.println(e);
-		}
-	}
-
-	// makes sure all files/directories in "names" are in the directory listing "list"
-	public boolean checkFilesInList(
-		String[] names,
-		ArrayList list) {
-		
-		for (int i = 0; i < names.length; i++) {
-			System.out.println(names[i]);
-			if (!list.contains(names[i])){
-				return false;
-			}
-		}
-		return true;
-	}
-
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		System.out.println("exitValue: " + exitValue);
-		assertEquals(exitValue, IPlatformRunnable.EXIT_OK);
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureDisable.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureDisable.java
deleted file mode 100644
index 9db78e5..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureDisable.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.tests.standalone;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.standalone.*;
-
-public class TestFeatureDisable extends StandaloneManagerTestCase {
-	public static boolean isDisabled;
-	
-	public TestFeatureDisable(String arg0) {
-		super(arg0);
-		isDisabled = false;
-	}
-
-	public void umSetUp() {
-		super.umSetUp();
-		
-		String featureId = "my.alphabet";
-		String version = "1.0.0";
-
-		checkConfiguredSites();
-		if (!isDisabled) {
-			System.out.println(
-				"==============" + this.getClass() + "=============");
-			StandaloneUpdateApplication app = new StandaloneUpdateApplication();
-			try {
-				exitValue = (Integer)app.run(getCommand(
-					"disable",
-					featureId,
-					version,
-					null,
-					null,
-					TARGET_FILE_SITE.getFile()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			isDisabled = true;
-			checkConfiguredSites();
-		}
-	}
-	
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		System.out.println("exitValue: " + exitValue);
-		assertEquals(exitValue, IPlatformRunnable.EXIT_OK);
-	}
-
-	public void testFeatureStatus() throws Exception {
-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());
-		System.out.println(localFile.getAbsolutePath());
-		assertTrue(localFile.exists());
-		File configFile = getLatestConfigurationFile(localFile);
-	
-		String[] names =
-			{
-				"features/my.alphabet.round.letters_1.0.0/",
-				"features/my.alphabet.straight.letters_1.0.0/",
-				"features/my.alphabet_1.0.0/" };
-		assertTrue(configFile.exists());
-		assertTrue(checkFeaturesDisabled(getArrayList(names),configFile, TARGET_FILE_SITE.getFile()));
-	}
-
-	public boolean checkFeaturesDisabled(ArrayList featureNames, File configFile, String siteLocation){
-		try {
-			FileReader freader = new FileReader(configFile);
-			BufferedReader breader = new BufferedReader(freader);
-			String line;
-			System.out.println("now reading..." + configFile.getAbsolutePath());
-			boolean isSiteToCheck = false;
-			while (breader.ready()) {
-				line = breader.readLine();
-				if (line.trim().startsWith("<site url")){
-					isSiteToCheck = line.trim().split("\"")[1].replaceFirst("file:","").equals(siteLocation);
-				} else if (isSiteToCheck && line.trim().startsWith("<feature configured")){
-					System.err.println(line);
-					String[] configLine = line.split("\"");
-					if (featureNames.contains(configLine[3]) && configLine[1].equals("true")){
-						fail(configLine[3] + " has not been disabled.");
-					}
-				}
-			}
-		} catch (Exception e) {
-			System.err.println(e);
-		} 
-		return true;
-	}
-
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureEnable.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureEnable.java
deleted file mode 100644
index 389ac6b..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureEnable.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.standalone.*;
-
-public class TestFeatureEnable extends StandaloneManagerTestCase {
-	public static boolean isEnabled;
-	
-	public TestFeatureEnable(String arg0) {
-		super(arg0);
-		isEnabled = false;
-	}
-
-	public void umSetUp() {
-
-		super.umSetUp();
-		
-		String featureId = "my.alphabet";
-		String version = "1.0.0";
-
-		checkConfiguredSites();
-		if (!isEnabled) {
-			System.out.println(
-				"==============" + this.getClass() + "=============");
-			StandaloneUpdateApplication app = new StandaloneUpdateApplication();
-			try {
-				exitValue = (Integer)app.run(getCommand(
-					"enable",
-					featureId,
-					version,
-					null,
-					null,
-					TARGET_FILE_SITE.getFile()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			isEnabled = true;
-			checkConfiguredSites();
-		}
-	}
-	
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		System.out.println("exitValue: " + exitValue);
-		assertEquals(exitValue, IPlatformRunnable.EXIT_OK);
-	}
-
-	public void testFeatureStatus() throws Exception {
-	
-		File localFile = new File(((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile());
-		System.out.println(localFile.getAbsolutePath());
-		assertTrue(localFile.exists());
-		File configFile = getLatestConfigurationFile(localFile);
-		
-		String[] names =
-			{
-				"features/my.alphabet.round.letters_1.0.0/",
-				"features/my.alphabet.straight.letters_1.0.0/",
-				"features/my.alphabet_1.0.0/" };
-		assertTrue(configFile.exists());
-		assertTrue(checkFeaturesEnabled(getArrayList(names),configFile, TARGET_FILE_SITE.getFile()));
-	}
-
-	public boolean checkFeaturesEnabled(ArrayList featureNames, File configFile, String siteLocation){
-		try {
-			FileReader freader = new FileReader(configFile);
-			BufferedReader breader = new BufferedReader(freader);
-			String line;
-			System.out.println("now reading..." + configFile.getAbsolutePath());
-			boolean isSiteToCheck = false;
-			while (breader.ready()) {
-				line = breader.readLine();
-				if (line.trim().startsWith("<site url")){
-					isSiteToCheck = line.trim().split("\"")[1].replaceFirst("file:","").equals(siteLocation);
-				} else if (isSiteToCheck && line.trim().startsWith("<feature configured")){
-					System.err.println(line);
-					String[] configLine = line.split("\"");
-					if (featureNames.contains(configLine[3]) && configLine[1].equals("false")){
-						fail(configLine[3] + " has not been enabled.");
-					}
-					// temp - delete later
-					if (featureNames.contains(configLine[3]))
-						System.err.println(line);
-					// end of temp delete
-				}
-			}
-		} catch (Exception e) {
-			System.err.println(e);
-		} 
-		return true;
-	}
-
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureInstall.java
deleted file mode 100644
index 9a6d1fe..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureInstall.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.update.tests.standalone;
-
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.standalone.*;
-
-
-public class TestFeatureInstall extends StandaloneManagerTestCase {
-	private static boolean isInstalled;
-
-	public TestFeatureInstall(String arg0) {
-		super(arg0);
-		isInstalled = false;
-	}
-
-	public void umSetUp() {
-		super.umSetUp();
-		//System.out.println("looking at configured sites available....");
-		//checkConfiguredSites();
-		
-		String featureId = "my.alphabet";
-		String version = "1.0.0";
-
-		String fromRemoteSiteUrl =
-			"http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-update-home/3.0/site/";
-		if (!isInstalled) {
-			System.out.println(
-				"==============" + this.getClass() + "=============");
-			StandaloneUpdateApplication app = new StandaloneUpdateApplication();
-			try {
-				exitValue = (Integer)app.run(getCommand(
-					"install",
-					featureId,
-					version,
-					null,
-					fromRemoteSiteUrl,
-					TARGET_FILE_SITE.getFile()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			isInstalled = true;
-		}
-		
-	}
-
-	public void testPluginsExist() {
-		ISite localSite = getConfiguredSite(TARGET_FILE_SITE);
-		
-		System.out.println("localSite: " + localSite.getURL().getFile());
-		IPluginEntry[] pluginEntries = localSite.getPluginEntries();
-		ArrayList list = new ArrayList();
-		if (pluginEntries == null || pluginEntries.length == 0){
-			System.err.println("No plugin entries on the target site");
-			fail("No plugin entries on the target site");
-		} else{
-			for (int i = 0; i < pluginEntries.length; i++){
-				System.out.println("found plugin: " + pluginEntries[i].getVersionedIdentifier().toString());
-				list.add(pluginEntries[i].getVersionedIdentifier().toString());
-			}
-		}
-
-		String[] pluginNames =
-			{	"my.alphabet.letter.a_1.0.0",
-				"my.alphabet.letter.b_1.0.0",
-				"my.alphabet.letter.c_1.0.0",
-				"my.alphabet.letter.e_1.0.0",
-				"my.alphabet.round.letters_1.0.0",
-				"my.alphabet.straight.letters_1.0.0",
-				"my.alphabet_1.0.0" };
-		assertTrue(checkFilesInList(pluginNames, list));
-	}
-
-	public void testFeaturesExist() {
-		try {
-			ISite localSite =  getConfiguredSite(TARGET_FILE_SITE);
-
-			System.out.println("localSite: " + localSite.getURL().getFile());
-			// get feature references 
-			IFeatureReference[] localFeatures =
-				localSite.getFeatureReferences();
-			System.out.println("local currentCOnfigSite: " + localSite.getCurrentConfiguredSite());
-			ArrayList list = new ArrayList();
-			if (localFeatures == null || localFeatures.length == 0){
-				System.err.println("No features on the target site");
-				fail("No features on the target site");
-			} else {
-				for (int i = 0; i < localFeatures.length; i++)
-					list.add(localFeatures[i].getVersionedIdentifier().toString());
-			}
-			String[] featureNames =
-				{
-					"my.alphabet.round.letters_1.0.0",
-					"my.alphabet.straight.letters_1.0.0",
-					"my.alphabet_1.0.0" };
-			assertTrue(checkFilesInList(featureNames, list));
-		} catch (CoreException e) {
-			System.err.println(e);
-		}
-	}
-
-	// makes sure all files/directories in "names" are in the directory listing "list"
-	public boolean checkFilesInList(
-		String[] names,
-		ArrayList list) {
-		
-		for (int i = 0; i < names.length; i++) {
-			System.out.println(names[i]);
-			if (!list.contains(names[i])){
-				return false;
-			}
-		}
-		return true;
-	}
-
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		System.out.println("exitValue: " + exitValue);
-		assertEquals(exitValue, IPlatformRunnable.EXIT_OK);
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUninstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUninstall.java
deleted file mode 100644
index e9a36fd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUninstall.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.update.tests.standalone;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.standalone.*;
-
-
-public class TestFeatureUninstall extends StandaloneManagerTestCase {
-	public static boolean isUninstalled;
-	
-	public TestFeatureUninstall(String arg0){
-		super(arg0);
-		isUninstalled = false;
-	}
-	
-	public void umSetUp() {
-		super.umSetUp();
-		System.out.println("looking at configured sites available....");
-		checkConfiguredSites();
-		
-		String featureId = "my.alphabet";
-		String version = "1.0.0";
-
-		if(!isUninstalled){
-			System.out.println(
-				"==============" + this.getClass() + "=============");
-			StandaloneUpdateApplication app = new StandaloneUpdateApplication();
-			try {
-				exitValue = (Integer)app.run(getCommand(
-					"uninstall",
-					featureId,
-					version,
-					null,
-					null,
-					TARGET_FILE_SITE.getFile()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			isUninstalled = true;
-		}
-	}
-	
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		System.out.println("exitValue: " + exitValue);
-		assertEquals(exitValue, IPlatformRunnable.EXIT_OK);
-	}
-	
-	public void testFeaturesUninstalled() throws Exception {
-		try {
-			ISite localSite = getConfiguredSite(TARGET_FILE_SITE);
-			
-			// get feature references 
-			IFeatureReference[] localFeatures =
-				localSite.getFeatureReferences();
-			ArrayList list = new ArrayList();
-			if (localFeatures == null || localFeatures.length == 0){
-				fail("No features on the target site");
-			} else {
-				for (int i = 0; i < localFeatures.length; i++)
-					list.add(localFeatures[i].getVersionedIdentifier().toString());
-			}
-			String[] featureNames =
-				{
-					"my.alphabet.round.letters_1.0.0",
-					"my.alphabet.straight.letters_1.0.0",
-					"my.alphabet_1.0.0" };
-			assertTrue(checkFilesNotInList(featureNames, list));
-		} catch (CoreException e) {
-			System.err.println(e);
-		}
-	}
-	
-	public void testPluginsUninstalled() throws Exception {
-			ISite localSite = getConfiguredSite(TARGET_FILE_SITE);
-			
-			IPluginEntry[] pluginEntries = localSite.getPluginEntries();
-			ArrayList list = new ArrayList();
-			if (pluginEntries == null || pluginEntries.length == 0)
-				fail("No plugin entries on the target site");
-			else
-				for (int i = 0; i < pluginEntries.length; i++){
-					list.add(pluginEntries[i].getVersionedIdentifier().toString());
-					System.out.println("plugin found: " + pluginEntries[i].getVersionedIdentifier().toString());
-				}
-
-			String[] pluginNames =
-				{	"my.alphabet.letter.a_1.0.0",
-					"my.alphabet.letter.b_1.0.0",
-					"my.alphabet.letter.c_1.0.0",
-					"my.alphabet.letter.e_1.0.0",
-					"my.alphabet.round.letters_1.0.0",
-					"my.alphabet.straight.letters_1.0.0",
-					"my.alphabet_1.0.0" };
-			assertTrue(checkFilesNotInList(pluginNames, list));	
-	}
-	
-	// makes sure all files/directories in "names" are NOT in the directory listing "list"
-	public boolean checkFilesNotInList(
-		String[] names,
-		ArrayList list) {
-		
-		for (int i = 0; i < names.length; i++) {
-			System.out.println("searching for " + names[i] + "...");
-			if (list.contains(names[i]))
-				return false;
-		}
-		return true;
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUpdate.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUpdate.java
deleted file mode 100644
index 3e96a45..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/standalone/TestFeatureUpdate.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.standalone;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.standalone.*;
-
-public class TestFeatureUpdate extends StandaloneManagerTestCase {
-	public static boolean isUpdated;
-	
-	public TestFeatureUpdate(String arg0) {
-		super(arg0);
-		isUpdated = false;
-	}
-
-	public void umSetUp() {
-		super.umSetUp();
-		System.out.println("looking at configured sites available....");
-		checkConfiguredSites();
-		
-		String featureId = "my.alphabet";
-		String version = "1.0.1";
-
-		if (!isUpdated) {
-			System.out.println(
-				"==============" + this.getClass() + "=============");
-			StandaloneUpdateApplication app = new StandaloneUpdateApplication();
-			try {
-				exitValue = (Integer)app.run(getCommand(
-						"update",
-						featureId,
-						version,
-						null,
-						null,
-						TARGET_FILE_SITE.getFile()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			isUpdated = true;
-		}
-	}
-
-
-	// ensure exit without problems
-	public void testExitValue() throws Exception {
-		System.out.println("exitValue: " + exitValue);
-		assertEquals(exitValue, IPlatformRunnable.EXIT_OK);
-	}
-	
-	public void testPluginsExist() {
-
-			ISite localSite =  getConfiguredSite(TARGET_FILE_SITE);
-
-			IPluginEntry[] pluginEntries = localSite.getPluginEntries();
-			ArrayList list = new ArrayList();
-			if (pluginEntries == null || pluginEntries.length == 0)
-				fail("No plugin entries on the target site");
-			else
-				for (int i = 0; i < pluginEntries.length; i++) {
-					list.add(
-						pluginEntries[i].getVersionedIdentifier().toString());
-				}
-
-			String[] pluginNames =
-				{
-					"my.alphabet.letter.a_1.0.0",
-					"my.alphabet.letter.b_1.0.0",
-					"my.alphabet.letter.c_1.0.0",
-					"my.alphabet.letter.e_1.0.0",
-					"my.alphabet.round.letters_1.0.0",
-					"my.alphabet.straight.letters_1.0.0",
-					"my.alphabet_1.0.0",
-					"my.alphabet.letter.a_1.0.1",
-					"my.alphabet.letter.b_1.0.1",
-					"my.alphabet.letter.c_1.0.1",
-					"my.alphabet.letter.e_1.0.1",
-					"my.alphabet.round.letters_1.0.1",
-					"my.alphabet.straight.letters_1.0.1",
-					"my.alphabet_1.0.1" };
-			assertTrue(checkFilesInList(pluginNames, list));
-	}
-
-	public void testFeaturesExist() {
-		try {
-			ISite localSite = getConfiguredSite(TARGET_FILE_SITE);
-
-			// get feature references
-			IFeatureReference[] localFeatures =
-				localSite.getFeatureReferences();
-			ArrayList list = new ArrayList();
-			if (localFeatures == null || localFeatures.length == 0) {
-				fail("No features on the target site");
-			} else {
-				for (int i = 0; i < localFeatures.length; i++) {
-					list.add(
-						localFeatures[i].getVersionedIdentifier().toString());
-					System.out.println(
-						localFeatures[i].getVersionedIdentifier().toString());
-				}
-			}
-			String[] featureNames =
-				{
-					"my.alphabet.round.letters_1.0.0",
-					"my.alphabet.straight.letters_1.0.0",
-					"my.alphabet_1.0.0",
-					"my.alphabet.round.letters_1.0.1",
-					"my.alphabet.straight.letters_1.0.1",
-					"my.alphabet_1.0.1" };
-			assertTrue(checkFilesInList(featureNames, list));
-		} catch (CoreException e) {
-			System.err.println(e);
-		}
-	}
-
-	// makes sure all files/directories in "names" are in the directory listing
-	// "list"
-	public boolean checkFilesInList(String[] names, ArrayList list) {
-
-		for (int i = 0; i < names.length; i++) {
-			if (!list.contains(names[i]))
-				return false;
-		}
-		return true;
-	}
-
-}
\ No newline at end of file

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 0dc9343..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,null);

-		URL featureURL = new URL(SOURCE_FILE_SITE,"features/features2.jar ");

-		

-		IFeature anotherFeature = factory.createFeature(featureURL,site,null);

-		

-		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,null);

-		URL featureURL = new URL(SOURCE_FILE_SITE,"testAPI/"+Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/");

-		

-		IFeature anotherFeature = factory.createFeature(featureURL,site,null);

-		

-		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,null);

-		IFeature feature = site.getFeatureReferences()[0].getFeature(null);

-		

-		IFeature anotherFeature = factory.createFeature(feature.getURL(),site,null);

-		

-		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(),null);

-		IFeatureReference ref = site.getFeatureReferences()[0];

-		IFeature feature = ref.getFeature(null);

-		

-		IFeature anotherFeature = factory.createFeature(feature.getURL(),site,null);

-

-		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(),null);

-		IFeatureReference ref = site.getFeatureReferences()[0];		

-		IFeature feature = ref.getFeature(null);

-		

-		IFeature anotherFeature = factory.createFeature(feature.getURL(),site,null);

-		

-		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(),null);

-		IFeatureReference ref = site.getFeatureReferences()[0];		

-		try {

-			ref.getFeature(null);

-			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 cde7ce7..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(),null);

-		IFeatureReference ref = site.getFeatureReferences()[0];

-		IFeature feature = ref.getFeature(null);

-

-		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/"),null);

-

-		// 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,null);

-			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 88754a5..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")),null);

-		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(null);

-			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.tests.core/webserver/bundleSite/features/com.example.bundle.feature_1.0.0.jar b/update/org.eclipse.update.tests.core/webserver/bundleSite/features/com.example.bundle.feature_1.0.0.jar
deleted file mode 100644
index 20d3589..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSite/features/com.example.bundle.feature_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.budle.fragment.ui_1.0.0.jar b/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.budle.fragment.ui_1.0.0.jar
deleted file mode 100644
index d79d2cd..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.budle.fragment.ui_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.fragment_1.0.0.jar b/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.fragment_1.0.0.jar
deleted file mode 100644
index edb02bb..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.fragment_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin.ui_2.0.0.jar b/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin.ui_2.0.0.jar
deleted file mode 100644
index 32ec02c..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin.ui_2.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin_1.0.0.jar b/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin_1.0.0.jar
deleted file mode 100644
index 2b1b693..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSite/plugins/com.example.bundle.plugin_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSite/site.xml b/update/org.eclipse.update.tests.core/webserver/bundleSite/site.xml
deleted file mode 100644
index bab1332..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSite/site.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/com.example.bundle.feature_1.0.0.jar" id="com.example.bundle.feature" version="1.0.0">
-      <category name="BundleFeature"/>
-   </feature>
-   <category-def name="BundleFeature" label="Feature with Bundles"/>
-</site>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.classpath b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.project b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.project
deleted file mode 100644
index 8e20903..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.project
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.example.budle.fragment.ui</name>
-	<comment></comment>
-	<projects>
-		<project>com.example.bundle.plugin</project>
-		<project>com.example.bundle.plugin.ui</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.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.template b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 2ad686f..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Generated-from: 1077062974451

-Bundle-Name: Ui Fragment

-Bundle-Version: 1.0.0

-Bundle-SymbolicName: com.example.budle.fragment.ui

-Bundle-Vendor: Eclipse.org

-Bundle-ClassPath: ui.jar

-Legacy: true

-Fragment-Host: com.example.bundle.plugin.ui; bundle-version=2.0.0


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/build.properties b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/build.properties
deleted file mode 100644
index 4a7ee43..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.ui.jar = src/
-output.ui.jar = bin/
-bin.includes = fragment.xml,\
-               META-INF/,\
-               ui.jar

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/fragment.xml b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/fragment.xml
deleted file mode 100644
index 3c484b3..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.budle.fragment.ui/fragment.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment
-   id="com.example.budle.fragment.ui"
-   name="Ui Fragment"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   plugin-id="com.example.bundle.plugin.ui"
-   plugin-version="2.0.0"
-   match="greaterOrEqual">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-</fragment>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/.project b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/.project
deleted file mode 100644
index 8f3e4bc..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.example.bundle.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/build.properties b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/feature.xml b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/feature.xml
deleted file mode 100644
index bb41043..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.feature/feature.xml
+++ /dev/null

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.example.bundle.feature"
-      label="com.example.bundle.feature"
-      version="1.0.0"
-      provider-name="Eclipse.org">
-
-   <license>
-      A placeholder license for the feature.
-   </license>
-
-   <install-handler/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-   <plugin
-         id="com.example.bundle.plugin"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
-   <plugin
-         id="com.example.budle.fragment.ui"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="com.example.bundle.fragment"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="com.example.bundle.plugin.ui"
-         download-size="0"
-         install-size="0"
-         version="2.0.0"/>
-
-</feature>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.classpath b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.project b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.project
deleted file mode 100644
index 06d0c21..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.project
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.example.bundle.fragment</name>
-	<comment></comment>
-	<projects>
-		<project>com.example.bundle.plugin</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.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.template b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d66480..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Generated-from: 1077062909487

-Bundle-Name: Fragment Fragment

-Bundle-Version: 1.0.0

-Bundle-SymbolicName: com.example.bundle.fragment

-Bundle-Vendor: Eclipse.org

-Bundle-ClassPath: fragment.jar

-Legacy: true

-Fragment-Host: com.example.bundle.plugin; bundle-version=1.0.0


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/build.properties b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/build.properties
deleted file mode 100644
index 1e7e0e8..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.fragment.jar = src/
-output.fragment.jar = bin/
-bin.includes = fragment.xml,\
-               META-INF/,\
-               fragment.jar

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/fragment.xml b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/fragment.xml
deleted file mode 100644
index 2a5cd6e..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.fragment/fragment.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment
-   id="com.example.bundle.fragment"
-   name="Fragment Fragment"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   plugin-id="com.example.bundle.plugin"
-   plugin-version="1.0.0">
-
-   <runtime>
-      <library name="fragment.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-</fragment>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.classpath b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.project b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.project
deleted file mode 100644
index 83c3553..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.project
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.example.bundle.plugin.ui</name>
-	<comment></comment>
-	<projects>
-		<project>com.example.bundle.plugin</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.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.template b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e3507a9..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,12 +0,0 @@
-Generated-from: 1077062999827

-Bundle-Name: Ui Plug-in

-Bundle-Version: 2.0.0

-Bundle-SymbolicName: com.example.bundle.plugin.ui

-Bundle-Vendor: Eclipse.org

-Bundle-ClassPath: ui.jar

-Legacy: true

-Bundle-Activator: com.example.bundle.plugin.ui.UiPlugin

-Require-Bundle: 

- org.eclipse.core.runtime,

- org.eclipse.ui,

- com.example.bundle.plugin; bundle-version=1.0.0;version-match=perfect


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/bin/com/example/bundle/plugin/ui/UiPlugin.class b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/bin/com/example/bundle/plugin/ui/UiPlugin.class
deleted file mode 100644
index 5f73189..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/bin/com/example/bundle/plugin/ui/UiPlugin.class
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/build.properties b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/build.properties
deleted file mode 100644
index ec7d3b3..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.ui.jar = src/
-output.ui.jar = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               ui.jar

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/plugin.xml b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/plugin.xml
deleted file mode 100644
index aeffdef..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="com.example.bundle.plugin.ui"
-   name="Ui Plug-in"
-   version="2.0.0"
-   provider-name="Eclipse.org"
-   class="com.example.bundle.plugin.ui.UiPlugin">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="com.example.bundle.plugin" version="1.0.0" match="perfect"/>
-   </requires>
-
-
-</plugin>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/src/com/example/bundle/plugin/ui/UiPlugin.java b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/src/com/example/bundle/plugin/ui/UiPlugin.java
deleted file mode 100644
index 3caba50..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin.ui/src/com/example/bundle/plugin/ui/UiPlugin.java
+++ /dev/null

@@ -1,69 +0,0 @@
-package com.example.bundle.plugin.ui;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static UiPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public UiPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("com.example.bundle.plugin.ui.UiPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UiPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.classpath b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.project b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.project
deleted file mode 100644
index 1719d73..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.project
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.example.bundle.plugin</name>
-	<comment></comment>
-	<projects>
-		<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.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.template b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/META-INF/MANIFEST.MF
deleted file mode 100644
index fc1adaf..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Generated-from: 1077062603708

-Bundle-Name: Plugin Plug-in

-Bundle-Version: 1.0.0

-Bundle-SymbolicName: com.example.bundle.plugin

-Bundle-Vendor: EXAMPLE

-Bundle-ClassPath: plugin.jar

-Legacy: true

-Bundle-Activator: com.example.bundle.plugin.PluginPlugin

-Require-Bundle: 

- org.eclipse.core.runtime,

- org.eclipse.ui


diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/bin/com/example/bundle/plugin/PluginPlugin.class b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/bin/com/example/bundle/plugin/PluginPlugin.class
deleted file mode 100644
index 76caf03..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/bin/com/example/bundle/plugin/PluginPlugin.class
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/build.properties b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/build.properties
deleted file mode 100644
index 21a16d4..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.plugin.jar = src/
-output.plugin.jar = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               plugin.jar

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/plugin.xml b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/plugin.xml
deleted file mode 100644
index 297bc76..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/plugin.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="com.example.bundle.plugin"
-   name="Plugin Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="com.example.bundle.plugin.PluginPlugin">
-
-   <runtime>
-      <library name="plugin.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-
-</plugin>

diff --git a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/src/com/example/bundle/plugin/PluginPlugin.java b/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/src/com/example/bundle/plugin/PluginPlugin.java
deleted file mode 100644
index 350b393..0000000
--- a/update/org.eclipse.update.tests.core/webserver/bundleSitesrc/com.example.bundle.plugin/src/com/example/bundle/plugin/PluginPlugin.java
+++ /dev/null

@@ -1,69 +0,0 @@
-package com.example.bundle.plugin;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PluginPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static PluginPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public PluginPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("com.example.bundle.plugin.PluginPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PluginPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = PluginPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}

diff --git a/update/org.eclipse.update.ui.forms/.classpath b/update/org.eclipse.update.ui.forms/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/update/org.eclipse.update.ui.forms/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<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 8540f9e..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.eclipse.core.boot</project>

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

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

-		<project>org.eclipse.ui.ide</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 14fda25..0000000
--- a/update/org.eclipse.update.ui.forms/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-bin.includes = plugin.properties,\

-               *.jar,\

-               plugin.xml,\

-               about.html

-source.forms.jar = src/

-src.includes = 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 ab2a167..0000000
--- a/update/org.eclipse.update.ui.forms/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin

-   id="org.eclipse.update.ui.forms"

-   name="%name"

-   version="3.0.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.compatibility"/>

-      <import plugin="org.eclipse.ui"/>

-   </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 c125441..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.actions.*;

-

-/**

- * 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(ActionFactory.CUT.getId())) {

-				text.cut();

-				return true;

-			}

-			if (id.equals(ActionFactory.COPY.getId())) {

-				text.copy();

-				return true;

-			}

-			if (id.equals(ActionFactory.PASTE.getId())) {

-				text.paste();

-				return true;

-			}

-			if (id.equals(ActionFactory.SELECT_ALL.getId())) {

-				text.selectAll();

-				return true;

-			}

-			if (id.equals(ActionFactory.DELETE.getId())) {

-				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 02903ca..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.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.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) {

-		Point area = scomp.getContent().getSize();

-		Point scompOrigin = scomp.getOrigin();

-

-		int x = scompOrigin.x;

-		int y = scompOrigin.y;

-

-		if (controlOrigin.x + controlSize.x > scompOrigin.x + area.x) {

-			x = controlOrigin.x + controlSize.x - area.x;

-		}		

-		if (controlOrigin.x < x ) {

-			 x = controlOrigin.x;

-		 }         

-		

-		if (controlOrigin.y + controlSize.y > scompOrigin.y + area.y) {

-			y = controlOrigin.y + controlSize.y - area.y;

-		}

-		if (controlOrigin.y < y ) {

-			 y = controlOrigin.y;

-		 }         

-		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 965e1e8..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 = "";

-	protected int textMarginWidth = 5;

-	protected 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) {

-		checkWidget();

-		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 742231d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java
+++ /dev/null

@@ -1,531 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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;

-	public boolean compactMode=false;

-

-	/*

-	 * 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) {

-				if (client instanceof Composite) {

-					Layout cl = ((Composite) client).getLayout();

-					if (cl instanceof ILayoutExtension)

-						maxWidth =

-							((ILayoutExtension) cl).getMaximumWidth(

-								(Composite) client,

-								flush);

-				}

-				if (maxWidth == 0) {

-					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()) {

-				if (toggle != null && toggle.getSelection() && compactMode) {

-				}

-				else {

-				//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);

-			}

-		}

-	}

-

-	/**

-	 * @return

-	 */

-	public boolean isCompactMode() {

-		return compactMode;

-	}

-

-	/**

-	 * @param compactMode

-	 */

-	public void setCompactMode(boolean compactMode) {

-		this.compactMode = compactMode;

-	}

-

-	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() {

-		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 && !control.isDisposed() && !header.isDisposed()) {

-			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 isCollapsed() {

-		return 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 74b9cd7..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java
+++ /dev/null

@@ -1,435 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.actions.*;

-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) {

-		final Composite composite = new Composite(parent, SWT.NONE);

-		composite.addListener(SWT.Paint, new Listener() {

-			public void handleEvent(Event e) {

-				if (composite.isDisposed()) return;

-				Rectangle bounds = composite.getBounds();

-				GC gc = e.gc;

-				gc.setForeground(getColor(COLOR_COMPOSITE_SEPARATOR));

-				gc.setBackground(getBackgroundColor());

-				gc.fillGradientRectangle(0, 0, bounds.width, bounds.height, false);	

-			}

-		});

-		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(ActionFactory.DELETE.getId());

-				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 5448093..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.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.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) {
-		FormsPlugin inst = FormsPlugin.getDefault();
-		if (inst==null) return 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 0dd2126..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java
+++ /dev/null

@@ -1,678 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.Vector;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-

-/**

- * 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) {

-			if (makeColumnsEqualWidth) {

-				columnWidths = new int[numColumns];

-				int colSpace = parentWidth - leftMargin - rightMargin;

-				colSpace -= (numColumns - 1) * horizontalSpacing;

-				int col = colSpace / numColumns;

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

-					columnWidths[i] = col;

-				}

-			} else {

-				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 8355501..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 IFormPage [] getPages() {

-		return (IFormPage[])pages.toArray(new IFormPage[pages.size()]);

-	}

-

-	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 52d301b..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 be28b6c..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.isDisposed()) {

-			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 bd3cfc4..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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;

-

-/**

- * 

- * @author dejan

- *

- * To change the template for this generated type comment go to

- * Window - Preferences - Java - Code Generation - Code and Comments

- */

-

-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 417e4e2..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java
+++ /dev/null

@@ -1,243 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.jface.action.StatusLineManager;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.ScrolledComposite;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.RowLayout;

-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.Event;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.swt.widgets.Shell;

-

-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);

-     RichText html = new RichText(c, SWT.WRAP);

-     html.setHyperlinkSettings(factory.getHyperlinkHandler());

-     RichTextHTTPAction action = new RichTextHTTPAction(manager);

-     URL i1URL = TableLayoutTest.class.getResource("image1.gif");

-     ImageDescriptor id1 = ImageDescriptor.createFromURL(i1URL);

-     html.registerTextObject("urlHandler", action);

-     html.registerTextObject("image1", id1.createImage());

-     //html.setBackground(factory.getBackgroundColor());

-     html.setForeground(factory.getForegroundColor());

-     InputStream is = TableLayoutTest.class.getResourceAsStream("index.xml");

-     //html.setParagraphsSeparated(false);

-     html.setContents(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 f4a127e..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 ee6c76e..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);

-	}

-

-	public 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.isDisposed()) {

-			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(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 53c8c7f..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java
+++ /dev/null

@@ -1,560 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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;

-	private boolean loading=true;

-	private String loadingText="Loading...";

-

-	public boolean getFocus() {

-		return hasFocus;

-	}

-	

-	public boolean isLoading() {

-		return loading;

-	}

-	

-	public String getLoadingText() {

-		return loadingText;

-	}

-	

-	public void setLoadingText(String loadingText) {

-		this.loadingText = loadingText;

-	}

-

-	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;

-

-		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();

-		

-		if (loading) {

-			int textWidth = gc.textExtent(loadingText).x;

-			gc.drawText(loadingText, width/2-textWidth/2, getClientArea().height/2-lineHeight/2);

-			return;

-		}

-		

-		IParagraph[] paragraphs = model.getParagraphs();

-

-		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);

-		}

-		finally {

-			loading = false;

-		}

-	}

-	public void load(InputStream is, boolean expandURLs) {

-		try {

-			model.parseInputStream(is, expandURLs);

-		} catch (CoreException e) {

-			FormsPlugin.logException(e);

-		}

-		finally {

-			loading = false;

-		}

-	}

-

-	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 ecaee4d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.SWT;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.update.ui.forms.internal.ILayoutExtension;

-

-/**

- * @version 	1.0

- * @author

- */

-public class FormEngineLayout extends Layout implements ILayoutExtension {

-

-	public int getMaximumWidth(Composite parent, boolean changed) {

-		return computeSize(parent, SWT.DEFAULT, SWT.DEFAULT, changed).x;

-	}

-

-	public int getMinimumWidth(Composite parent, boolean changed) {

-		return 30;

-	}

-

-	/*

-	 * @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 (engine.isLoading()) {

-			return computeLoading(engine);

-		}

-		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 computeLoading(FormEngine engine) {

-		GC gc = new GC(engine);

-		gc.setFont(engine.getFont());

-		String loadingText = engine.getLoadingText();

-		Point size = gc.textExtent(loadingText);

-		gc.dispose();

-		size.x += 2 * engine.marginWidth;

-		size.y += 2 * engine.marginHeight;

-		return size;

-	}

-

-	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 0ec9682..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java
+++ /dev/null

@@ -1,457 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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 javax.xml.parsers.*;

-

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

-import org.eclipse.jface.resource.*;

-import org.eclipse.update.ui.forms.internal.*;

-import org.w3c.dom.*;

-import org.xml.sax.*;

-

-/**

- * @version 	1.0

- * @author

- */

-public class TextModel implements ITextModel {

-	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();

-

-	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 {

-			

-		documentBuilderFactory.setNamespaceAware(true);

-	

-		reset();

-		try {

-			DocumentBuilder parser = documentBuilderFactory.newDocumentBuilder();

-			InputSource source = new InputSource(is);

-			Document doc = parser.parse(source);

-			processDocument(doc, expandURLs);

-		} catch (ParserConfigurationException e) {

-			FormsPlugin.logException(e);

-		} 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/image1.gif b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/image1.gif
deleted file mode 100644
index c5c94ee..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/image1.gif
+++ /dev/null
Binary files differ

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 4732f87..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
+++ /dev/null

@@ -1,22 +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 1</a> and select 

-<b>Available Updates</b> folder. <b>Search page</b> will 

-be shown allowing you to initiate and customize the search. 

-Now we <b>will</b> add an 

-<img href="image1"/> 

-image here. Just

- to show how wrapping should apply to images when they are 

- larger than the regular text.

-</p>

-<li style="text" value="1.">To check for updates for features you have installed, 

-go to the <a href="action2">My Eclipse 2</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>

-<li>This is the bullet item.</li>

-<li>This is another bullet item.</li>

-</form>
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/.classpath b/update/org.eclipse.update.ui.win32/.classpath
deleted file mode 100644
index 314d270..0000000
--- a/update/org.eclipse.update.ui.win32/.classpath
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

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

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

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

-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

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

-</classpath>


diff --git a/update/org.eclipse.update.ui.win32/.cvsignore b/update/org.eclipse.update.ui.win32/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/update/org.eclipse.update.ui.win32/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/update/org.eclipse.update.ui.win32/.project b/update/org.eclipse.update.ui.win32/.project
deleted file mode 100644
index eb41f90..0000000
--- a/update/org.eclipse.update.ui.win32/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

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

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

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

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

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

-		<project>org.eclipse.update.ui.forms</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.win32/about.html b/update/org.eclipse.update.ui.win32/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.ui.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.ui.win32/build.properties b/update/org.eclipse.update.ui.win32/build.properties
deleted file mode 100644
index a31730b..0000000
--- a/update/org.eclipse.update.ui.win32/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-bin.includes = plugin.properties,\
-               icons/,\
-               *.jar,\
-               plugin.xml,\
-               about.html
-src.includes = about.html
-source.updateui32.jar = src/

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/backward_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/backward_nav.gif
deleted file mode 100644
index 740419b..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/backward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/forward_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/forward_nav.gif
deleted file mode 100644
index 7a1511d..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/forward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/go_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/go_nav.gif
deleted file mode 100644
index bb20d88..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/go_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/hierarchicalLayout.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/hierarchicalLayout.gif
deleted file mode 100644
index e597c3d..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/home_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/home_nav.gif
deleted file mode 100644
index 949c2db..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/home_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/refresh_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/refresh_nav.gif
deleted file mode 100644
index a063c23..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/refresh_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/show_unconf.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/show_unconf.gif
deleted file mode 100644
index 4c75f55..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/show_unconf.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/clcl16/stop_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/clcl16/stop_nav.gif
deleted file mode 100644
index 4eb53ec..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/clcl16/stop_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/cview16/browser.gif b/update/org.eclipse.update.ui.win32/icons/full/cview16/browser.gif
deleted file mode 100644
index fd70277..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/cview16/browser.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/backward_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/backward_nav.gif
deleted file mode 100644
index e2179ad..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/backward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/forward_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/forward_nav.gif
deleted file mode 100644
index 0c5af08..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/forward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/go_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/go_nav.gif
deleted file mode 100644
index 472f005..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/go_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/hierarchicalLayout.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/hierarchicalLayout.gif
deleted file mode 100644
index 76f3360..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/home_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/home_nav.gif
deleted file mode 100644
index 3c80080..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/home_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/refresh_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/refresh_nav.gif
deleted file mode 100644
index b2281b4..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/refresh_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/show_unconf.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/show_unconf.gif
deleted file mode 100644
index 493f498..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/show_unconf.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/stop_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/dlcl16/stop_nav.gif
deleted file mode 100644
index 7f0f9b9..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/dlcl16/stop_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/backward_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/backward_nav.gif
deleted file mode 100644
index 85188b7..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/backward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/collapseall.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/collapseall.gif
deleted file mode 100644
index 72c7ca2..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/forward_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/forward_nav.gif
deleted file mode 100644
index dc28ee1..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/forward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/go_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/go_nav.gif
deleted file mode 100644
index 7683327..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/go_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/hierarchicalLayout.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/hierarchicalLayout.gif
deleted file mode 100644
index b50b2c3..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/home_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/home_nav.gif
deleted file mode 100644
index bf2ba86..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/home_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/refresh_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/refresh_nav.gif
deleted file mode 100644
index 919423d..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/refresh_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/show_unconf.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/show_unconf.gif
deleted file mode 100644
index bdf381a..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/show_unconf.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/elcl16/stop_nav.gif b/update/org.eclipse.update.ui.win32/icons/full/elcl16/stop_nav.gif
deleted file mode 100644
index a519f44..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/elcl16/stop_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/eview16/browser.gif b/update/org.eclipse.update.ui.win32/icons/full/eview16/browser.gif
deleted file mode 100644
index 33935b1..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/eview16/browser.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/forms/def_provider.jpg b/update/org.eclipse.update.ui.win32/icons/full/forms/def_provider.jpg
deleted file mode 100644
index a43cbeb..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/forms/def_provider.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.gif b/update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.jpg b/update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.jpg
deleted file mode 100644
index 253e2d2..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/forms/form_banner.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/forms/form_underline.jpg b/update/org.eclipse.update.ui.win32/icons/full/forms/form_underline.jpg
deleted file mode 100644
index 0ff3d0b..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/forms/form_underline.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/forms/form_underline2.jpg b/update/org.eclipse.update.ui.win32/icons/full/forms/form_underline2.jpg
deleted file mode 100644
index 57414f7..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/forms/form_underline2.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/full/forms/topic.gif b/update/org.eclipse.update.ui.win32/icons/full/forms/topic.gif
deleted file mode 100644
index 10137e9..0000000
--- a/update/org.eclipse.update.ui.win32/icons/full/forms/topic.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/icons/sample.gif b/update/org.eclipse.update.ui.win32/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/update/org.eclipse.update.ui.win32/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui.win32/plugin.properties b/update/org.eclipse.update.ui.win32/plugin.properties
deleted file mode 100644
index 5288763..0000000
--- a/update/org.eclipse.update.ui.win32/plugin.properties
+++ /dev/null

@@ -1,3 +0,0 @@
-pluginName = Welcome Portal for Windows
-providerName = Eclipse.org
-views.webBrowser.label = Web Browser
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/plugin.xml b/update/org.eclipse.update.ui.win32/plugin.xml
deleted file mode 100644
index 1b0b77a..0000000
--- a/update/org.eclipse.update.ui.win32/plugin.xml
+++ /dev/null

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.update.ui.win32"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.welcome.internal.WelcomePortal">
-
-   <runtime>
-      <library name="updateui32.jar">
-         <export name="*"/>
-         <packages prefixes="org.eclipse.welcome.internal"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.update.ui.forms"/>
-      <import plugin="org.eclipse.help"/>
-   </requires>
-
-
-   <extension-point id="welcomePages" name="Welcome Pages" schema="schema/welcomePages.exsd"/>
-   <extension-point id="welcomeSections" name="Welcome Sections" schema="schema/welcomeSections.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Sample Action Set"
-            visible="true"
-            id="org.eclipse.update.ui.win32.actionSet">
-         <action
-               label="Open Home Page"
-               icon="icons/sample.gif"
-               tooltip="Open Home Page"
-               class="org.eclipse.welcome.internal.ShowWelcomePageAction"
-               menubarPath="help/helpEnd"
-               id="org.eclipse.welcome.internal.ShowWelcomePageAction">
-         </action>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
-         <actionSet
-               id="org.eclipse.update.ui.win32.actionSet">
-         </actionSet>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            name="Web Browser"
-            icon="icons/sample.gif"
-            contributorClass="org.eclipse.welcome.internal.webbrowser.WebBrowserEditorContributor"
-            class="org.eclipse.welcome.internal.webbrowser.WebBrowserEditor"
-            id="org.eclipse.welcome.webbrowser">
-      </editor>
-      <editor
-            name="Welcome Page"
-            icon="icons/sample.gif"
-            class="org.eclipse.welcome.internal.portal.WelcomePortalEditor"
-            id="org.eclipse.welcome.portal">
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.elementFactories">
-      <factory
-            class="org.eclipse.welcome.internal.webbrowser.WebBrowserEditorInputFactory"
-            id="org.eclipse.welcome.internal.webbrowser.WebBrowserEditorInputFactory">
-      </factory>
-      <factory
-            class="org.eclipse.welcome.internal.portal.WelcomePortalEditorInputFactory"
-            id="org.eclipse.welcome.internal.portal.WelcomePortalEditorInputFactory">
-      </factory>
-   </extension>
-   <extension
-         point="org.eclipse.update.ui.win32.welcomePages">
-      <page
-            name="Home"
-            numColumns="2"
-            id="org.eclipse.update.ui.win32.homePage">
-         <section
-               span="2"
-               id="community.news.remote">
-         </section>
-         <section
-               id="search">
-         </section>
-         <section
-               id="tasks.softwareUpdates">
-         </section>
-         <section
-               id="quickStart">
-         </section>
-         <section
-               id="tipsAndTricks">
-         </section>
-      </page>
-      <page
-            name="News"
-            id="org.eclipse.update.ui.win32.news">
-      </page>
-      <page
-            name="Community"
-            numColumns="1"
-            id="org.eclipse.update.ui.win32.community">
-         <section
-               id="community.links">
-         </section>
-         <section
-               id="community.articles">
-         </section>
-      </page>
-      <page
-            name="Samples"
-            id="org.eclipse.update.ui.win32.samples">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.update.ui.win32.welcomeSections">
-      <section
-            name="Software Updates"
-            id="tasks.softwareUpdates">
-         <form>
-            &lt;p&gt;
-&lt;a href=&quot;action&quot; arg=&quot;org.eclipse.update.ui:org.eclipse.update.internal.ui.InstallWizardAction&quot;&gt;
-Find updates for the currently installed features
-&lt;/a&gt;&lt;/p&gt;
-&lt;p&gt;
-&lt;a href=&quot;action&quot; arg=&quot;org.eclipse.update.ui:org.eclipse.update.internal.ui.ConfigurationManagerAction&quot;&gt;
-Manage my workbench configuration&lt;/a&gt;&lt;/p&gt;
-         </form>
-      </section>
-      <section
-            name="Eclipse Community Sites"
-            id="community.links">
-         <form>
-            &lt;li&gt;&lt;a href=&quot;url&quot; arg=&quot;http://www.eclipse.org&quot;&gt;Eclipse.org&lt;/a&gt;&lt;/li&gt;
-         </form>
-      </section>
-      <section
-            name="New Eclipse Articles"
-            id="community.articles">
-         <form
-               url="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-update-home/welcome-articles.xml"
-               type="remote">
-         </form>
-      </section>
-      <section
-            name="Headlines"
-            id="community.news.remote">
-         <form
-               url="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-update-home/welcome-news.xml"
-               type="remote">
-         </form>
-      </section>
-      <section
-            name="Get Help"
-            id="search">
-         <form
-               type="custom"
-               class="org.eclipse.welcome.internal.portal.HelpSection">
-         </form>
-      </section>
-      <section
-            name="Quick Start"
-            id="quickStart">
-         <form
-               type="dynamic"
-               class="org.eclipse.welcome.internal.actions.WelcomeContentProvider">
-         </form>
-      </section>
-      <section
-            name="Tips and Tricks"
-            id="tipsAndTricks">
-         <form
-               type="dynamic"
-               class="org.eclipse.welcome.internal.actions.TipsAndTricksContentProvider">
-         </form>
-      </section>
-   </extension>
-
-</plugin>

diff --git a/update/org.eclipse.update.ui.win32/schema/welcomePages.exsd b/update/org.eclipse.update.ui.win32/schema/welcomePages.exsd
deleted file mode 100644
index 7e43f1b..0000000
--- a/update/org.eclipse.update.ui.win32/schema/welcomePages.exsd
+++ /dev/null

@@ -1,135 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.update.ui.win32">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.update.ui.win32" id="welcomePages" name="Welcome Pages"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="page" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="page">

-      <complexType>

-         <sequence>

-            <element ref="section" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="numColumns" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="section">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="span" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/update/org.eclipse.update.ui.win32/schema/welcomeSections.exsd b/update/org.eclipse.update.ui.win32/schema/welcomeSections.exsd
deleted file mode 100644
index 9c4b5e2..0000000
--- a/update/org.eclipse.update.ui.win32/schema/welcomeSections.exsd
+++ /dev/null

@@ -1,166 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.update.ui.win32">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.update.ui.win32" id="welcomeSections" name="Welcome Sections"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="section" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="section">

-      <complexType>

-         <sequence>

-            <element ref="form" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.welcome.internal.portal.IPortalSection"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="form">

-      <complexType>

-         <attribute name="type" use="default" value="local">

-            <annotation>

-               <documentation>

-                  Forms are loaded depending on the &lt;samp&gt;type&lt;/samp&gt; attribute:

-&lt;ul&gt;

-&lt;li&gt;&lt;b&gt;local&lt;/b&gt; - the content of the form will be loaded from the body text of the element.&lt;/li&gt;

-&lt;li&gt;&lt;b&gt;remote&lt;/b&gt; - the content of the form will be downloaded using the specified URL.&lt;/li&gt;

-&lt;li&gt;&lt;b&gt;custom&lt;/b&gt; - the form will be created by loading the class specified by the &lt;samp&gt;class&lt;/samp&gt; attribute that implements IPortalSection interface.&lt;/li&gt;

-&lt;li&gt;&lt;b&gt;dynamic&lt;/b&gt; - the form will be created by loading the class specified by the &lt;samp&gt;class&lt;/samp&gt; attribute that implements IFormContentProvider interface.&lt;/li&gt;

-&lt;/ul&gt;

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="local">

-                  </enumeration>

-                  <enumeration value="remote">

-                  </enumeration>

-                  <enumeration value="custom">

-                  </enumeration>

-                  <enumeration value="dynamic">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="url" type="string">

-            <annotation>

-               <documentation>

-                  If &lt;samp&gt;type&lt;/samp&gt; is &lt;samp&gt;remote&lt;/samp&gt;, the content of the form will be downloaded from the specified URL.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.welcome.internal.portal.IPortalSection"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/ShowWelcomePageAction.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/ShowWelcomePageAction.java
deleted file mode 100644
index 70ec5ba..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/ShowWelcomePageAction.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.welcome.internal;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.*;
-import org.eclipse.welcome.internal.portal.WelcomePortalEditorInput;
-
-/**
- * Our sample action implements workbench action delegate.
- * The action proxy will be created by the workbench and
- * shown in the UI. When the user tries to use the action,
- * this delegate will be created and execution will be 
- * delegated to it.
- * @see IWorkbenchWindowActionDelegate
- */
-public class ShowWelcomePageAction implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-	/**
-	 * The constructor.
-	 */
-	public ShowWelcomePageAction() {
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		try {
-			WelcomePortal.getActivePage().openEditor(
-				new WelcomePortalEditorInput(),
-				"org.eclipse.welcome.portal");
-		} catch (PartInitException e) {
-			WelcomePortal.logException(e);
-		}
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortal.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortal.java
deleted file mode 100644
index 06a2f00..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortal.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.welcome.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.welcome.internal.webbrowser.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WelcomePortal extends AbstractUIPlugin {
-	public static final String PLUGIN_ID = "org.eclipse.update.ui.win32";
-	public static final String ID_BROWSER = PLUGIN_ID + "WebBrowser";
-	
-	//The shared instance.
-	private static WelcomePortal plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IStartup#earlyStartup()
-	 */
-	public static void showURL(String name, String url) {
-		try {
-			WelcomePortal.getActivePage().openEditor(
-				new WebBrowserEditorInput(name, url),
-				"org.eclipse.welcome.webbrowser");
-		} catch (PartInitException e) {
-			WelcomePortal.logException(e);
-		}
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public WelcomePortal(IPluginDescriptor descriptor) {
-		super(descriptor);
-		plugin = this;
-		try {
-			resourceBundle =
-				ResourceBundle.getBundle(
-					"org.eclipse.welcome.internal.WelcomePortalResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WelcomePortal getDefault() {
-		return plugin;
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		return getDefault().internalGetActivePage();
-	}
-
-	private IWorkbenchPage internalGetActivePage() {
-		IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
-		if (window != null)
-			return window.getActivePage();
-		return null;
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		return window != null ? window.getShell() : null;
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public static String getPluginId() {
-		return getDefault().getDescriptor().getUniqueIdentifier();
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getString(String key) {
-		ResourceBundle bundle = WelcomePortal.getDefault().getResourceBundle();
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static String getFormattedMessage(String key, String[] args) {
-		String text = getString(key);
-		return java.text.MessageFormat.format(text, args);
-	}
-
-	public static String getFormattedMessage(String key, String arg) {
-		String text = getString(key);
-		return java.text.MessageFormat.format(text, new String[] { arg });
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	public void startup() throws CoreException {
-	}
-
-	public void shutdown() throws CoreException {
-	}
-
-	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 (status.getSeverity() != IStatus.INFO) {
-			if (showErrorDialog)
-				ErrorDialog.openError(
-					getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			//ResourcesPlugin.getPlugin().getLog().log(status);
-			Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status);
-		} else {
-			MessageDialog.openInformation(
-				getActiveWorkbenchShell(),
-				null,
-				status.getMessage());
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalImages.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalImages.java
deleted file mode 100644
index 3675f4b..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalImages.java
+++ /dev/null

@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.welcome.internal;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Bundle of all images used by the PDE plugin.
- */
-public class WelcomePortalImages {
-
-
-	private static final String NAME_PREFIX= WelcomePortal.getPluginId()+".";
-
-	private final static URL BASE_URL = WelcomePortal.getDefault().getDescriptor().getInstallURL();
-
-
-	private static ImageRegistry PLUGIN_REGISTRY;
-	
-	public final static String ICONS_PATH = "icons/full/";
-
-	/**
-	 * Set of predefined Image Descriptors.
-	 */
-	
-	private static final String PATH_OBJ= ICONS_PATH+"obj16/";
-	private static final String PATH_VIEW = ICONS_PATH+"cview16/";
-	private static final String PATH_LCL= ICONS_PATH+"elcl16/";
-	private static final String PATH_LCL_HOVER= ICONS_PATH+"clcl16/";
-	private static final String PATH_LCL_DISABLED= ICONS_PATH+"dlcl16/";
-	private static final String PATH_TOOL = ICONS_PATH + "etool16/";
-	private static final String PATH_TOOL_HOVER = ICONS_PATH + "ctool16/";
-	private static final String PATH_TOOL_DISABLED = ICONS_PATH + "dtool16/";
-	private static final String PATH_OVR = ICONS_PATH + "ovr16/";
-	private static final String PATH_WIZBAN = ICONS_PATH + "wizban/";
-	public static final String PATH_FORMS = ICONS_PATH + "forms/";
-
-
-	/**
-	 * Frequently used images
-	 */
-	public static final String IMG_FORM_BANNER = NAME_PREFIX+"FORM_BANNER";
-	public static final String IMG_FORM_BANNER_SHORT = NAME_PREFIX+"FORM_BANNER_SHORT";
-	public static final String IMG_FORM_UNDERLINE = NAME_PREFIX + "FORM_UNDERLINE";
-
-	/**
-	 * OBJ16
-	 */
-	public static final ImageDescriptor DESC_APP_OBJ = create(PATH_OBJ, "app_obj.gif");
-	public static final ImageDescriptor DESC_BFOLDER_OBJ = create(PATH_OBJ, "bfolder_obj.gif");
-	public static final ImageDescriptor DESC_CATEGORY_OBJ = create(PATH_OBJ, "category_obj.gif");
-	public static final ImageDescriptor DESC_CD_OBJ = create(PATH_OBJ, "cd_obj.gif");
-	public static final ImageDescriptor DESC_COMPUTER_OBJ = create(PATH_OBJ, "computer_obj.gif");
-	public static final ImageDescriptor DESC_CONFIG_OBJ = create(PATH_OBJ, "config_obj.gif");
-	public static final ImageDescriptor DESC_FEATURE_OBJ = create(PATH_OBJ, "feature_obj.gif");
-	public static final ImageDescriptor DESC_EFIX_OBJ = create(PATH_OBJ, "efix2_obj.gif");
-	public static final ImageDescriptor DESC_FLOPPY_OBJ = create(PATH_OBJ, "floppy_obj.gif");
-	public static final ImageDescriptor DESC_HISTORY_OBJ = create(PATH_OBJ, "history_obj.gif");
-	public static final ImageDescriptor DESC_LSITE_OBJ = create(PATH_OBJ, "lsite_obj.gif");
-	public static final ImageDescriptor DESC_PSITE_OBJ = create(PATH_OBJ, "psite_obj.gif");
-	public static final ImageDescriptor DESC_ESITE_OBJ = create(PATH_OBJ, "esite_obj.gif");
-	public static final ImageDescriptor DESC_SITE_OBJ = create(PATH_OBJ, "site_obj.gif");
-	public static final ImageDescriptor DESC_WEB_SITE_OBJ = create(PATH_OBJ, "web_bkmrk_obj.gif");
-	public static final ImageDescriptor DESC_PLACES_OBJ = create(PATH_OBJ, "places_obj.gif");
-	public static final ImageDescriptor DESC_SAVED_OBJ = create(PATH_OBJ, "saved_obj.gif");
-	public static final ImageDescriptor DESC_UNCONF_FEATURE_OBJ = create(PATH_OBJ, "unconf_feature_obj.gif");
-	public static final ImageDescriptor DESC_UPDATES_OBJ = create(PATH_OBJ, "updates_obj.gif");
-	public static final ImageDescriptor DESC_VFIXED_OBJ = create(PATH_OBJ, "vfixed_obj.gif");
-	public static final ImageDescriptor DESC_VREMOTE_OBJ = create(PATH_OBJ, "vremote_obj.gif");
-	public static final ImageDescriptor DESC_VREMOVABLE_OBJ = create(PATH_OBJ, "vremovable_obj.gif");
-	public static final ImageDescriptor DESC_NOTINST_FEATURE_OBJ = create(PATH_OBJ, "notinstalled_feature_obj.gif");	
-	public static final ImageDescriptor DESC_SHOW_SEARCH = create(PATH_OBJ, "tsearch_obj.gif");
-	public static final ImageDescriptor DESC_ERR_ST_OBJ = create(PATH_OBJ, "error_st_obj.gif");
-	public static final ImageDescriptor DESC_OK_ST_OBJ = create(PATH_OBJ, "ok_st_obj.gif");
-
-	
-	/**
-	 * OVR16
-	 */
-	public static final ImageDescriptor DESC_LINKED_CO   = create(PATH_OVR, "linked_co.gif");
-	public static final ImageDescriptor DESC_UPDATED_CO   = create(PATH_OVR, "updated_co.gif");
-	public static final ImageDescriptor DESC_INSTALLABLE_CO = create(PATH_OVR, "installable_co.gif");
-	public static final ImageDescriptor DESC_CURRENT_CO = create(PATH_OVR, "current_co.gif");
-	public static final ImageDescriptor DESC_ERROR_CO = create(PATH_OVR, "error_co.gif");
-	public static final ImageDescriptor DESC_WARNING_CO = create(PATH_OVR, "warning_co.gif");
-	public static final ImageDescriptor DESC_MOD_CO = create(PATH_OVR, "mod_co.gif");
-	public static final ImageDescriptor DESC_ADD_CO = create(PATH_OVR, "add_stat.gif");
-	public static final ImageDescriptor DESC_DEL_CO = create(PATH_OVR, "del_stat.gif");
-	public static final ImageDescriptor DESC_UNCONF_CO = create(PATH_OVR, "unconfigured_co.gif");
-
-	/**
-	 * VIEW16
-	 */
-
-	public static final ImageDescriptor DESC_CONFIGS_VIEW = create(PATH_VIEW, "configs.gif");
-	public static final ImageDescriptor DESC_SITES_VIEW = create(PATH_VIEW, "updates.gif");
-	public static final ImageDescriptor DESC_SELECTED_UPDATES_VIEW = create(PATH_VIEW, "selected_updates.gif");
-
-	/**
-	 * LCL
-	 */
-	public static final ImageDescriptor DESC_BACKWARD_NAV = create(PATH_LCL, "backward_nav.gif");
-	public static final ImageDescriptor DESC_BACKWARD_NAV_H = create(PATH_LCL_HOVER, "backward_nav.gif");
-	public static final ImageDescriptor DESC_BACKWARD_NAV_D = create(PATH_LCL_DISABLED, "backward_nav.gif");
-	public static final ImageDescriptor DESC_FORWARD_NAV = create(PATH_LCL, "forward_nav.gif");
-	public static final ImageDescriptor DESC_FORWARD_NAV_H = create(PATH_LCL_HOVER, "forward_nav.gif");
-	public static final ImageDescriptor DESC_FORWARD_NAV_D = create(PATH_LCL_DISABLED, "forward_nav.gif");
-	public static final ImageDescriptor DESC_HOME_NAV = create(PATH_LCL, "home_nav.gif");
-	public static final ImageDescriptor DESC_HOME_NAV_H = create(PATH_LCL_HOVER, "home_nav.gif");
-	public static final ImageDescriptor DESC_HOME_NAV_D = create(PATH_LCL_DISABLED, "home_nav.gif");
-	public static final ImageDescriptor DESC_REFRESH_NAV = create(PATH_LCL, "refresh_nav.gif");
-	public static final ImageDescriptor DESC_REFRESH_NAV_H = create(PATH_LCL_HOVER, "refresh_nav.gif");
-	public static final ImageDescriptor DESC_REFRESH_NAV_D = create(PATH_LCL_DISABLED, "refresh_nav.gif");
-	public static final ImageDescriptor DESC_STOP_NAV = create(PATH_LCL, "stop_nav.gif");
-	public static final ImageDescriptor DESC_STOP_NAV_H = create(PATH_LCL_HOVER, "stop_nav.gif");
-	public static final ImageDescriptor DESC_STOP_NAV_D = create(PATH_LCL_DISABLED, "stop_nav.gif");
-	public static final ImageDescriptor DESC_GO_NAV = create(PATH_LCL, "go_nav.gif");
-	public static final ImageDescriptor DESC_GO_NAV_H = create(PATH_LCL_HOVER, "go_nav.gif");
-	public static final ImageDescriptor DESC_GO_NAV_D = create(PATH_LCL_DISABLED, "go_nav.gif");
-	public static final ImageDescriptor DESC_SHOW_UNCONF = create(PATH_LCL, "show_unconf.gif");
-	public static final ImageDescriptor DESC_SHOW_UNCONF_H = create(PATH_LCL_HOVER, "show_unconf.gif");
-	public static final ImageDescriptor DESC_SHOW_UNCONF_D = create(PATH_LCL_DISABLED, "show_unconf.gif");
-	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.gif");
-	public static final ImageDescriptor DESC_SHOW_HIERARCHY = create(PATH_LCL, "hierarchicalLayout.gif");
-	public static final ImageDescriptor DESC_SHOW_HIERARCHY_H = create(PATH_LCL_HOVER, "hierarchicalLayout.gif");
-	public static final ImageDescriptor DESC_SHOW_HIERARCHY_D = create(PATH_LCL_DISABLED, "hierarchicalLayout.gif");
-
-	/**
-	 * WIZ
-	 */
-	public static final ImageDescriptor DESC_INSTALL_WIZ  = create(PATH_WIZBAN, "install_wiz.gif");
-	public static final ImageDescriptor DESC_UPDATE_WIZ  = create(PATH_WIZBAN, "update_wiz.gif");
-	public static final ImageDescriptor DESC_CONFIG_WIZ  = create(PATH_WIZBAN, "config_wiz.gif");
-	public static final ImageDescriptor DESC_UNINSTALL_WIZ  = create(PATH_WIZBAN, "uninstall_wiz.gif");
-	public static final ImageDescriptor DESC_INSTALL_BANNER  = create(PATH_WIZBAN, "def_wizban.jpg");
-	public static final ImageDescriptor DESC_FORM_BANNER  = create(PATH_FORMS, "form_banner.jpg");
-	public static final ImageDescriptor DESC_FORM_BANNER_SHORT  = create(PATH_FORMS, "form_banner.gif");
-	public static final ImageDescriptor DESC_FORM_UNDERLINE  = create(PATH_FORMS, "form_underline2.jpg");
-	public static final ImageDescriptor DESC_PROVIDER = create(PATH_FORMS, "def_provider.jpg");
-	public static final ImageDescriptor DESC_ITEM = create(PATH_FORMS, "topic.gif");
-	public static final ImageDescriptor DESC_NEW_BOOKMARK  = create(PATH_WIZBAN, "new_bookmark_wiz.gif");
-	public static final ImageDescriptor DESC_NEW_FOLDER  = create(PATH_WIZBAN, "new_folder_wiz.gif");
-	public static final ImageDescriptor DESC_NEW_SEARCH  = create(PATH_WIZBAN, "new_search_wiz.gif");
-
-	private static ImageDescriptor create(String prefix, String name) {
-		return ImageDescriptor.createFromURL(makeImageURL(prefix, name));
-	}
-
-
-	public static Image get(String key) {
-		if (PLUGIN_REGISTRY==null) initialize();
-		return PLUGIN_REGISTRY.get(key);
-	}
-
-
-public static ImageDescriptor getImageDescriptorFromPlugin(
-	IPluginDescriptor pluginDescriptor, 
-	String subdirectoryAndFilename) {
-	URL installURL = pluginDescriptor.getInstallURL();
-	try {
-		URL newURL = new URL(installURL, subdirectoryAndFilename);
-		return ImageDescriptor.createFromURL(newURL);
-	}
-	catch (MalformedURLException e) {
-	}
-	return null;
-}
-
-
-public static Image getImageFromPlugin(
-	IPluginDescriptor pluginDescriptor,
-	String subdirectoryAndFilename) {
-	URL installURL = pluginDescriptor.getInstallURL();
-	Image image = null;
-	try {
-		URL newURL = new URL(installURL, subdirectoryAndFilename);
-		String key = newURL.toString();
-		if (PLUGIN_REGISTRY==null) initialize();
-		image = PLUGIN_REGISTRY.get(key);
-		if (image==null) {
-			ImageDescriptor desc = ImageDescriptor.createFromURL(newURL);
-			image = desc.createImage();
-			PLUGIN_REGISTRY.put(key, image);
-		}
-	}
-	catch (MalformedURLException e) {
-	}
-	return image;
-}
-/* package */
-private static final void initialize() {
-	PLUGIN_REGISTRY = new ImageRegistry();
-	manage(IMG_FORM_BANNER_SHORT, DESC_FORM_BANNER_SHORT);
-	manage(IMG_FORM_BANNER, DESC_FORM_BANNER);
-	manage(IMG_FORM_UNDERLINE, DESC_FORM_UNDERLINE);
-}
-
-
-private static URL makeImageURL(String prefix, String name) {
-	String path = prefix + name;
-	URL url = null;
-	try {
-		url = new URL(BASE_URL, path);
-	}
-	catch (MalformedURLException e) {
-		return null;
-	}
-	return url;
-}
-
-public static Image manage(String key, ImageDescriptor desc) {
-	Image image = desc.createImage();
-	PLUGIN_REGISTRY.put(key, image);
-	return image;
-}
-
-public static URL getDefaultProviderImageURL() {
-	URL url = makeImageURL(PATH_FORMS, "def_provider.jpg");
-	try {
-		url = Platform.resolve(url);
-	}
-	catch (IOException e) {
-	}
-	return url; 
-}
-
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalResources.properties b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalResources.properties
deleted file mode 100644
index 491ee42..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/WelcomePortalResources.properties
+++ /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
-###############################################################################
-# 
-#
-#
-
-BrowserPage.address = Address:
-BrowserPage.stop = Stop
-BrowserPage.go = Go
-BrowserPage.refresh = Refresh
-
-WebBrowserView.notAvailable = Embedded Web browser is not available. \
-Requiests for opening URLs are processed using Web browser registered to handle \
-Web pages on your system.
-WebBrowserView.address = Address:
-WebBrowserView.stop = Stop
-WebBrowserView.go = Go
-WebBrowserView.home = Go Home
-WebBrowserView.refresh = Refresh
-WebBrowserView.backward = Go Back
-WebBrowserView.forward = Go Forward
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/TipsAndTricksContentProvider.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/TipsAndTricksContentProvider.java
deleted file mode 100644
index 65b3b9a..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/TipsAndTricksContentProvider.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*
- * Created on Jun 20, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.actions;
-
-import java.io.*;
-import java.util.ArrayList;
-
-import org.eclipse.ui.internal.*;
-import org.eclipse.welcome.internal.WelcomePortal;
-import org.eclipse.welcome.internal.portal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class TipsAndTricksContentProvider implements IFormContentProvider {
-	private IFormContentObserver observer;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.portal.IFormContentProvider#getContent()
-	 */
-	public String getContent() {
-		/*
-		// Ask the user to select a feature
-		AboutInfo[] features = ((Workbench) WelcomePortal.getDefault().getWorkbench()).getConfigurationInfo().getFeaturesInfo();
-		ArrayList welcomeFeatures = new ArrayList();
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		writer.println("<form>");
-		for (int i = 0; i < features.length; i++) {
-			AboutInfo feature = features[i];
-			if (feature.getWelcomePageURL() != null) {
-				addFeatureLink(writer, feature);
-			}
-		}
-		writer.println("</form>");
-		writer.close();
-		return swriter.toString();
-		*/
-		return "<form></form>";
-	}
-
-	private void addFeatureLink(PrintWriter writer, AboutInfo feature) {
-		String name = feature.getFeatureLabel();
-		String href = feature.getTipsAndTricksHref();
-		if (href==null) return;
-		writer.print("<li>");
-		writer.print("<a href=\"help\" arg=\""+href+"\">"+name+"</a>");
-		writer.println("</li>");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.portal.IFormContentProvider#setContentObserver(org.eclipse.welcome.internal.portal.IFormContentObserver)
-	 */
-	public void setContentObserver(IFormContentObserver observer) {
-		this.observer = observer;
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/WelcomeContentProvider.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/WelcomeContentProvider.java
deleted file mode 100644
index 59c2d79..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/actions/WelcomeContentProvider.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*
- * Created on Jun 20, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.actions;
-
-import java.io.*;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.ui.internal.*;
-import org.eclipse.welcome.internal.WelcomePortal;
-import org.eclipse.welcome.internal.portal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WelcomeContentProvider implements IFormContentProvider {
-	private IFormContentObserver observer;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.portal.IFormContentProvider#getContent()
-	 */
-	public String getContent() {
-		/*
-		// Ask the user to select a feature
-		AboutInfo[] features = ((Workbench) WelcomePortal.getDefault().getWorkbench()).getConfigurationInfo().getFeaturesInfo();
-		ArrayList welcomeFeatures = new ArrayList();
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		writer.println("<form>");
-		for (int i = 0; i < features.length; i++) {
-			AboutInfo feature = features[i];
-			if (feature.getWelcomePageURL() != null) {
-				addFeatureLink(writer, feature);
-			}
-		}
-		writer.println("</form>");
-		/*
-
-		if (perspectiveId != null) {
-			try {
-				page = (WorkbenchPage) window.getWorkbench().showPerspective(perspectiveId, window);
-			} catch (WorkbenchException e) {
-				return;
-			}
-		}
-
-		page.setEditorAreaVisible(true);
-
-		// create input
-		WelcomeEditorInput input = new WelcomeEditorInput(feature);
-
-		// see if we already have a welcome editor
-		IEditorPart editor = page.findEditor(input);
-		if (editor != null) {
-			page.activate(editor);
-			return;
-		}
-
-		try {
-			page.openEditor(input, EDITOR_ID);
-		} catch (PartInitException e) {
-			IStatus status = new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH, 1, WorkbenchMessages.getString("QuickStartAction.openEditorException"), e); //$NON-NLS-1$
-			ErrorDialog.openError(
-				window.getShell(),
-				WorkbenchMessages.getString("Workbench.openEditorErrorDialogTitle"),  //$NON-NLS-1$
-				WorkbenchMessages.getString("Workbench.openEditorErrorDialogMessage"), //$NON-NLS-1$
-				status);
-		}
-		writer.close();
-		return swriter.toString();
-		*/
-		return "<form></form>";
-	}
-
-	private void addFeatureLink(PrintWriter writer, AboutInfo feature) {
-		String name = feature.getFeatureLabel();
-		URL welcomeURL = feature.getWelcomePageURL();
-		String action = "";
-		writer.print("<li>");
-		writer.print("<a href=\"action\">"+name+"</a>");
-		writer.println("</li>");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.portal.IFormContentProvider#setContentObserver(org.eclipse.welcome.internal.portal.IFormContentObserver)
-	 */
-	public void setContentObserver(IFormContentObserver observer) {
-		this.observer = observer;
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/HelpSection.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/HelpSection.java
deleted file mode 100644
index 393de2b..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/HelpSection.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*
- * Created on Jun 20, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.update.ui.forms.internal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class HelpSection implements IPortalSectionForm {
-	private Text phraseText;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.portal.IPortalSection#init(org.eclipse.update.ui.forms.internal.IFormPage)
-	 */
-	public void init(IFormPage page) {
-	}
-	
-	public void dispose() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.portal.IPortalSection#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createControl(Composite parent, FormWidgetFactory factory) {
-		Composite container = factory.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginWidth = 0;
-		container.setLayout(layout);
-		factory.createLabel(container, "Phrase:");
-		phraseText = factory.createText(container, "");
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		phraseText.setLayoutData(gd);
-		final Button button = factory.createButton(container, "Go", SWT.PUSH);
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				doSearch(phraseText.getText());
-			}
-		});
-		button.setEnabled(false);
-		phraseText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String text=phraseText.getText();
-				button.setEnabled(text.length()>0);
-			}
-		});
-		phraseText.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent e) {
-				if (e.character=='\r') {
-					if (button.isEnabled())
-						doSearch(phraseText.getText());
-				}
-			}
-		});
-		factory.paintBordersFor(container);
-		return container;
-	}
-	private void doSearch(String phrase) {
-		try {
-			String ephrase = URLEncoder.encode(phrase, "UTF-8");
-			String query = "tab=search&searchWord="+ephrase;
-			WorkbenchHelp.getHelpSupport().displayHelpResource(query);
-		}
-		catch (UnsupportedEncodingException e) {
-			System.out.println(e);
-		}
-	} 
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentObserver.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentObserver.java
deleted file mode 100644
index ba7801b..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentObserver.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*
- * Created on Jun 20, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public interface IFormContentObserver {
-	public void contentChanged(IFormContentProvider provider);
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentProvider.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentProvider.java
deleted file mode 100644
index 15e85ee..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IFormContentProvider.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*
- * Created on Jun 20, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public interface IFormContentProvider {
-	String getContent();
-	void setContentObserver(IFormContentObserver observer);
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IPortalSectionForm.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IPortalSectionForm.java
deleted file mode 100644
index a7d77a6..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/IPortalSectionForm.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.ui.forms.internal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public interface IPortalSectionForm {
-	void init(IFormPage page);
-	Control createControl(Composite parent, FormWidgetFactory factory);
-	void dispose();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/PortalSection.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/PortalSection.java
deleted file mode 100644
index b25eaa2..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/PortalSection.java
+++ /dev/null

@@ -1,289 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import java.io.*;
-import java.net.*;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.update.ui.forms.internal.*;
-import org.eclipse.update.ui.forms.internal.engine.*;
-import org.eclipse.welcome.internal.WelcomePortal;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class PortalSection extends FormSection  {
-	private SectionDescriptor desc;
-	private WelcomePortalForm form;
-	private HyperlinkAction eclipseAction;
-	private HTTPAction httpAction;
-	private HyperlinkAction helpAction;
-	private Composite formContainer;
-	private Hashtable eclipseActions;
-
-	class ActionWrapper extends Action {
-		IActionDelegate delegate;
-
-		public ActionWrapper(String arg, IActionDelegate delegate) {
-			super(arg);
-			this.delegate = delegate;
-			if (delegate instanceof IWorkbenchWindowActionDelegate)
-				((IWorkbenchWindowActionDelegate) delegate).init(
-					WelcomePortal.getActiveWorkbenchWindow());
-		}
-		public void run() {
-			delegate.run(this);
-		}
-	}
-
-	public PortalSection(SectionDescriptor desc, WelcomePortalForm form) {
-		this.desc = desc;
-		this.form = form;
-		setDescriptionPainted(false);
-		setCollapsable(true);
-		setHeaderText(desc.getName());
-		makeHyperlinkActions();
-	}
-
-	private void makeHyperlinkActions() {
-		IActionBars bars =
-			form.getPortal().getEditor().getEditorSite().getActionBars();
-		httpAction = new HTTPAction() {
-			public void linkActivated(IHyperlinkSegment link) {
-				String url = link.getArg();
-				if (url != null)
-					WelcomePortal.showURL(link.getText(), url);
-			}
-		};
-		httpAction.setStatusLineManager(bars.getStatusLineManager());
-		eclipseAction = new HyperlinkAction() {
-			public void linkActivated(IHyperlinkSegment link) {
-				String arg = link.getArg();
-				if (arg != null)
-					runEclipseAction(arg);
-			}
-		};
-		eclipseAction.setStatusLineManager(bars.getStatusLineManager());
-		helpAction = new HyperlinkAction() {
-			public void linkActivated(IHyperlinkSegment link) {
-				String arg = link.getArg();
-				if (arg != null)
-					openEclipseHelp(arg);
-			}
-		};
-		helpAction.setStatusLineManager(bars.getStatusLineManager());
-	}
-	public Composite createClient(
-		Composite parent,
-		FormWidgetFactory factory) {
-		IConfigurationElement config = desc.getConfig();
-		formContainer = factory.createComposite(parent);
-		HTMLTableLayout layout = new HTMLTableLayout();
-		formContainer.setLayout(layout);
-		layout.topMargin = layout.bottomMargin = 0;
-		layout.leftMargin = layout.rightMargin = 0;
-		IConfigurationElement[] children = config.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IConfigurationElement child = children[i];
-			if (child.getName().equals("form")) {
-				createForm(formContainer, child, factory);
-			}
-		}
-		return formContainer;
-	}
-
-	private void createForm(
-		final Composite parent,
-		IConfigurationElement config,
-		FormWidgetFactory factory) {
-		String type = config.getAttribute("type");
-		if (type != null && type.equals("custom")) {
-			createCustomForm(parent, config, factory);
-			return;
-		}
-		final FormEngine engine = factory.createFormEngine(parent);
-		//engine.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_CYAN));
-		engine.setHyperlinkSettings(factory.getHyperlinkHandler());
-		TableData td = new TableData(TableData.FILL, TableData.TOP);
-		td.grabHorizontal = true;
-		engine.setLayoutData(td);
-		engine.registerTextObject("url", httpAction);
-		engine.registerTextObject("action", eclipseAction);
-		engine.registerTextObject("help", helpAction);
-		if (type == null || type.equals("local")) {
-			String value = config.getValue();
-			engine.load("<form>" + value + "</form>", true, false);
-		} else if (type.equals("dynamic")) {
-			IFormContentProvider provider = createContentProvider(config);
-			if (provider!=null) {
-				engine.load(provider.getContent(), true, false);
-				provider.setContentObserver(new IFormContentObserver() {
-					public void contentChanged(IFormContentProvider provider) {
-						engine.load(provider.getContent(), true, false);
-						reflow();
-					}
-				});
-			}
-		} else if (type.equals("remote")) {
-			String urlName = config.getAttribute("url");
-			try {
-				final URL url = new URL(urlName);
-				Runnable loader = new Runnable() {
-					public void run() {
-						InputStream is = null;
-						try {
-							is = url.openStream();
-							engine.load(is, false);
-							parent.getDisplay().syncExec(new Runnable() {
-								public void run() {
-									reflow();
-								}
-							});
-						} catch (final IOException e) {
-							parent.getDisplay().syncExec(new Runnable() {
-								public void run() {
-									WelcomePortal.logException(e);
-								}
-							});
-
-						} finally {
-							try {
-								if (is != null)
-									is.close();
-							} catch (IOException e) {
-							}
-						}
-					}
-				};
-				Thread t = new Thread(loader);
-				t.start();
-			} catch (MalformedURLException e) {
-				WelcomePortal.logException(e);
-			}
-		}
-	}
-
-	private void createCustomForm(
-		Composite parent,
-		IConfigurationElement config,
-		FormWidgetFactory factory) {
-		try {
-			Object obj = config.createExecutableExtension("class");
-			if (obj instanceof IPortalSectionForm) {
-				IPortalSectionForm psection = (IPortalSectionForm) obj;
-				//psection.init(form.getPortal());
-				Control control = psection.createControl(parent, factory);
-				TableData td = new TableData(TableData.FILL, TableData.TOP);
-				td.grabHorizontal = true;
-				control.setLayoutData(td);
-			}
-		} catch (CoreException e) {
-			WelcomePortal.logException(e);
-		}
-	}
-	
-	private IFormContentProvider createContentProvider(IConfigurationElement config) {
-		try {
-			Object obj = config.createExecutableExtension("class");
-			if (obj instanceof IFormContentProvider) {
-				return (IFormContentProvider) obj;
-			}
-		} catch (CoreException e) {
-			WelcomePortal.logException(e);
-		}
-		return null;
-	}
-	protected void reflow() {
-		formContainer.layout();
-		super.reflow();
-		form.updateSize();
-	}
-
-	private void runEclipseAction(final String arg) {
-		BusyIndicator
-			.showWhile(form.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				final IAction action = getEclipseAction(arg);
-				if (action != null)
-					action.run();
-			}
-		});
-	}
-
-	private IAction getEclipseAction(String arg) {
-		if (eclipseActions == null) {
-			eclipseActions = new Hashtable();
-		}
-		IAction action = (IAction) eclipseActions.get(arg);
-		if (action != null)
-			return action;
-		// load
-		int col = arg.indexOf(':');
-		String pluginId = arg.substring(0, col);
-		String className = arg.substring(col + 1);
-		IPluginDescriptor desc =
-			Platform.getPluginRegistry().getPluginDescriptor(pluginId);
-		if (desc == null) {
-			logActionLinkError(pluginId, className);
-			return null;
-		}
-		Class actionClass;
-		try {
-			actionClass = desc.getPluginClassLoader().loadClass(className);
-		} catch (ClassNotFoundException e) {
-			logActionLinkError(pluginId, className);
-			return null;
-		}
-		try {
-			Object obj = actionClass.newInstance();
-			if (obj instanceof IAction)
-				action = (IAction) obj;
-			else
-				action = new ActionWrapper(arg, (IActionDelegate) obj);
-		} catch (InstantiationException e) {
-			logActionLinkError(pluginId, className);
-			return null;
-		} catch (IllegalAccessException e) {
-			logActionLinkError(pluginId, className);
-			return null;
-		} catch (ClassCastException e) {
-			logActionLinkError(pluginId, className);
-			return null;
-		}
-		eclipseActions.put(arg, action);
-		return action;
-	}
-
-	private void logActionLinkError(String pluginId, String className) {
-		IStatus status =
-			new Status(
-				IStatus.ERROR,
-				WelcomePortal.getPluginId(),
-				IStatus.OK,
-				"Unable to load class "
-					+ className
-					+ " from plug-in "
-					+ pluginId
-					+ ".",
-				null);
-		WelcomePortal.log(status, true);
-	}
-	
-	private void openEclipseHelp(String arg) {
-		WorkbenchHelp.getHelpSupport().displayHelpResource(arg);
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/SectionDescriptor.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/SectionDescriptor.java
deleted file mode 100644
index 1f497b0..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/SectionDescriptor.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class SectionDescriptor {
-	private IConfigurationElement config;
-	
-	public SectionDescriptor(IConfigurationElement config) {
-		this.config = config;
-	}
-	
-	public String getId() {
-		return config.getAttribute("id");
-	}
-	
-	public String getName() {
-		return config.getAttribute("name");
-	}
-	public IConfigurationElement getConfig() {
-		return config;
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditor.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditor.java
deleted file mode 100644
index 23412e6..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditor.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.*;
-import org.eclipse.ui.part.EditorPart;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WelcomePortalEditor extends EditorPart {
-	private WelcomePortalPart welcomePart;
-	
-	public WelcomePortalEditor() {
-		welcomePart = new WelcomePortalPart(this);
-	}
-
-	public void dispose() {
-		if (welcomePart!=null)
-			welcomePart.dispose();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorPart#gotoMarker(org.eclipse.core.resources.IMarker)
-	 */
-	public void gotoMarker(IMarker marker) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input)
-		throws PartInitException {
-		if (!(input instanceof WelcomePortalEditorInput))
-			throw new PartInitException("Invalid Input: Must be WelcomePortalEditorInput");
-		setSite(site);
-		setInput(input);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isDirty()
-	 */
-	public boolean isDirty() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		welcomePart.createControl(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInput.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInput.java
deleted file mode 100644
index 93f1f42..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInput.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.welcome.internal.portal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.*;
-/**
- * A simple editor input for the welcome editor
- */
-public class WelcomePortalEditorInput implements IEditorInput {
-	private final static String FACTORY_ID = "org.eclipse.welcome.internal.portal.WelcomePortalEditorInputFactory"; //$NON-NLS-1$
-	/**
-	 * WelcomeEditorInput constructor comment.
-	 */
-	public WelcomePortalEditorInput() {
-	}
-	public boolean exists() {
-		return false;
-	}
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-	public String getName() {
-		return "Welcome";
-	}
-	public boolean equals(Object obj) {
-		if (obj==null) return false;
-		if (obj == this) return true;
-		if (obj instanceof WelcomePortalEditorInput) {
-			WelcomePortalEditorInput wobj = (WelcomePortalEditorInput)obj;
-			return true;
-		}
-		return false;
-	}
-	public IPersistableElement getPersistable() {
-		return new IPersistableElement() {
-			public String getFactoryId() {
-				return FACTORY_ID;
-			}
-			public void saveState(IMemento memento) {
-			}
-		};
-	}
-	public String getToolTipText() {
-		return getName();
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInputFactory.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInputFactory.java
deleted file mode 100644
index 30c76f3..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalEditorInputFactory.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IElementFactory;
-
-/**
- */
-public class WelcomePortalEditorInputFactory implements IElementFactory {
-	/**
-	 */
-	public WelcomePortalEditorInputFactory() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
-	 */
-	public IAdaptable createElement(IMemento memento) {
-		return new WelcomePortalEditorInput();
-	}
-
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalForm.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalForm.java
deleted file mode 100644
index e4a44b0..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalForm.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.ui.forms.internal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WelcomePortalForm extends WebForm {
-	private WelcomePortalPart portal;
-	private IConfigurationElement pageConfig;
-
-	public WelcomePortalForm(WelcomePortalPart portal, IConfigurationElement pageConfig) {
-		this.portal = portal;
-		this.pageConfig = pageConfig;
-		setHeadingVisible(false);
-	}
-	
-	public void initialize(Object model) {
-		update();
-	}
-	
-	public WelcomePortalPart getPortal() {
-		return portal;
-	}
-	
-	protected void createContents(Composite parent) {
-		HTMLTableLayout layout = new HTMLTableLayout();
-		parent.setLayout(layout);
-		layout.numColumns = getInteger(pageConfig, "numColumns", 1);
-		layout.topMargin = 0;
-		layout.leftMargin = layout.rightMargin = 10;
-		layout.horizontalSpacing=15;
-		layout.verticalSpacing = 5;
-		//parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_GREEN));
-		layout.makeColumnsEqualWidth=true;
-		SelectableFormLabel customize = getFactory().createSelectableLabel(parent, "Customize...");
-		getFactory().turnIntoHyperlink(customize, new HyperlinkAdapter() {
-			public void linkActivated(Control link) {
-			}
-		});
-		TableData td = new TableData();
-		td.align = TableData.CENTER;
-		td.colspan = layout.numColumns;
-		customize.setLayoutData(td);
-		
-		IConfigurationElement [] sectionRefs = pageConfig.getChildren("section");
-		for (int i=0; i<sectionRefs.length; i++) {
-			IConfigurationElement sectionRef = sectionRefs[i];
-			String id = sectionRef.getAttribute("id");
-			SectionDescriptor desc = portal.findSection(id);
-			if (desc==null) continue;
-			PortalSection section = new PortalSection(desc, this);
-			Control control = section.createControl(parent, getFactory());
-			int span = getInteger(sectionRef, "span", 1);
-			td = new TableData(TableData.FILL, TableData.TOP);
-			td.colspan = span;
-			td.grabHorizontal = true;
-			control.setLayoutData(td);
-			registerSection(section);
-		}
-	}
-
-	private int getInteger(IConfigurationElement config, String attName, int def) {
-		String value = config.getAttribute(attName);
-		if (value!=null) {
-			try {
-				return Integer.parseInt(value);
-			}
-			catch (NumberFormatException e) {
-			}
-		}
-		return def;
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPage.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPage.java
deleted file mode 100644
index f4334d1..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPage.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.ui.forms.internal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WelcomePortalPage implements IFormPage {
-	private Control control;
-	private String name;
-	private WelcomePortalPart portal;
-	private WelcomePortalForm form;
-	private IConfigurationElement config;
-	private SelectableFormLabel tab;
-	
-	public WelcomePortalPage(WelcomePortalPart portal, IConfigurationElement config) {
-		this.portal = portal;
-		this.form = new WelcomePortalForm(portal, config);
-		this.name = config.getAttribute("name");
-		this.config = config;
-	}
-	
-	public void setTab(SelectableFormLabel tab) {
-		this.tab = tab;
-	}
-	
-	public SelectableFormLabel getTab() {
-		return tab;
-	}
-
-	public boolean becomesInvisible(IFormPage newPage) {
-		return true;
-	}
-
-	public void becomesVisible(IFormPage previousPage) {
-	}
-
-	public void createControl(Composite parent) {
-		this.control = form.createControl(parent);
-		form.initialize(null);
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public String getLabel() {
-		return name;
-	}
-
-	public String getTitle() {
-		return name;
-	}
-
-	public boolean isSource() {
-		return false;
-	}
-
-	public boolean isVisible() {
-		return portal.isVisible(this);
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPart.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPart.java
deleted file mode 100644
index cd36701..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomePortalPart.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.ui.forms.internal.*;
-import org.eclipse.welcome.internal.WelcomePortal;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WelcomePortalPart {
-	private static final int TAB_PADDING = 5;
-	private Hashtable sectionDescriptors;
-	class TabListener implements IHyperlinkListener {
-		public void linkActivated(Control linkLabel) {
-			IFormPage page = (IFormPage) linkLabel.getData();
-			workbook.selectPage(page, false);
-		}
-
-		public void linkEntered(Control linkLabel) {
-		}
-
-		public void linkExited(Control linkLabel) {
-			if (linkLabel==selectedTab)
-				highlightTab(selectedTab, true);
-		}
-	}
-
-	private TabListener tabListener = new TabListener();
-	private Composite tabContainer;
-	private FormWidgetFactory factory;
-	private HyperlinkHandler hhandler;
-	private WelcomePortalEditor editor;
-	private Color tabColor;
-	private NoTabsWorkbook workbook;
-	private SelectableFormLabel selectedTab;
-
-	public WelcomePortalPart(WelcomePortalEditor editor) {
-		factory = new FormWidgetFactory();
-		hhandler = new HyperlinkHandler();
-		workbook = new NoTabsWorkbook();
-		this.editor = editor;
-	}
-	
-	public WelcomePortalEditor getEditor() {
-		return editor;
-	}
-
-	public void dispose() {
-		factory.dispose();
-		hhandler.dispose();
-	}
-	
-	public boolean isVisible(IFormPage page) {
-		return workbook.getCurrentPage().equals(page);
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = factory.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		layout.numColumns = 2;
-		layout.verticalSpacing = 0;
-		layout.horizontalSpacing = 0;
-		container.setLayout(layout);
-		createTitle(container);
-		createTabs(container);
-		workbook.createControl(container);
-		workbook.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		workbook.addFormSelectionListener(new IFormSelectionListener() {
-			public void formSelected(IFormPage page, boolean setFocus) {
-				hightlightTab((WelcomePortalPage) page);
-			}
-		});
-		workbook.selectPage(workbook.getPages()[0], true);
-	}
-
-	private void createTitle(Composite parent) {
-		WelcomeTitleArea title = new WelcomeTitleArea(parent, SWT.NULL);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		title.setLayoutData(gd);
-		title.setText("Welcome");
-		title.setBackground(factory.getBackgroundColor());
-		title.setForeground(factory.getForegroundColor());
-		title.setFont(JFaceResources.getHeaderFont());
-	}
-
-	private void createTabs(Composite parent) {
-		tabContainer = factory.createComposite(parent);
-		tabContainer.addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent e) {
-				Point size = tabContainer.getSize();
-				Rectangle tabBounds = selectedTab.getBounds();
-				GC gc = e.gc;
-				gc.setBackground(factory.getBackgroundColor());
-				gc.fillRectangle(0, tabBounds.y-TAB_PADDING, size.x, tabBounds.height+TAB_PADDING+TAB_PADDING);
-			}
-		});
-		tabColor =
-			factory.getColor(FormWidgetFactory.COLOR_COMPOSITE_SEPARATOR);
-		tabContainer.setBackground(tabColor);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 10;
-		layout.marginHeight = TAB_PADDING;
-		layout.verticalSpacing = TAB_PADDING + TAB_PADDING;
-		tabContainer.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_VERTICAL);
-		tabContainer.setLayoutData(gd);
-		hhandler.setBackground(tabColor);
-		hhandler.setForeground(factory.getBackgroundColor());
-		hhandler.setHyperlinkUnderlineMode(
-			HyperlinkSettings.UNDERLINE_ROLLOVER);
-		loadTabs(tabContainer);
-	}
-	
-	private void loadTabs(Composite parent) {
-		IConfigurationElement [] pages = Platform.getPluginRegistry().getConfigurationElementsFor(WelcomePortal.getPluginId(), "welcomePages");
-		for (int i=0; i<pages.length; i++) {
-			createTab(parent, pages[i]);
-		}
-	}
-
-	private void createTab(
-		Composite parent,
-		IConfigurationElement config) {
-		WelcomePortalPage page = new WelcomePortalPage(this, config);
-		SelectableFormLabel tab = factory.createSelectableLabel(parent, page.getTitle());
-		GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		tab.setBackground(tabColor);
-		tab.setForeground(factory.getBackgroundColor());
-		hhandler.registerHyperlink(tab, tabListener);
-		tab.setFont(JFaceResources.getBannerFont());
-		tab.setLayoutData(gd);
-		tab.setData(page);
-		page.setTab(tab);
-		workbook.addPage(page);
-	}
-
-	private void hightlightTab(WelcomePortalPage page) {
-		if (selectedTab != null)
-			highlightTab(selectedTab, false);
-		SelectableFormLabel tab = page.getTab();
-		highlightTab(tab, true);
-		selectedTab = tab;
-		tabContainer.redraw();
-	}
-
-	private void highlightTab(SelectableFormLabel tab, boolean selected) {
-		Color bg = tabColor;
-		Color fg = factory.getBackgroundColor();
-		tab.setForeground(selected ? bg : fg);
-		tab.setBackground(selected ? fg : bg);
-	}
-
-	public SectionDescriptor findSection(String id) {
-		if (sectionDescriptors==null) {
-			sectionDescriptors=new Hashtable();
-			IConfigurationElement [] sections = Platform.getPluginRegistry().getConfigurationElementsFor(WelcomePortal.getPluginId(), "welcomeSections");
-			for (int i=0; i<sections.length; i++) {
-				SectionDescriptor desc = new SectionDescriptor(sections[i]);
-				sectionDescriptors.put(desc.getId(), desc);
-			}
-		}
-		return (SectionDescriptor)sectionDescriptors.get(id);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomeTitleArea.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomeTitleArea.java
deleted file mode 100644
index 8c60003..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/portal/WelcomeTitleArea.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*
- * Created on Jun 19, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.update.ui.forms.internal.FormLabel;
-import org.eclipse.welcome.internal.WelcomePortalImages;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WelcomeTitleArea extends FormLabel {
-	private Image topImage;
-	private Image bottomImage;
-
-	public WelcomeTitleArea(Composite parent, int style) {
-		super(parent, style);
-		topImage = WelcomePortalImages.get(WelcomePortalImages.IMG_FORM_BANNER);
-		bottomImage = WelcomePortalImages.get(WelcomePortalImages.IMG_FORM_UNDERLINE);
-	}
-	public Point computeSize(int wHint, int hHint, boolean changed) {
-		Point textSize = super.computeSize(wHint, hHint, changed);
-		int width = textSize.x;
-		int height = Math.max(textSize.y, topImage.getBounds().height);
-		height += bottomImage.getBounds().height;
-		return new Point(width, height);
-	}
-	protected void paint(PaintEvent e) {
-		GC gc = e.gc;
-		Rectangle bounds = getBounds();
-		gc.drawImage(topImage, bounds.x, bounds.y);
-		int y =	bounds.y + bounds.height - bottomImage.getBounds().height;
-		gc.drawImage(bottomImage, 0, y);
-		super.paint(e);
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/BrowserControlSite.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/BrowserControlSite.java
deleted file mode 100644
index 26b7024..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/BrowserControlSite.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.welcome.internal.webbrowser;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.swt.ole.win32.*;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Needed for the OLE implementation
- */
-public class BrowserControlSite extends OleControlSite {
-
-	protected boolean beenBuilt = false;
-	protected boolean startedDownload = false;
-	// Web Browser
-	private WebBrowser browser;
-	private String presentationURL;
-	private IStatusLineManager statusLineManager;
-	private int workSoFar = 0;
-	private int prevMax = 0;
-
-	public void setStatusLineManager(IStatusLineManager manager) {
-		this.statusLineManager = manager;
-	}
-
-	void setBrowser(WebBrowser browser) {
-		this.browser = browser;
-	}
-
-	public String getPresentationURL() {
-		return presentationURL;
-	}
-
-	/**
-	 * BrowserControlSite constructor
-	 */
-	public BrowserControlSite(Composite parent, int style, String progId) {
-		super(parent, style, progId);
-
-		addEventListener(WebBrowser.DownloadBegin, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				startedDownload = true;
-				//webProgress.setSelection(0);
-				prevMax = -1;
-			}
-		});
-
-		addEventListener(WebBrowser.DownloadComplete, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				startedDownload = false;
-				//webProgress.setSelection(0);
-				if (statusLineManager != null)
-					statusLineManager.getProgressMonitor().done();
-				presentationURL = browser.getLocationURL();
-			}
-		});
-
-		addEventListener(WebBrowser.BeforeNavigate2, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				//Variant urlVar = event.arguments[1];
-				//String strUrl = urlVar.getString();
-			}
-		});
-
-		// Respond to ProgressChange events by updating the Progress bar
-		addEventListener(WebBrowser.ProgressChange, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				if (!startedDownload) {
-					return;
-				}
-
-				Variant progress = event.arguments[0];
-				Variant maxProgress = event.arguments[1];
-
-				if (progress == null || maxProgress == null || progress.getInt() == -1) {
-					return;
-				}
-				/*
-				if (maxProgress.getInt()!=100)
-				   webProgress.setMaximum(maxProgress.getInt());
-				*/
-				if (prevMax != maxProgress.getInt()) {
-					statusLineManager.getProgressMonitor().beginTask("", maxProgress.getInt());
-					prevMax = maxProgress.getInt();
-				}
-				//webProgress.setSelection(progress.getInt());
-				int newValue = progress.getInt();
-				int worked = newValue - workSoFar;
-				workSoFar = newValue;
-				if (statusLineManager != null)
-					statusLineManager.getProgressMonitor().worked(worked);
-			}
-		});
-
-		addEventListener(WebBrowser.StatusTextChange, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				Variant newText = event.arguments[0];
-				String msg = newText.getString();
-
-				if (msg != null) {
-					if (statusLineManager != null)
-						statusLineManager.setMessage(msg);
-				} else {
-					if (statusLineManager != null)
-						statusLineManager.setMessage("");
-				}
-			}
-		});
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/GlobalActionHandler.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/GlobalActionHandler.java
deleted file mode 100644
index efb3c23..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/GlobalActionHandler.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.welcome.internal.webbrowser;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IWorkbenchActionConstants;
-
-/**
- *
- */
-public class GlobalActionHandler {
-	private boolean active = false;
-	private Combo combo;
-	private ControlListener controlListener;
-
-	private class ControlListener implements Listener {
-		public void handleEvent(Event event) {
-			switch (event.type) {
-				case SWT.Activate :
-					active = true;
-					updateActionsEnableState();
-					break;
-				case SWT.Deactivate :
-					active = false;
-					updateActionsEnableState();
-					break;
-				default :
-					break;
-			}
-		}
-	}
-
-	private class GlobalAction extends Action {
-		private String id;
-
-		public GlobalAction(String id) {
-			this.id = id;
-		}
-
-		public void run() {
-			doGlobalAction(id);
-		}
-	}
-
-	private GlobalAction cutAction;
-	private GlobalAction copyAction;
-	private GlobalAction pasteAction;
-	private GlobalAction deleteAction;
-	private GlobalAction selectAllAction;
-	private GlobalAction undoAction;
-
-	public GlobalActionHandler(IActionBars actionBar, Combo combo) {
-		this.combo = combo;
-		makeActions();
-		actionBar.setGlobalActionHandler(
-			IWorkbenchActionConstants.CUT,
-			cutAction);
-		actionBar.setGlobalActionHandler(
-			IWorkbenchActionConstants.COPY,
-			copyAction);
-		actionBar.setGlobalActionHandler(
-			IWorkbenchActionConstants.PASTE,
-			pasteAction);
-		actionBar.setGlobalActionHandler(
-			IWorkbenchActionConstants.DELETE,
-			deleteAction);
-		actionBar.setGlobalActionHandler(
-			IWorkbenchActionConstants.SELECT_ALL,
-			selectAllAction);
-		actionBar.setGlobalActionHandler(
-			IWorkbenchActionConstants.UNDO,
-			undoAction);
-		controlListener = new ControlListener();
-		combo.addListener(SWT.Activate, controlListener);
-		combo.addListener(SWT.Deactivate, controlListener);
-	}
-
-	public void dispose() {
-		if (!combo.isDisposed()) {
-			combo.removeListener(SWT.Activate, controlListener);
-			combo.removeListener(SWT.Deactivate, controlListener);
-		}
-	}
-
-	private void makeActions() {
-		cutAction = new GlobalAction(IWorkbenchActionConstants.CUT);
-		copyAction = new GlobalAction(IWorkbenchActionConstants.COPY);
-		pasteAction = new GlobalAction(IWorkbenchActionConstants.PASTE);
-		deleteAction = new GlobalAction(IWorkbenchActionConstants.DELETE);
-		selectAllAction =
-			new GlobalAction(IWorkbenchActionConstants.SELECT_ALL);
-		undoAction = new GlobalAction(IWorkbenchActionConstants.UNDO);
-	}
-
-	private void updateActionsEnableState() {
-		if (!active) {
-			cutAction.setEnabled(false);
-			copyAction.setEnabled(false);
-			pasteAction.setEnabled(false);
-			deleteAction.setEnabled(false);
-			selectAllAction.setEnabled(false);
-			undoAction.setEnabled(false);
-		} else {
-			cutAction.setEnabled(true);
-			copyAction.setEnabled(true);
-			pasteAction.setEnabled(true);
-			deleteAction.setEnabled(true);
-			selectAllAction.setEnabled(true);
-			undoAction.setEnabled(true);
-		}
-	}
-
-	private void doGlobalAction(String id) {
-		if (id.equals(IWorkbenchActionConstants.CUT))
-			combo.cut();
-		else if (id.equals(IWorkbenchActionConstants.COPY))
-			combo.copy();
-		else if (id.equals(IWorkbenchActionConstants.PASTE))
-			combo.paste();
-		else if (id.equals(IWorkbenchActionConstants.DELETE))
-			doDelete();
-		else if (id.equals(IWorkbenchActionConstants.SELECT_ALL))
-			doSelectAll();
-	}
-
-	private void doDelete() {
-		String text = combo.getText();
-		Point selection = combo.getSelection();
-		if (selection.x == selection.y)
-			return;
-		String left = text.substring(0, selection.x);
-		String right = text.substring(selection.y + 1);
-		combo.setText(left + right);
-	}
-
-	private void doSelectAll() {
-		String text = combo.getText();
-		Point newSelection = new Point(0, text.length());
-		combo.setSelection(newSelection);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IEmbeddedWebBrowser.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IEmbeddedWebBrowser.java
deleted file mode 100644
index 7a914b4..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IEmbeddedWebBrowser.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.welcome.internal.webbrowser;
-
-public interface IEmbeddedWebBrowser {
-	public void openTo(String url);
-	public void setListener(IWebBrowserListener listener);
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IWebBrowserListener.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IWebBrowserListener.java
deleted file mode 100644
index 2d34243..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/IWebBrowserListener.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*
- * Created on Jun 18, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.webbrowser;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public interface IWebBrowserListener {
-	void stateChanged();
-
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowser.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowser.java
deleted file mode 100644
index 18ec8cf..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowser.java
+++ /dev/null

@@ -1,467 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.welcome.internal.webbrowser;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.ole.win32.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * ActiveX based web browser control.
- */
-public class WebBrowser implements OleListener {
-	// Generated from typelib filename: shdocvw.dll
-
-	// Constants for WebBrowser CommandStateChange
-
-	public static final short CSC_UPDATECOMMANDS = -1;
-	public static final short CSC_NAVIGATEFORWARD = 1;
-	public static final short CSC_NAVIGATEBACK = 2;
-
-	// Web Browser Control Events 
-	public static final int BeforeNavigate = 100;
-	// Fired when a new hyperlink is being navigated to.
-	public static final int NavigateComplete = 101;
-	// Fired when the document being navigated to becomes visible and enters the navigation stack.
-	public static final int StatusTextChange = 102;
-	// Statusbar text changed.
-	public static final int ProgressChange = 108;
-	// Fired when download progress is updated.
-	public static final int DownloadComplete = 104;
-	// Download of page complete.
-	public static final int CommandStateChange = 105;
-	// The enabled state of a command changed
-	public static final int DownloadBegin = 106;
-	// Download of a page started.
-	public static final int NewWindow = 107;
-	// Fired when a new window should be created.
-	public static final int TitleChange = 113;
-	// Document title changed.
-	public static final int FrameBeforeNavigate = 200;
-	// Fired when a new hyperlink is being navigated to in a frame.
-	public static final int FrameNavigateComplete = 201;
-	// Fired when a new hyperlink is being navigated to in a frame.
-	public static final int FrameNewWindow = 204;
-	// Fired when a new window should be created.
-	public static final int Quit = 103;
-	// Fired when application is quiting.
-	public static final int WindowMove = 109;
-	// Fired when window has been moved.
-	public static final int WindowResize = 110;
-	// Fired when window has been sized.
-	public static final int WindowActivate = 111;
-	// Fired when window has been activated.
-	public static final int PropertyChange = 112;
-	// Fired when the PutProperty method has been called.
-	public static final int BeforeNavigate2 = 250;
-	// Fired when a new hyperlink is being navigated to.
-	public static final int NewWindow2 = 251;
-	// Fired when a new window should be created.
-	public static final int DocumentComplete = 259;
-	// Fired when the document being navigated to reaches ReadyState_Complete.
-
-	// Web Browser properties
-	public static final int DISPID_READYSTATE = -525;
-
-	// Web Browser state
-	public static final int READYSTATE_UNINITIALIZED = 0;
-	public static final int READYSTATE_LOADING = 1;
-	public static final int READYSTATE_LOADED = 2;
-	public static final int READYSTATE_INTERACTIVE = 3;
-	public static final int READYSTATE_COMPLETE = 4;
-
-	// Keep track of the whether it is possible to navigate in the forward and backward directions
-	private boolean backwardEnabled;
-	private boolean forwardEnabled;
-
-	// The automation object and Control associated with the main OLE control
-	private OleAutomation oleObject;
-	private BrowserControlSite controlSite;
-
-	// The OLE frame (there should only be one)
-	private OleFrame controlFrame;
-
-	//private NestedPrintDelegate aPrintDelegate = null;
-
-	/**
-	 */
-	public WebBrowser(Composite parent) {
-
-		// Create the OLE frame. 
-		controlFrame = createOleFrame(parent);
-
-		// Creates the IE5 OLE Control
-		// The constructor also registers all the necessary OLE listeners.
-		// for now, only catch the execption if creating and activating the 
-		// control fails. No checking if the correct version of the OLE control 
-		// is installed.
-		try {
-			controlSite =
-				new BrowserControlSite(
-					controlFrame,
-					SWT.NONE,
-					"Shell.Explorer");
-			controlSite.setBrowser(this);
-			oleObject = new OleAutomation(controlSite);
-
-			backwardEnabled = false;
-			forwardEnabled = false;
-
-			// Listen for changes to the Command States
-			controlSite.addEventListener(CommandStateChange, this);
-
-			// initialize control
-			controlSite.doVerb(OLE.OLEIVERB_SHOW);
-
-			// create print Delegate (has to be done early, here!).
-			//aPrintDelegate = new NestedPrintDelegate(this, oleObject, controlSite);
-
-		} catch (Exception e) {
-			String id = "org.eclipse.update.ui.win32";
-			IStatus status =
-				new Status(IStatus.ERROR, id, IStatus.OK, e.getMessage(), e);
-			Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status);
-		}
-	}
-	/**
-	 */
-	public int back() {
-
-		if (!backwardEnabled)
-			return OLE.S_FALSE;
-		forwardEnabled = true;
-
-		// dispid=100, type=METHOD, name="GoBack"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 100;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "GoBack" });
-		int dispIdMember = rgdispid[0];
-
-		Variant pVarResult = oleObject.invoke(dispIdMember);
-
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return 0;
-		return pVarResult.getInt();
-	}
-	/**
-	 */
-	public int copy() {
-		int result = controlSite.queryStatus(OLE.OLECMDID_COPY);
-		if ((result & OLE.OLECMDF_ENABLED) == OLE.OLECMDF_ENABLED) {
-			result =
-				controlSite.exec(
-					OLE.OLECMDID_COPY,
-					OLE.OLECMDEXECOPT_DODEFAULT,
-					null,
-					null);
-		}
-		return result;
-	}
-	protected OleFrame createOleFrame(Composite parent) {
-		if (controlFrame == null) {
-			controlFrame = new OleFrame(parent, SWT.NONE);
-			controlFrame.setLayoutData(
-				new GridData(
-					GridData.GRAB_HORIZONTAL
-						| GridData.GRAB_VERTICAL
-						| GridData.HORIZONTAL_ALIGN_FILL
-						| GridData.VERTICAL_ALIGN_FILL));
-		}
-		return controlFrame;
-
-	}
-	/**
-	 * clean up
-	 */
-	public void dispose() {
-		//** clean up
-		if (oleObject != null)
-			oleObject.dispose();
-		oleObject = null;
-
-		if (controlSite != null)
-			controlSite.dispose();
-		controlSite = null;
-
-		if (controlFrame != null)
-			controlFrame.dispose();
-		controlFrame = null;
-
-	}
-	/**
-	 */
-	public int forward() {
-		if (!forwardEnabled)
-			return OLE.S_FALSE;
-		backwardEnabled = true;
-		// dispid=101, type=METHOD, name="GoForward"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 101;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "GoForward" });
-		int dispIdMember = rgdispid[0];
-
-		Variant pVarResult = oleObject.invoke(dispIdMember);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return 0;
-		return pVarResult.getInt();
-	}
-	public Control getControl() {
-		return controlFrame;
-	}
-	/**
-	 */
-	public String getLocationName() {
-		// dispid=210, type=PROPGET, name="LocationName"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 210;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid =
-			oleObject.getIDsOfNames(new String[] { "LocationName" });
-		int dispIdMember = rgdispid[0];
-		Variant pVarResult = oleObject.getProperty(dispIdMember);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return null;
-		return pVarResult.getString();
-	}
-	/**
-	 */
-	public String getLocationURL() {
-		// dispid=211, type=PROPGET, name="LocationURL"
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 211;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid =
-			oleObject.getIDsOfNames(new String[] { "LocationURL" });
-		int dispIdMember = rgdispid[0];
-
-		Variant pVarResult = oleObject.getProperty(dispIdMember);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return null;
-		return pVarResult.getString();
-	}
-	protected OleFrame getOleFrame() {
-		return controlFrame;
-
-	}
-
-	public BrowserControlSite getControlSite() {
-		return controlSite;
-	}
-	/**
-	 */
-	public int getReadyState() {
-		// dispid=4294966771, type=PROPGET, name="ReadyState"
-		// READYSTATE_UNINITIALIZED = 0;
-		// READYSTATE_LOADING = 1;
-		// READYSTATE_LOADED = 2;
-		// READYSTATE_INTERACTIVE = 3;
-		// READYSTATE_COMPLETE = 4;
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = -525;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "ReadyState" });
-		int dispIdMember = rgdispid[0];
-
-		Variant pVarResult = oleObject.getProperty(dispIdMember);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return -1;
-		return pVarResult.getInt();
-	}
-	/**
-	 */
-	public void handleEvent(OleEvent event) {
-		switch (event.type) {
-			case (CommandStateChange) :
-				int command = 0;
-				boolean enabled = false;
-
-				Variant varResult = event.arguments[0];
-				if (varResult != null && varResult.getType() != OLE.VT_EMPTY) {
-					command = varResult.getInt();
-				}
-
-				varResult = event.arguments[1];
-				if (varResult != null && varResult.getType() != OLE.VT_EMPTY) {
-					enabled = varResult.getBoolean();
-				}
-
-				if (command == CSC_NAVIGATEBACK)
-					backwardEnabled = enabled;
-				if (command == CSC_NAVIGATEFORWARD)
-					forwardEnabled = enabled;
-
-				return;
-
-			case (DocumentComplete) :
-				varResult = event.arguments[0];
-				return;
-		}
-		//throw new OleError(OLE.ERROR_NOT_IMPLEMENTED);
-	}
-	/**
-	 */
-	public int home() {
-		// dispid=102, type=METHOD, name="GoHome"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 102;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "GoHome" });
-		int dispIdMember = rgdispid[0];
-
-		Variant pVarResult = oleObject.invoke(dispIdMember);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return 0;
-		return pVarResult.getInt();
-	}
-	/**
-	 */
-	public int navigate(String url) {
-		return navigate(oleObject, url);
-	}
-	/**
-	 */
-	protected int navigate(OleAutomation aOleAutomation, String url) {
-		//if (Logger.DEBUG)
-		//Logger.logDebugMessage("WebBrowser", "navigate to: " + url);
-		// dispid=104, type=METHOD, name="Navigate"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 104;
-
-		// Alternatively, you can look up the DISPID dynamically
-		// Here we are looking up the id of the argument as well
-		int[] rgdispid =
-			aOleAutomation.getIDsOfNames(new String[] { "Navigate", "URL" });
-		int dispIdMember = rgdispid[0];
-
-		Variant[] rgvarg = new Variant[1];
-		rgvarg[0] = new Variant(url);
-		int[] rgdispidNamedArgs = new int[1];
-		rgdispidNamedArgs[0] = rgdispid[1]; // identifier of argument
-		Variant pVarResult =
-			aOleAutomation.invoke(dispIdMember, rgvarg, rgdispidNamedArgs);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return 0;
-		return pVarResult.getInt();
-
-	}
-	/**
-	 */
-	public int print() {
-		return print(controlSite, true);
-	}
-	/**
-	 */
-	protected int print(BrowserControlSite aControlSite, boolean promptuser) {
-
-		int result = aControlSite.queryStatus(OLE.OLECMDID_PRINT);
-
-		if ((result & OLE.OLECMDF_ENABLED) == OLE.OLECMDF_ENABLED) {
-			if (promptuser)
-				result =
-					aControlSite.exec(
-						OLE.OLECMDID_PRINT,
-						OLE.OLECMDEXECOPT_PROMPTUSER,
-						null,
-						null);
-			else
-				result =
-					aControlSite.exec(
-						OLE.OLECMDID_PRINT,
-						OLE.OLECMDEXECOPT_DONTPROMPTUSER,
-						null,
-						null);
-		}
-
-		//if (Logger.DEBUG)
-		//Logger.logDebugMessage("WebBrowser", "exec returns: " + Integer.toString(result));
-		return result;
-	}
-
-	/**
-	 * Refresh the currently viewed page.
-	 */
-	public void refresh() {
-
-		// dispid= 4294966746, type=METHOD, name="Refresh"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember =  4294966746;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "Refresh" });
-		int dispIdMember = rgdispid[0];
-
-		oleObject.invokeNoReply(dispIdMember);
-	}
-	/**
-	 */
-	public int search() {
-		// dispid=103, type=METHOD, name="GoSearch"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 103;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "GoSearch" });
-		int dispIdMember = rgdispid[0];
-
-		Variant pVarResult = oleObject.invoke(dispIdMember);
-		if (pVarResult == null || pVarResult.getType() == OLE.VT_EMPTY)
-			return 0;
-		return pVarResult.getInt();
-	}
-	/**
-	 */
-	public void stop() {
-		// dispid=106, type=METHOD, name="Stop"
-
-		// You can hard code the DISPID if you know it before hand - this is of course the fastest way
-		//int dispIdMember = 106;
-
-		// Alternatively, you can look up the DISPID dynamically
-		int[] rgdispid = oleObject.getIDsOfNames(new String[] { "Stop" });
-		int dispIdMember = rgdispid[0];
-
-		//Variant pVarResult = oleObject.invoke(dispIdMember);
-		oleObject.invoke(dispIdMember);
-	}
-	/**
-	 * Gets the forwardEnabled
-	 * @return Returns a boolean
-	 */
-	public boolean isForwardEnabled() {
-		return forwardEnabled;
-	}
-
-	/**
-	 * Gets the backwardEnabled
-	 * @return Returns a boolean
-	 */
-	public boolean isBackwardEnabled() {
-		return backwardEnabled;
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditor.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditor.java
deleted file mode 100644
index 1a7402c..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditor.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.welcome.internal.webbrowser;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.ole.win32.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.welcome.internal.*;
-
-public class WebBrowserEditor extends EditorPart implements IEmbeddedWebBrowser {
-	// NL
-	private static final String KEY_NOT_AVAILABLE =
-		"WebBrowserView.notAvailable";
-	private static final String KEY_ADDRESS = "WebBrowserView.address";
-	private static final String KEY_STOP = "WebBrowserView.stop";
-	private static final String KEY_GO = "WebBrowserView.go";
-	private static final String KEY_REFRESH = "WebBrowserView.refresh";
-	private static final String KEY_BACKWARD = "WebBrowserView.backward";
-	private static final String KEY_FORWARD = "WebBrowserView.forward";
-
-	private int ADDRESS_SIZE = 10;
-	private WebBrowser browser;
-	private Control control;
-	private Combo addressCombo;
-	private Object input;
-	private ToolBarManager toolBarManager;
-	private Action refreshAction;
-	private Action stopAction;
-	private Action goAction;
-	private GlobalActionHandler globalActionHandler;
-	private IWebBrowserListener listener;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorPart#gotoMarker(org.eclipse.core.resources.IMarker)
-	 */
-	public void gotoMarker(IMarker marker) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input)
-		throws PartInitException {
-		if (!(input instanceof WebBrowserEditorInput))
-			throw new PartInitException("Invalid Input: Must be WelcomeEditorInput");
-		setSite(site);
-		setInput(input);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isDirty()
-	 */
-	public boolean isDirty() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	public WebBrowserEditor() {
-	}
-
-	/**
-	 * @see IFormPage#createControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		control = container;
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.verticalSpacing = 0;
-		container.setLayout(layout);
-
-		Composite navContainer = new Composite(container, SWT.NONE);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginHeight = 1;
-		navContainer.setLayout(layout);
-		createNavBar(navContainer);
-		navContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		final WebBrowser winBrowser = new WebBrowser(container);
-		browser = winBrowser;
-
-		Control c = browser.getControl();
-		c.setLayoutData(new GridData(GridData.FILL_BOTH));
-		final BrowserControlSite site = winBrowser.getControlSite();
-		IStatusLineManager smng =
-			getEditorSite().getActionBars().getStatusLineManager();
-		site.setStatusLineManager(smng);
-
-		site.addEventListener(WebBrowser.DownloadComplete, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				String url = winBrowser.getLocationURL();
-				if (url != null) {
-					addressCombo.setText(url);
-					downloadComplete(url);
-				}
-			}
-		});
-		site.addEventListener(WebBrowser.DownloadBegin, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				stopAction.setEnabled(true);
-				refreshAction.setEnabled(false);
-			}
-		});
-		WorkbenchHelp.setHelp(container, "org.eclipse.update.ui.WebBrowserView");
-		WebBrowserEditorInput input = (WebBrowserEditorInput)getEditorInput();
-		openTo(input.getURL());
-	}
-
-	public void openTo(final String url) {
-		addressCombo.setText(url);
-		control.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				navigate(url);
-			}
-		});
-	}
-
-	private void downloadComplete(String url) {
-		stopAction.setEnabled(false);
-		refreshAction.setEnabled(true);
-		if (listener!=null)
-			listener.stateChanged();
-	}
-	
-	public void setListener(IWebBrowserListener listener) {
-		this.listener = listener;
-	}
-
-	private void createNavBar(Composite parent) {
-		Label addressLabel = new Label(parent, SWT.NONE);
-		addressLabel.setText(WelcomePortal.getString(KEY_ADDRESS));
-
-		addressCombo = new Combo(parent, SWT.DROP_DOWN | SWT.BORDER);
-		addressCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String text = addressCombo.getText();
-				goAction.setEnabled(text.length() > 0);
-			}
-		});
-		addressCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				String text =
-					addressCombo.getItem(addressCombo.getSelectionIndex());
-				if (text.length() > 0)
-					navigate(text);
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-				navigate(addressCombo.getText());
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		addressCombo.setLayoutData(gd);
-		ToolBar toolbar = new ToolBar(parent, SWT.FLAT | SWT.HORIZONTAL);
-		toolBarManager = new ToolBarManager(toolbar);
-		makeActions();
-		IActionBars bars = getEditorSite().getActionBars();
-		globalActionHandler = new GlobalActionHandler(bars, addressCombo);
-	}
-
-	private void navigate(String url) {
-		browser.navigate(url);
-		String[] items = addressCombo.getItems();
-		int loc = -1;
-		String normURL = getNormalizedURL(url);
-		for (int i = 0; i < items.length; i++) {
-			String normItem = getNormalizedURL(items[i]);
-			if (normURL.equals(normItem)) {
-				// match 
-				loc = i;
-				break;
-			}
-		}
-		if (loc != -1) {
-			addressCombo.remove(loc);
-		}
-		addressCombo.add(url, 0);
-		if (addressCombo.getItemCount() > ADDRESS_SIZE) {
-			addressCombo.remove(addressCombo.getItemCount() - 1);
-		}
-		addressCombo.getParent().layout(true);
-	}
-	
-	void back() {
-		browser.back();
-	}
-	void forward() {
-		browser.forward();
-	}
-	boolean isBackwardEnabled() {
-		return browser.isBackwardEnabled();
-	}
-	boolean isForwardEnabled() {
-		return browser.isForwardEnabled();
-	}
-
-	private void makeActions() {
-		goAction = new Action() {
-			public void run() {
-				navigate(addressCombo.getText());
-			}
-		};
-		goAction.setEnabled(false);
-		goAction.setToolTipText(WelcomePortal.getString(KEY_GO));
-		goAction.setImageDescriptor(WelcomePortalImages.DESC_GO_NAV);
-		goAction.setDisabledImageDescriptor(WelcomePortalImages.DESC_GO_NAV_D);
-		goAction.setHoverImageDescriptor(WelcomePortalImages.DESC_GO_NAV_H);
-
-		stopAction = new Action() {
-			public void run() {
-				browser.stop();
-			}
-		};
-		stopAction.setToolTipText(WelcomePortal.getString(KEY_STOP));
-		stopAction.setImageDescriptor(WelcomePortalImages.DESC_STOP_NAV);
-		stopAction.setDisabledImageDescriptor(
-			WelcomePortalImages.DESC_STOP_NAV_D);
-		stopAction.setHoverImageDescriptor(
-			WelcomePortalImages.DESC_STOP_NAV_H);
-		stopAction.setEnabled(false);
-
-		refreshAction = new Action() {
-			public void run() {
-				browser.refresh();
-			}
-		};
-		refreshAction.setToolTipText(
-			WelcomePortal.getString(KEY_REFRESH));
-		refreshAction.setImageDescriptor(WelcomePortalImages.DESC_REFRESH_NAV);
-		refreshAction.setDisabledImageDescriptor(
-			WelcomePortalImages.DESC_REFRESH_NAV_D);
-		refreshAction.setHoverImageDescriptor(
-			WelcomePortalImages.DESC_REFRESH_NAV_H);
-		refreshAction.setEnabled(false);
-
-		toolBarManager.add(goAction);
-		toolBarManager.add(new Separator());
-		toolBarManager.add(stopAction);
-		toolBarManager.add(refreshAction);
-		toolBarManager.update(true);
-	}
-
-	private String getNormalizedURL(String url) {
-		url = url.toLowerCase();
-		if (url.indexOf("://") == -1) {
-			url = "http://" + url;
-		}
-		return url;
-	}
-
-	public void dispose() {
-		if (browser != null)
-			browser.dispose();
-		globalActionHandler.dispose();
-		super.dispose();
-	}
-
-	public void setFocus() {
-		if (control != null)
-			control.setFocus();
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorContributor.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorContributor.java
deleted file mode 100644
index 54b9039..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorContributor.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*
- * Created on Jun 18, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.welcome.internal.webbrowser;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.welcome.internal.*;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class WebBrowserEditorContributor
-	extends EditorActionBarContributor
-	implements IWebBrowserListener {
-	private static final String KEY_NOT_AVAILABLE =
-		"WebBrowserView.notAvailable";
-	private static final String KEY_HOME = "WebBrowserView.home";
-	private static final String KEY_BACKWARD = "WebBrowserView.backward";
-	private static final String KEY_FORWARD = "WebBrowserView.forward";
-
-	private Action homeAction;
-	private Action backwardAction;
-	private Action forwardAction;
-	private WebBrowserEditor editor;
-	
-	public WebBrowserEditorContributor() {
-		makeActions();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.welcome.internal.IWebBrowserListener#stateChanged()
-	 */
-	public void stateChanged() {
-		updateActions();
-	}
-
-	private void makeActions() {
-		homeAction = new Action() {
-			public void run() {
-				WebBrowserEditorInput input = (WebBrowserEditorInput)editor.getEditorInput();
-				editor.openTo(input.getURL());
-			}
-		};
-		homeAction.setEnabled(true);
-		homeAction.setToolTipText(WelcomePortal.getString(KEY_HOME));
-		homeAction.setImageDescriptor(
-			WelcomePortalImages.DESC_HOME_NAV);
-		homeAction.setDisabledImageDescriptor(
-			WelcomePortalImages.DESC_HOME_NAV_D);
-		homeAction.setHoverImageDescriptor(
-			WelcomePortalImages.DESC_HOME_NAV_H);
-
-
-		backwardAction = new Action() {
-			public void run() {
-				editor.back();
-			}
-		};
-		backwardAction.setEnabled(false);
-		backwardAction.setToolTipText(WelcomePortal.getString(KEY_BACKWARD));
-		backwardAction.setImageDescriptor(
-			WelcomePortalImages.DESC_BACKWARD_NAV);
-		backwardAction.setDisabledImageDescriptor(
-			WelcomePortalImages.DESC_BACKWARD_NAV_D);
-		backwardAction.setHoverImageDescriptor(
-			WelcomePortalImages.DESC_BACKWARD_NAV_H);
-
-		forwardAction = new Action() {
-			public void run() {
-				editor.forward();
-			}
-		};
-		forwardAction.setToolTipText(WelcomePortal.getString(KEY_FORWARD));
-		forwardAction.setImageDescriptor(WelcomePortalImages.DESC_FORWARD_NAV);
-		forwardAction.setDisabledImageDescriptor(
-			WelcomePortalImages.DESC_FORWARD_NAV_D);
-		forwardAction.setHoverImageDescriptor(
-			WelcomePortalImages.DESC_FORWARD_NAV_H);
-		forwardAction.setEnabled(false);
-	}
-
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator());
-		toolBarManager.add(homeAction);
-		toolBarManager.add(backwardAction);
-		toolBarManager.add(forwardAction);
-	}
-	public void setActiveEditor(IEditorPart targetEditor) {
-		if (this.editor != null)
-			this.editor.setListener(null);
-		editor = (WebBrowserEditor) targetEditor;
-		if (editor != null) {
-			editor.setListener(this);
-			updateActions();
-		}
-	}
-	private void updateActions() {
-		backwardAction.setEnabled(editor.isBackwardEnabled());
-		forwardAction.setEnabled(editor.isForwardEnabled());
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInput.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInput.java
deleted file mode 100644
index a89e087..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInput.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.welcome.internal.webbrowser;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.*;
-/**
- * A simple editor input for the welcome editor
- */
-public class WebBrowserEditorInput implements IEditorInput {
-	private final static String FACTORY_ID = "org.eclipse.welcome.internal.webbrowser.WebBrowserEditorInputFactory"; //$NON-NLS-1$
-	private String url;
-	private String name;
-	/**
-	 * WelcomeEditorInput constructor comment.
-	 */
-	public WebBrowserEditorInput(String name, String url) {
-		this.name = name;
-		this.url = url;
-	}
-	public boolean exists() {
-		return false;
-	}
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-	public String getName() {
-		return name;
-	}
-	public String getURL() {
-		return url;
-	}
-	public boolean equals(Object obj) {
-		if (obj==null) return false;
-		if (obj == this) return true;
-		if (obj instanceof WebBrowserEditorInput) {
-			WebBrowserEditorInput wobj = (WebBrowserEditorInput)obj;
-			return wobj.getURL().equals(getURL());
-		}
-		return false;
-	}
-	public IPersistableElement getPersistable() {
-		return new IPersistableElement() {
-			public String getFactoryId() {
-				return FACTORY_ID;
-			}
-			public void saveState(IMemento memento) {
-				memento.putString("name", name);
-				memento.putString("url", url);
-			}
-		};
-	}
-	public String getToolTipText() {
-		return name;
-	}
-}

diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInputFactory.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInputFactory.java
deleted file mode 100644
index a48055f..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/welcome/internal/webbrowser/WebBrowserEditorInputFactory.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package org.eclipse.welcome.internal.webbrowser;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IElementFactory;
-
-/**
- */
-public class WebBrowserEditorInputFactory implements IElementFactory {
-	/**
-	 */
-	public WebBrowserEditorInputFactory() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
-	 */
-	public IAdaptable createElement(IMemento memento) {
-		String name = memento.getString("name");
-		String url = memento.getString("url");
-		return new WebBrowserEditorInput(name, url);
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/.classpath b/update/org.eclipse.update.ui/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/update/org.eclipse.update.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

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

-</classpath>


diff --git a/update/org.eclipse.update.ui/.cvsignore b/update/org.eclipse.update.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/update/org.eclipse.update.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/update/org.eclipse.update.ui/.project b/update/org.eclipse.update.ui/.project
deleted file mode 100644
index 391169b..0000000
--- a/update/org.eclipse.update.ui/.project
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

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

-	<comment></comment>

-	<projects>

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

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

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

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

-		<project>org.eclipse.ui.forms</project>

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

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

-		<project>org.eclipse.update.core.linux</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/Graphics_update.html b/update/org.eclipse.update.ui/Graphics_update.html
deleted file mode 100644
index fdae1a3..0000000
--- a/update/org.eclipse.update.ui/Graphics_update.html
+++ /dev/null

@@ -1,955 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0110)http://design.torolab.ibm.com/aim/WSWB-eclipse/1020_PDE/implementation_icons/org.eclipse.pde/Graphics_pde.html -->
-<HTML><HEAD><TITLE>graphics</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="Greg Adams" name=Author>
-<META content="Microsoft FrontPage 4.0" name=GENERATOR></HEAD>
-<BODY bgColor=white>
-<H2>org.eclipse.update.ui - Graphics Summary</H2><FONT size=-1><STRONG>Competency 
-lead: </STRONG>Vlad Klicnik / TOL <BR><STRONG>Technical lead: </STRONG>Dejan 
-Glozic / TOL <BR><STRONG>UCD designer: </STRONG>Julian Jones / TOL 
-<BR><STRONG>UI designer: </STRONG>Andrée Proulx / TOL <BR><STRONG>ID writer: 
-</STRONG>-</FONT> 
-<HR width="100%" SIZE=1>
-<B><FONT size=-1>History:</FONT></B> 
-<p><font size="-1">April 19, 2002 : Template Submission</font></p>
-<HR width="100%" SIZE=1>
-<!--- Start Here --->
-<TABLE cellSpacing=0 cellPadding=3 width="100%" border=0 height="3147">
-  
-  <TR bgColor=#bfbf7f>
-    <TD colSpan=7><B><FONT size=+2>View</FONT></B></TD></TR>
-  <TR bgColor=#dfdf9f>
-    <TD>&nbsp;</TD>
-    <TD><B><FONT size=-1>Item</FONT></B></TD>
-    <TD><B><FONT size=-1>File Name&nbsp; (.gif)</FONT></B></TD>
-    <TD><B><FONT size=-1>Description/Hoover Help</FONT></B></TD>
-    <TD>
-      <CENTER><B><FONT size=-1>Old</FONT></B> </CENTER></TD>
-    <TD>
-      <CENTER><B><FONT size=-1>New Full</FONT></B> </CENTER></TD>
-    <TD><B><FONT size=-1>Status</FONT></B></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>1</TD>
-    <TD>Configurations</TD>
-    <TD><FONT size=-1>configs</FONT></TD>
-    <TD><FONT size=-1> shows the configurations of the Eclipse-based application</FONT></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/view16/configs.gif" width=16 border=0></TD>
-    <TD><IMG height=16 alt="" 
-      src="icons/full/cview16/configs.gif" width=16 border=0>&nbsp;<IMG height=16 
-      alt="" src="icons/full/eview16/configs.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>2</TD>
-    <TD>Updates</TD>
-    <TD><FONT size=-1>updates</FONT></TD>
-    <TD><FONT size=-1>shows sites an Eclipse app can be updated from</FONT></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/view16/updates.gif" width=16 border=0></TD>
-    <TD><IMG height=16 alt="" 
-      src="icons/full/cview16/updates.gif" width=16 border=0>&nbsp;<IMG height=16 
-      alt="" src="icons/full/eview16/updates.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>3</TD>
-    <TD>Preview</TD>
-    <TD><font size="-1">preview</font></TD>
-    <TD><font size="-1">shows details of the selected object</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/view16/preview.gif" width=16 border=0></TD>
-    <TD><IMG height=16 alt="" 
-      src="icons/full/cview16/preview.gif" width=16 border=0>&nbsp;<IMG height=16 
-      alt="" src="icons/full/eview16/preview.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>4</TD>
-    <TD>Web Browser</TD>
-    <TD><font size="-1">browser</font></TD>
-    <TD><font size="-1">a fully-functioning Web browser (hosts IE5 - Windows only)</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/view16/browser.gif" width=16 border=0></TD>
-    <TD><IMG height=16 alt="" 
-      src="icons/full/cview16/browser.gif" width=16 border=0>&nbsp;<IMG height=16 
-      alt="" src="icons/full/eview16/browser.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-   <TR bgColor=#ffffff>
-    <TD>5</TD>
-    <TD>Update Perspective</TD>
-    <TD><font size="-1">update_pers</font></TD>
-    <TD><font size="-1">Represents Install/Update
-      perspective in the UI</font></TD>
-    <TD></TD>
-    <TD><IMG height=16 alt="" 
-      src="icons/full/cview16/update_pers.gif" width=16 border=0>&nbsp;<IMG height=16 
-      alt="" src="icons/full/eview16/update_pers.gif" width=16 
-border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD>
-  </TR>
-  
-  <TR bgColor=#bfbf7f>
-    <TD colSpan=7><B><FONT size=+2>Toolbar Wizard</FONT></B></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>1</TD>
-    <TD> </TD>
-    <TD><FONT size=-1>&nbsp;</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/config_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/config_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/config_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	
-  <TR bgColor=#dfdf9f>
-    <TD>2</TD>
-    <TD> </TD>
-    <TD><FONT size=-1></FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/install_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/install_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/install_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  
-  <TR bgColor=#ffffff>
-    <TD>3</TD>
-    <TD> </TD>
-    <TD><FONT size=-1>&nbsp;</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/new_bookmark_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/new_bookmark_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/new_bookmark_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	
-  <TR bgColor=#dfdf9f>
-    <TD>4</TD>
-    <TD> </TD>
-    <TD><FONT size=-1>&nbsp;</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/new_folder_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/new_folder_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/new_folder_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>5</TD>
-    <TD> </TD>
-    <TD><FONT size=-1>&nbsp;</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/new_search_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/new_search_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/new_search_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	
-  <TR bgColor=#dfdf9f>
-    <TD>6</TD>
-    <TD> </TD>
-    <TD><FONT size=-1>&nbsp;</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/uninstall_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/uninstall_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/uninstall_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	<TR bgColor=#ffffff>
-    <TD>7</TD>
-    <TD> </TD>
-    <TD><FONT size=-1>&nbsp;</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">    description</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;tool tip&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/ctool16/update_wiz.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/etool16/update_wiz.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dtool16/update_wiz.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  
-  
-  <TR bgColor=#bfbf7f>
-    <TD colSpan=7><B><FONT size=+2>Local Toolbar</FONT></B></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>1</TD>
-    <TD>Go Backward</TD>
-    <TD><FONT size=-1>&nbsp;backward_nav</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">A standard browser 'backward' button</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Go Backward&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/backward_nav.gif" width=16 border=0> <IMG 
-      height=16 alt="" 
-      src="../old.icons/full/elcl16/backward_nav.gif" 
-      width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/dlcl16/backward_nav.gif" 
-      width=16 border=0></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/backward_nav.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/elcl16/backward_nav.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dlcl16/backward_nav.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	
-  <TR bgColor=#dfdf9f>
-    <TD>2</TD>
-    <TD>Go Forward</TD>
-    <TD><FONT size=-1>&nbsp;forward_nav</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">A standard browser 'forward' button</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Go Forward&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/forward_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/elcl16/forward_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/dlcl16/forward_nav.gif" width=16 border=0></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/forward_nav.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/elcl16/forward_nav.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dlcl16/forward_nav.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>3</TD>
-    <TD>Go</TD>
-    <TD><FONT size=-1>&nbsp;go_nav</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">A standard browser button for
-            navigating to a URL.</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Go&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/go_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/elcl16/go_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/dlcl16/go_nav.gif" width=16 border=0></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/go_nav.gif" width=16 border=0>&nbsp;<IMG height=16 
-      alt="" src="icons/full/elcl16/go_nav.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/dlcl16/go_nav.gif" width=16 
-    border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	
-  <TR bgColor=#dfdf9f>
-    <TD>4</TD>
-    <TD>Go Home</TD>
-    <TD><FONT size=-1>&nbsp;home_nav</FONT></TD>
-    <TD >
-      <TABLE cellSpacing=2 cellPadding=0 border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">A standard browser button
-            for going to the home location</font></TD>
-          <TD>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Go Home&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/home_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/elcl16/home_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/dlcl16/home_nav.gif" width=16 border=0></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/home_nav.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/elcl16/home_nav.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" src="icons/full/dlcl16/home_nav.gif" 
-      width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>5</TD>
-    <TD>Refresh</TD>
-    <TD><FONT size=-1>&nbsp;refresh_nav</FONT></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">Refresh the contents of the view</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Refresh&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/refresh_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/elcl16/refresh_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/dlcl16/refresh_nav.gif" width=16 border=0></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/refresh_nav.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/elcl16/refresh_nav.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dlcl16/refresh_nav.gif" width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#dfdf9f>
-    <TD>6</TD>
-    <TD>Stop</TD>
-    <TD><font size="-1">stop_nav</font></TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">A standard browser button for stopping
-            the navigation in progress</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Stop&nbsp;&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/stop_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/elcl16/stop_nav.gif" width=16 border=0> <IMG height=16 alt="" 
-      src="../old.icons/full/dlcl16/stop_nav.gif" width=16 border=0></TD>
-    <TD bgColor=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/stop_nav.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/elcl16/stop_nav.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" src="icons/full/dlcl16/stop_nav.gif" 
-      width=16 border=0>&nbsp;</TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR>
-    <TD>7</TD>
-    <TD>Show Unconfigured Features</TD>
-    <TD>show_unconf</TD>
-    <TD>
-      <TABLE cellSpacing=2 cellPadding=0 width="100%" border=0>
-        
-        <TR>
-          <TD vAlign=top><font size="-1">A toggle button that allows
-            unconfigured features to show in the view</font></TD>
-          <TD vAlign=center align=right>
-            <TABLE>
-              
-              <TR>
-                <TD 
-                style="BORDER-RIGHT: black 1px solid; BORDER-TOP: black 1px solid; BORDER-LEFT: black 1px solid; BORDER-BOTTOM: black 1px solid" 
-                align=middle bgColor=#ffffe1><FONT 
-                  size=-2>&nbsp;Show Unconfigured Features&nbsp;</FONT></TD></TR></TABLE></TD></TR></TABLE></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/clcl16/show_unconf.gif" width=16 border=0> </TD>
-    <TD BGCOLOR=#cccccc><IMG height=16 alt="" 
-      src="icons/full/clcl16/show_unconf.gif" width=16 border=0>&nbsp;<IMG 
-      height=16 alt="" src="icons/full/elcl16/show_unconf.gif" width=16 
-      border=0>&nbsp;<IMG height=16 alt="" 
-      src="icons/full/dlcl16/show_unconf.gif" width=16 border=0></TD>
-    <TD></TD></TR>
-	
-  <TR bgColor=#bfbf7f>
-    <TD colSpan=7><B><FONT size=+2>Model Object</FONT></B></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>1</TD>
-    <TD>&nbsp;Application Configuration</TD>
-    <TD><FONT size=-1>&nbsp;app_obj</FONT></TD>
-    <TD><font size="-1">the current configuration used to load the current
-      application</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/app_obj.gif" width=16 
-    align=left border=0></TD>
-    <TD><IMG height=16 alt="" src="icons/full/obj16/app_obj.gif" width=16 border=0></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-	
-  <TR bgColor=#dfdfb>
-    <TD>2</TD>
-    <TD>My Computer</TD>
-    <TD><FONT size=-1>&nbsp;computer_obj</FONT></TD>
-    <TD><font size="-1">the file system root</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/computer_obj.gif" width=16 
-    align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/computer_obj.gif" width=16 border=0>
-      <P></P></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>3</TD>
-    <TD>&nbsp;Feature</TD>
-    <TD><FONT size=-1>&nbsp;feature_obj</FONT></TD>
-    <TD><font size="-1">feature object</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/feature_obj.gif" width=16 
-align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/feature_obj.gif" width=16 border=0>
-      <P></P></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>4</TD>
-    <TD>Unconfigured Feature</TD>
-    <TD><FONT size=-1>&nbsp;unconf_feature_obj</FONT></TD>
-    <TD><font size="-1">feature that is currently unconfigured (i.e. still
-      present but disabled in the current configuration)</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/unconf_feature_obj.gif" width=16 
-    align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/unconf_feature_obj.gif" width=16 border=0>
-      <P></P></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>5</TD>
-    <TD>Places to Visit</TD>
-    <TD>places_obj</TD>
-    <TD>a folder that contains bookmarks to remote sites that
-      contain cool features</TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/places_obj.gif" width=16 
-align=left border=0></TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/obj16/places_obj.gif" width=16 border=0>
-      &nbsp;</TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>6</TD>
-    <TD>Site</TD>
-    <TD><font size="-1">site_obj&nbsp;</font></TD>
-    <TD><font size="-1">update site object that represent a provider
-      site (site that is set up to act as a source of features)</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/site_obj.gif" width=16 
-align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/site_obj.gif" width=16 border=0>
-      <P></P></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR>
-    <TD>7</TD>
-    <TD><font size="-1">Local Site</font></TD>
-    <TD><font size="-1">lsite_obj</font></TD>
-    <TD>update site object that represents a receiver site (site
-      that is set up to act as a target of the feature installation)</TD>
-    <TD><IMG height=16 
-      alt="" 
-src="../old.icons/full/obj16/lsite_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/obj16/lsite_obj.gif" width=16 border=0>
-      &nbsp;</TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>8</TD>
-    <TD><font size="-1">Feature Category</font></TD>
-    <TD><font size="-1">category_obj</font></TD>
-    <TD>sites can classify features they host into hierarchical
-      categories</TD>
-    <TD>
-      <P align=left><IMG height=16 src="../old.icons/full/obj16/category_obj.gif" width=16 border=0></P></TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/obj16/category_obj.gif" width=16 border=0>
-      &nbsp;</TD>
-    <TD></TD></TR>
-  <TR>
-    <TD>9</TD>
-    <TD><font size="-1">Bookmark Folder</font></TD>
-    <TD><font size="-1">bfolder_obj</font></TD>
-    <TD>folder object in the view that provides for
-      organizing site bookmarks and search objects</TD>
-    <TD>
-      <P align=left><IMG height=16 src="../old.icons/full/obj16/bfolder_obj.gif" width=16 border=0></P></TD>
-    <TD bgColor=#ffffff ><IMG height=16 alt="" 
-      src="icons/full/obj16/bfolder_obj.gif" width=16 border=0>
-      &nbsp;</TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>10</TD>
-    <TD>Text Search</TD>
-    <TD><font size="-1">tsearch_obj</font></TD>
-    <TD><font size="-1">Text search object&nbsp;</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/tsearch_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/tsearch_obj.gif" width=16 border=0>
-      <P></P></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR>
-    <TD>11</TD>
-    <TD>Update Search</TD>
-    <TD>usearch_obj</TD>
-    <TD>Available Updates search object</TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/usearch_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/usearch_obj.gif" width=16 border=0>
-      <P></P>
-    </TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>12</TD>
-    <TD>Plug-in Search</TD>
-    <TD>psearch_obj</TD>
-    <TD>Plug-in search object</TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/psearch_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/psearch_obj.gif" width=16 border=0>
-      <P></P>
-    </TD>
-    <TD></TD></TR>
-  <TR>
-    <TD>13</TD>
-    <TD>Fixed Volume</TD>
-    <TD>vfixed_obj</TD>
-    <TD>Local file system volume that represents a fixed drive (Windows) or
-      folder (Linux)</TD>
-    <TD><IMG height=16 
-      alt="" src="../old.icons/full/obj16/vfixed_obj.gif" width=16 align=left border=0>
-    </TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/obj16/vfixed_obj.gif" width=16 border=0>
-      
-    </TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>14</TD>
-    <TD>Remote Volume</TD>
-    <TD>vremote_obj</TD>
-    <TD>Remote file system volume that represents a shared drive (Window) or
-      mounted volume (Linux)</TD>
-    <TD height =16 
-      alt="" <IMG src="../old.icons/full/obj16/vremote_obj.gif" width=16 align=left border="1" 
-   >
-    </TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/obj16/vremote_obj.gif" width=16 border=0>
-      &nbsp;
-    </TD>
-    <TD></TD></TR>
-  <TR>
-    <TD>15</TD>
-    <TD>Removable Volume</TD>
-    <TD>vremovable_obj</TD>
-    <TD>Removable file system volume that is neither CD-ROM nor Floppy Disk.
-      This image is used for all other removable volumes like DVD-ROM, various
-      PCMCIA cards etc.</TD>
-    <TD><IMG height=16 
-      alt="" src="../old.icons/full/obj16/vremovable_obj.gif" width=16 align=left border=0>
-    </TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/obj16/vremovable_obj.gif" width=16 border=0>
-      &nbsp;
-    </TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>16</TD>
-    <TD>CD-ROM</TD>
-    <TD>cd_obj</TD>
-    <TD>File system volume that represent a CD-ROM drive</TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/cd_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/cd_obj.gif" width=16 border=0>
-      <P></P>
-    </TD>
-    <TD></TD></TR>
-  <TR>
-    <TD>17</TD>
-    <TD>Floppy Disk</TD>
-    <TD><font size="-1">floppy_obj</font></TD>
-    <TD><font size="-1">File system volume that represents a 3 1/2 inch floppy
-      disk drive</font></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/obj16/floppy_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=16 alt="" 
-      src="icons/full/obj16/floppy_obj.gif" width=16 border=0>
-      <P></P></TD>
-    <TD><FONT size=-1> </FONT></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>18</TD>
-    <TD>Saved Configurations</TD>
-    <TD>saved_obj</TD>
-    <TD><font size="2">Folder that holds past configurations that have been preserved and/or
-      renamed</font></TD>
-    <TD><IMG height=16 
-      alt="" src="../old.icons/full/obj16/saved_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff ><IMG height=16 alt="" 
-      src="icons/full/obj16/saved_obj.gif" width=16 border=0></TD>
-    <TD></TD></TR>
-  <TR>
-    <TD>19</TD>
-    <TD>Configuration History</TD>
-    <TD>history_obj</TD>
-    <TD>Folder that holds past configurations</TD>
-    <TD><IMG height=16 
-      alt="" src="../old.icons/full/obj16/history_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff ><IMG height=16 alt="" 
-      src="icons/full/obj16/history_obj.gif" width=16 border=0></TD>
-    <TD></TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>20</TD>
-    <TD>Available Updates</TD>
-    <TD>updates_obj</TD>
-    <TD>Update Search object that is pre-configured to look for
-      available updates of all the installed features. It cannot be removed from
-      the view.</TD>
-    <TD><IMG height=16 
-      alt="" src="../old.icons/full/obj16/updates_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff ><IMG height=16 alt="" 
-      src="icons/full/obj16/updates_obj.gif" width=16 border=0></TD>
-    <TD></TD></TR>
-  <TR>
-    <TD>21</TD>
-    <TD>Configuration</TD>
-    <TD>config_obj</TD>
-    <TD>A configuration history entry that represents one
-      configuration</TD>
-    <TD><IMG height=16 
-      alt="" src="../old.icons/full/obj16/config_obj.gif" width=16 align=left border=0></TD>
-    <TD bgColor=#ffffff ><IMG height=16 alt="" 
-      src="icons/full/obj16/config_obj.gif" width=16 border=0></TD>
-    <TD></TD></TR>
-	
-	
-	
-  <TR bgColor=#cccccc>
-    <TD colSpan=7><B><FONT size=+2>Object Overlay </FONT></B></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>1</TD>
-    <TD>&nbsp;current</TD>
-    <TD><font size="-1">current_co&nbsp;</font></TD>
-    <TD><FONT size=-1>&nbsp;indicates that the configuration is current i.e. in
-      effect</FONT></TD>
-    <TD><IMG height=8 alt="" 
-      src="../old.icons/full/ovr16/current_co.gif" width=7 border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=8 alt="" 
-      src="icons/full/ovr16/current_co.gif" width=7 border=0>
-      <P></P></TD>
-    <TD> </TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>2</TD>
-    <TD>&nbsp;error</TD>
-    <TD><FONT size=-1>error_co&nbsp;</FONT></TD>
-    <TD><FONT size=-1>will be overlayed over PDE editor objects that are 
-      somehow associated with XML syntax or validation errors&nbsp;</FONT></TD>
-    <TD><IMG height=8 alt="" 
-      src="../old.icons/full/ovr16/error_co.gif" width=7 border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=8 alt="" 
-      src="icons/full/ovr16/error_co.gif" width=7 border=0>
-      <P></P></TD>
-    <TD> </TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>3</TD>
-    <TD>&nbsp;installable</TD>
-    <TD><font size="-1">installable_co&nbsp;</font></TD>
-    <TD><font size="-1">indicates that site can accept features during
-      installation</font></TD>
-    <TD><IMG height=8 alt="" 
-      src="../old.icons/full/ovr16/installable_co.gif" width=7 border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=8 alt="" 
-      src="icons/full/ovr16/installable_co.gif" width=7 border=0>
-      <P></P></TD>
-    <TD> </TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>4</TD>
-    <TD>&nbsp;linked</TD>
-    <TD><font size="-1">linked_co&nbsp;</font></TD>
-    <TD><font size="-1">indicates that the site is only linked to the
-      configuration</font></TD>
-    <TD><IMG height=10 alt="" 
-      src="../old.icons/full/ovr16/linked_co.gif" width=11 border=0></TD>
-    <TD bgColor=#ffffff>
-      <IMG height=8 alt="" 
-      src="icons/full/ovr16/linked_co.gif" width=7 border=0>
-      <P></P></TD>
-    <TD> </TD></TR>
-    <TR bgColor=#ffffff>
-    <TD>5</TD>
-    <TD>unconfigured</TD>
-    <TD><font size="-1">unconfigured_co&nbsp;</font></TD>
-    <TD><font size="-1">      
-      </font></TD>
-    <TD></TD>
-    <TD bgColor=#ffffff>
-      <P></P><IMG height=8 alt="" src="icons/full/ovr16/unconfigured_co.gif" 
-      width=7 border=0></TD>
-    <TD> </TD></TR>
-	
-  
-  
-  <tr bgColor=#cccccc>
-    <TD colSpan=7><b><font size="+2">Forms Artwork</font></b></TD>
-  </tr>
-  <tr>
-    <TD>1</TD>
-    <TD>&nbsp;Topic</TD>
-    <TD><font size="-1">topic&nbsp;</font></TD>
-    <TD><FONT size=-1>&nbsp;an image to be used as a custom bullet for items in
-      a 'Welcome' page</FONT></TD>
-    <TD><IMG height=16 alt="" 
-      src="../old.icons/full/forms/topic.gif" width=16 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=16 alt="" 
-      src="icons/full/forms/topic.gif" width=16 border=0></TD>
-    <TD> </TD>
-  </tr>
-  <tr bgColor=#dfdfb>
-    <TD>2</TD>
-    <TD>Default Provider</TD>
-    <TD><font size="-1">def_provider&nbsp;</font></TD>
-    <TD><font size="-1">an image to be used in a feature description page in 
-      cases where one was not supplied by feature provider (should be JPEG)<IMG 
-      height=48 alt="" src="../old.icons/full/forms/def_provider.gif" width=109 
-      border=0>          
-                 </font></TD>
-    <TD></TD>
-    <TD bgColor=#ffffff><IMG height=150 alt="" 
-      src="icons/full/forms/def_provider.gif" width=190 border=0>&nbsp;</TD>
-    <TD> </TD>
-  </tr>
-  <tr>
-    <TD>3</TD>
-    <TD>&nbsp;Form Banner</TD>
-    <TD><font size="-1">form_banner&nbsp;</font></TD>
-    <TD><font size="-1">a banner image used in all form pages behind the heading
-      (shown here in 1:10 zoom out)</font></TD>
-    <TD><IMG height=3 alt="" 
-      src="../old.icons/full/forms/form_banner.gif" width=60 border=0></TD>
-    <TD bgColor=#ffffff>&nbsp;
-      <P></P></TD>
-    <TD> </TD>
-  </tr>
-  <tr bgColor=#dfdfb>
-    <TD>4</TD>
-    <TD>&nbsp;Form Banner Underline</TD>
-    <TD><font size="-1">form_underline&nbsp;</font></TD>
-    <TD><font size="-1">a second portion of the banner used under the heading
-      text (shown here in 1:10 zoom out)</font></TD>
-    <TD><IMG height=1 alt="" 
-      src="../old.icons/full/forms/form_underline.gif" width=60 border=0></TD>
-    <TD bgColor=#ffffff>&nbsp;
-      <P></P></TD>
-    <TD> </TD>
-  </tr>
-  
-  
-  
-  
-  <TR bgColor=#cccccc>
-    <TD colSpan=7><B><FONT size=+2>Wizard Graphic</FONT></B></TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>1</TD>
-    <TD>New Bookmark wizard</TD>
-    <TD><FONT size=-1>&nbsp;new_bookmark_wiz</FONT></TD>
-    <TD><font size="-1">creates a new update site bookmark</font></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/new_bookmark_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/new_bookmark_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>2</TD>
-    <TD>New Folder wizard</TD>
-    <TD><FONT size=-1>&nbsp;new_folder_wiz</FONT></TD>
-    <TD><font size="-1">creates a new bookmark folder</font></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/new_folder_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/new_folder_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR bgColor=#ffffff>
-    <TD>3</TD>
-    <TD>New Search wizard</TD>
-    <TD><FONT size=-1>&nbsp;new_search_wiz</FONT></TD>
-    <TD><FONT size=-1>creates a new search object</FONT></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/new_search_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/new_search_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>4</TD>
-    <TD>Install Feature wizard</TD>
-    <TD><FONT size=-1>&nbsp;install_wiz</FONT></TD>
-    <TD><font size="-1">installs a new feature into the platform</font></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/install_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/install_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR bgColor=#ffffff>
-    <TD >5</TD>
-    <TD>Update Feature wizard</TD>
-    <TD><FONT size=-1>&nbsp;update_wiz</FONT></TD>
-    <TD><font size="-1">installs a newer version of an already installed feature</font></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/update_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/update_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD >6</TD>
-    <TD>Configure Feature wizard</TD>
-    <TD><FONT size=-1>&nbsp;config_wiz</FONT></TD>
-    <TD><font size="-1">configures or unconfigures an installed feature</font></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/config_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/config_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR>
-    <TD>7</TD>
-    <TD>Uninstall Feature wizard</TD>
-    <TD><FONT size=-1>&nbsp;uninstall_wiz</FONT></TD>
-    <TD><font size="-1">permanently removes a feature from the platform</font></TD>
-    <TD><IMG height=58 alt="" 
-      src="../old.icons/full/wizban/uninstall_wiz.gif" 
-      width=75 border=0></TD>
-    <TD bgColor=#ffffff><IMG height=58 alt="" 
-      src="icons/full/wizban/uninstall_wiz.gif" width=75 border=0>&nbsp;</TD>
-    <TD> </TD></TR>
-  <TR bgColor=#dfdfb>
-    <TD>8</TD>
-    <TD>Default Install Wizard banner</TD>
-    <TD><FONT size=-1>&nbsp;def_wizban</FONT></TD>
-    <TD><font size="-1">a default image shown in install wizard pages when 
-      one is not supplied by feature providers<IMG height=258 alt="" 
-      src="../old.icons/full/wizban/def_wizban.jpg" width=118 
-border=0>         
-           </font></TD>
-    <TD></TD>
-    <TD bgColor=#ffffff><IMG height=258 alt="" 
-      src="icons/full/wizban/def_wizban.jpg" width=118 border=0>&nbsp;</TD>
-    <TD> </TD></TR></TABLE>
-<P></P></BODY></HTML>

diff --git a/update/org.eclipse.update.ui/about.html b/update/org.eclipse.update.ui/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.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>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/build.properties b/update/org.eclipse.update.ui/build.properties
deleted file mode 100644
index c6e000b..0000000
--- a/update/org.eclipse.update.ui/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-bin.includes = plugin.properties,\

-               icons/,\

-               *.jar,\

-               plugin.xml,\

-               about.html

-jars.compile.order = updateui.jar

-src.includes = about.html,\

-               schema/

-source.updateui.jar = src/

-#jars.extra.classpath = ../org.eclipse.tomcat/servlet.jar


diff --git a/update/org.eclipse.update.ui/icons/dlcl16/collapseall.gif b/update/org.eclipse.update.ui/icons/dlcl16/collapseall.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/update/org.eclipse.update.ui/icons/dlcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/dlcl16/hierarchicalLayout.gif b/update/org.eclipse.update.ui/icons/dlcl16/hierarchicalLayout.gif
deleted file mode 100644
index 52eeb6d..0000000
--- a/update/org.eclipse.update.ui/icons/dlcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/dlcl16/show_unconf.gif b/update/org.eclipse.update.ui/icons/dlcl16/show_unconf.gif
deleted file mode 100644
index f8cf96b..0000000
--- a/update/org.eclipse.update.ui/icons/dlcl16/show_unconf.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/dtool16/config_wiz.gif b/update/org.eclipse.update.ui/icons/dtool16/config_wiz.gif
deleted file mode 100644
index 2e8acec..0000000
--- a/update/org.eclipse.update.ui/icons/dtool16/config_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/dtool16/install_wiz.gif b/update/org.eclipse.update.ui/icons/dtool16/install_wiz.gif
deleted file mode 100644
index a89ff29..0000000
--- a/update/org.eclipse.update.ui/icons/dtool16/install_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/dtool16/uninstall_wiz.gif b/update/org.eclipse.update.ui/icons/dtool16/uninstall_wiz.gif
deleted file mode 100644
index 075fcd2..0000000
--- a/update/org.eclipse.update.ui/icons/dtool16/uninstall_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/dtool16/update_wiz.gif b/update/org.eclipse.update.ui/icons/dtool16/update_wiz.gif
deleted file mode 100644
index f59d449..0000000
--- a/update/org.eclipse.update.ui/icons/dtool16/update_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/elcl16/collapseall.gif b/update/org.eclipse.update.ui/icons/elcl16/collapseall.gif
deleted file mode 100644
index a2d80a9..0000000
--- a/update/org.eclipse.update.ui/icons/elcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/elcl16/hierarchicalLayout.gif b/update/org.eclipse.update.ui/icons/elcl16/hierarchicalLayout.gif
deleted file mode 100644
index 2344861..0000000
--- a/update/org.eclipse.update.ui/icons/elcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/elcl16/show_unconf.gif b/update/org.eclipse.update.ui/icons/elcl16/show_unconf.gif
deleted file mode 100644
index d95b705..0000000
--- a/update/org.eclipse.update.ui/icons/elcl16/show_unconf.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/etool16/config_wiz.gif b/update/org.eclipse.update.ui/icons/etool16/config_wiz.gif
deleted file mode 100644
index 95ac720..0000000
--- a/update/org.eclipse.update.ui/icons/etool16/config_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/etool16/install_wiz.gif b/update/org.eclipse.update.ui/icons/etool16/install_wiz.gif
deleted file mode 100644
index 224c63f..0000000
--- a/update/org.eclipse.update.ui/icons/etool16/install_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/etool16/uninstall_wiz.gif b/update/org.eclipse.update.ui/icons/etool16/uninstall_wiz.gif
deleted file mode 100644
index d333128..0000000
--- a/update/org.eclipse.update.ui/icons/etool16/uninstall_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/etool16/update_wiz.gif b/update/org.eclipse.update.ui/icons/etool16/update_wiz.gif
deleted file mode 100644
index aa84ebe..0000000
--- a/update/org.eclipse.update.ui/icons/etool16/update_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/eview16/configs.gif b/update/org.eclipse.update.ui/icons/eview16/configs.gif
deleted file mode 100644
index c984fba..0000000
--- a/update/org.eclipse.update.ui/icons/eview16/configs.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/eview16/preview.gif b/update/org.eclipse.update.ui/icons/eview16/preview.gif
deleted file mode 100644
index e6bf9cf..0000000
--- a/update/org.eclipse.update.ui/icons/eview16/preview.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/forms/def_provider.jpg b/update/org.eclipse.update.ui/icons/forms/def_provider.jpg
deleted file mode 100644
index bbb03fd..0000000
--- a/update/org.eclipse.update.ui/icons/forms/def_provider.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/forms/form_banner.gif b/update/org.eclipse.update.ui/icons/forms/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/update/org.eclipse.update.ui/icons/forms/form_banner.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/forms/form_banner.jpg b/update/org.eclipse.update.ui/icons/forms/form_banner.jpg
deleted file mode 100644
index 253e2d2..0000000
--- a/update/org.eclipse.update.ui/icons/forms/form_banner.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/forms/form_underline.jpg b/update/org.eclipse.update.ui/icons/forms/form_underline.jpg
deleted file mode 100644
index 0ff3d0b..0000000
--- a/update/org.eclipse.update.ui/icons/forms/form_underline.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/forms/topic.gif b/update/org.eclipse.update.ui/icons/forms/topic.gif
deleted file mode 100644
index b5dd4ec..0000000
--- a/update/org.eclipse.update.ui/icons/forms/topic.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/app_obj.gif b/update/org.eclipse.update.ui/icons/obj16/app_obj.gif
deleted file mode 100644
index 753cad7..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/app_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/bfolder_obj.gif b/update/org.eclipse.update.ui/icons/obj16/bfolder_obj.gif
deleted file mode 100644
index 10273e4..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/bfolder_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/category_obj.gif b/update/org.eclipse.update.ui/icons/obj16/category_obj.gif
deleted file mode 100644
index b487d07..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/category_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/config_obj.gif b/update/org.eclipse.update.ui/icons/obj16/config_obj.gif
deleted file mode 100644
index c984fba..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/config_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/efix2_obj.gif b/update/org.eclipse.update.ui/icons/obj16/efix2_obj.gif
deleted file mode 100644
index b138957..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/efix2_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/efix_obj.gif b/update/org.eclipse.update.ui/icons/obj16/efix_obj.gif
deleted file mode 100644
index 57fc499..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/efix_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/error_st_obj.gif b/update/org.eclipse.update.ui/icons/obj16/error_st_obj.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/error_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/esite_obj.gif b/update/org.eclipse.update.ui/icons/obj16/esite_obj.gif
deleted file mode 100644
index 25fd07b..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/esite_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/feature_obj.gif b/update/org.eclipse.update.ui/icons/obj16/feature_obj.gif
deleted file mode 100644
index 8706680..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/feature_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/history_obj.gif b/update/org.eclipse.update.ui/icons/obj16/history_obj.gif
deleted file mode 100644
index 289d43a..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/history_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/lsite_obj.gif b/update/org.eclipse.update.ui/icons/obj16/lsite_obj.gif
deleted file mode 100644
index d650bdb..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/lsite_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/notinstalled_feature_obj.gif b/update/org.eclipse.update.ui/icons/obj16/notinstalled_feature_obj.gif
deleted file mode 100644
index f192b84..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/notinstalled_feature_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/ok_st_obj.gif b/update/org.eclipse.update.ui/icons/obj16/ok_st_obj.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/ok_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/psite_obj.gif b/update/org.eclipse.update.ui/icons/obj16/psite_obj.gif
deleted file mode 100644
index 58897f1..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/psite_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/site_obj.gif b/update/org.eclipse.update.ui/icons/obj16/site_obj.gif
deleted file mode 100644
index b8568f4..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/site_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/unconf_feature_obj.gif b/update/org.eclipse.update.ui/icons/obj16/unconf_feature_obj.gif
deleted file mode 100644
index 86881fd..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/unconf_feature_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/updates_obj.gif b/update/org.eclipse.update.ui/icons/obj16/updates_obj.gif
deleted file mode 100644
index 16f4f7c..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/updates_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/usearch_obj.gif b/update/org.eclipse.update.ui/icons/obj16/usearch_obj.gif
deleted file mode 100644
index 5080599..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/usearch_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/obj16/web_bkmrk_obj.gif b/update/org.eclipse.update.ui/icons/obj16/web_bkmrk_obj.gif
deleted file mode 100644
index cdbc528..0000000
--- a/update/org.eclipse.update.ui/icons/obj16/web_bkmrk_obj.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/add_stat.gif b/update/org.eclipse.update.ui/icons/ovr16/add_stat.gif
deleted file mode 100644
index c123a2b..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/add_stat.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/current_co.gif b/update/org.eclipse.update.ui/icons/ovr16/current_co.gif
deleted file mode 100644
index 13077f9..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/current_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/del_stat.gif b/update/org.eclipse.update.ui/icons/ovr16/del_stat.gif
deleted file mode 100644
index ef0207c..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/del_stat.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/error_co.gif b/update/org.eclipse.update.ui/icons/ovr16/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/error_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/installable_co.gif b/update/org.eclipse.update.ui/icons/ovr16/installable_co.gif
deleted file mode 100644
index 5e999b6..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/installable_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/linked_co.gif b/update/org.eclipse.update.ui/icons/ovr16/linked_co.gif
deleted file mode 100644
index 2f40e1b..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/linked_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/mod_co.gif b/update/org.eclipse.update.ui/icons/ovr16/mod_co.gif
deleted file mode 100644
index 2b1b8d6..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/mod_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/unconfigured_co.gif b/update/org.eclipse.update.ui/icons/ovr16/unconfigured_co.gif
deleted file mode 100644
index 8a589ce..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/unconfigured_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/updated_co.gif b/update/org.eclipse.update.ui/icons/ovr16/updated_co.gif
deleted file mode 100644
index 0d686ab..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/updated_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/ovr16/warning_co.gif b/update/org.eclipse.update.ui/icons/ovr16/warning_co.gif
deleted file mode 100644
index ee2dac4..0000000
--- a/update/org.eclipse.update.ui/icons/ovr16/warning_co.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/wizban/config_wiz.gif b/update/org.eclipse.update.ui/icons/wizban/config_wiz.gif
deleted file mode 100644
index 6a19fbf..0000000
--- a/update/org.eclipse.update.ui/icons/wizban/config_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/wizban/def_wizban.jpg b/update/org.eclipse.update.ui/icons/wizban/def_wizban.jpg
deleted file mode 100644
index 4d7eba6..0000000
--- a/update/org.eclipse.update.ui/icons/wizban/def_wizban.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/wizban/install_wiz.gif b/update/org.eclipse.update.ui/icons/wizban/install_wiz.gif
deleted file mode 100644
index 7eee7c3..0000000
--- a/update/org.eclipse.update.ui/icons/wizban/install_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/wizban/uninstall_wiz.gif b/update/org.eclipse.update.ui/icons/wizban/uninstall_wiz.gif
deleted file mode 100644
index 1223378..0000000
--- a/update/org.eclipse.update.ui/icons/wizban/uninstall_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/icons/wizban/update_wiz.gif b/update/org.eclipse.update.ui/icons/wizban/update_wiz.gif
deleted file mode 100644
index 3b36487..0000000
--- a/update/org.eclipse.update.ui/icons/wizban/update_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/plugin.properties b/update/org.eclipse.update.ui/plugin.properties
deleted file mode 100644
index 8e08f1d..0000000
--- a/update/org.eclipse.update.ui/plugin.properties
+++ /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

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

-#

-# Update UI plugin.xml resources

-#

-pluginName = Install/Update UI

-providerName = Eclipse.org

-fragmentNameWin = Install/Update UI for Windows

-

-updateMenu.label = &Software Updates

-actionSets.softwareUpdates.label = Software Updates

-actionSets.updates.label = &Find and Install...

-actionSets.configManager.label = &Manage Configuration...

-actionSets.webSites.label = &Update Sites (experimental)

-

-searchCategory.name = Search Category

-searchCategories.updates = Available Updates

-searchCategories.updates.desc = <form><p>Search for updates to \

-features currently installed in this application. Updates are \

-features that have the same identifier as the installed features, \

-but newer versions.</p>\

-<p>Use scope settings to control the \

-extent of the search and the update sites that will be visited.</p>\

-<p>Note that the settings in <b>Preferences</b> affect whether the new feature \

-versions will be considered valid as updates.</p></form>

-

-searchCategories.expression = Regular Expressions

-searchCategories.expression.desc = <form><p>Search for features that \

-contain desired text or reqular expression. Use the query settings \

-to configure search options.</p></form>

-

-searchCategories.plugin = Plug-ins in Features

-searchCategories.plugin.desc = <form><p>Look for plug-ins that \

-are packaged in the features. This search category is useful \

-when required plug-ins of the feature you wanted to install \

-were not found in this application.</p></form>

-

-mainPreference.name = Install/Update

-

-properties.general-info.label = General Information

-properties.license.label = License Agreement

-properties.copyright.label = Copyright

-properties.status.label = Status

-properties.currentConfig.activities = Activities

-properties.configSite = Info
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/plugin.xml b/update/org.eclipse.update.ui/plugin.xml
deleted file mode 100644
index b64e43d..0000000
--- a/update/org.eclipse.update.ui/plugin.xml
+++ /dev/null

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin

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

-   name="%pluginName"

-   version="3.0.0"

-   provider-name="%providerName"

-   class="org.eclipse.update.internal.ui.UpdateUI">

-

-   <runtime>

-      <library name="updateui.jar">

-         <export name="*"/>

-         <packages prefixes="org.eclipse.update.internal.ui"/>

-      </library>

-   </runtime>

-   <requires>

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

-      <import plugin="org.eclipse.ui"/>

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

-      <import plugin="org.eclipse.help.base"/>

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

-      <import plugin="org.eclipse.ui.forms"/>

-   </requires>

-

-

-   <extension

-         point="org.eclipse.ui.actionSets">

-      <actionSet

-            label="%actionSets.softwareUpdates.label"

-            visible="true"

-            id="org.eclipse.update.ui.softwareUpdates">

-         <menu

-               label="%updateMenu.label"

-               path="help/helpEnd"

-               id="org.eclipse.update.ui.updateMenu">

-            <separator

-                  name="group0">

-            </separator>

-            <separator

-                  name="group1">

-            </separator>

-         </menu>

-         <action

-               label="%actionSets.configManager.label"

-               icon="icons/full/eview16/configs.gif"

-               helpContextId="org.eclipse.update.ui.newUpdates"

-               class="org.eclipse.update.internal.ui.ConfigurationManagerAction"

-               menubarPath="help/org.eclipse.update.ui.updateMenu/group0"

-               id="org.eclipse.update.ui.configManager">

-         </action>

-         <action

-               label="%actionSets.updates.label"

-               icon="icons/full/obj16/usearch_obj.gif"

-               helpContextId="org.eclipse.update.ui.newUpdates"

-               class="org.eclipse.update.internal.ui.InstallWizardAction"

-               menubarPath="help/org.eclipse.update.ui.updateMenu/group0"

-               id="org.eclipse.update.ui.newUpdates">

-         </action>

-      </actionSet>

-   </extension>

-   <extension

-         point="org.eclipse.ui.propertyPages">

-      <page

-            objectClass="org.eclipse.update.internal.ui.model.IFeatureAdapter"

-            name="%properties.general-info.label"

-            class="org.eclipse.update.internal.ui.properties.FeatureGeneralPropertyPage"

-            id="org.eclipse.update.ui.featureGeneralPropertyPage">

-      </page>

-      <page

-            objectClass="org.eclipse.update.internal.ui.model.IFeatureAdapter"

-            name="%properties.license.label"

-            class="org.eclipse.update.internal.ui.properties.FeatureLicensePropertyPage"

-            id="org.eclipse.update.ui.featureLicensePropertyPage">

-      </page>

-      <page

-            objectClass="org.eclipse.update.internal.ui.model.IFeatureAdapter"

-            name="%properties.copyright.label"

-            class="org.eclipse.update.internal.ui.properties.FeatureCopyrightPropertyPage"

-            id="org.eclipse.update.ui.featureCopyrightPropertyPage">

-      </page>

-      <page

-            objectClass="org.eclipse.update.internal.ui.model.ConfiguredFeatureAdapter"

-            name="%properties.status.label"

-            class="org.eclipse.update.internal.ui.properties.FeatureStatusPropertyPage"

-            id="org.eclipse.update.ui.featureStatusPropertyPage">

-      </page>

-      <page

-            objectClass="org.eclipse.update.internal.ui.model.IConfiguredSiteAdapter"

-            name="%properties.configSite"

-            class="org.eclipse.update.internal.ui.properties.ConfiguredSitePropertyPage"

-            id="org.eclipse.update.ui.configSite">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            name="%mainPreference.name"

-            class="org.eclipse.update.internal.ui.preferences.MainPreferencePage"

-            id="org.eclipse.update.internal.ui.preferences.MainPreferencePage">

-      </page>

-   </extension>

-

-</plugin>


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/AddBookmarksAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/AddBookmarksAction.java
deleted file mode 100644
index a0e96ca..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/AddBookmarksAction.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * Adds bookmarks to update sites
- */
-public class AddBookmarksAction extends Action {
-
-	public AddBookmarksAction() {
-		setText(UpdateUI.getString("AddBookmarksAction.add")); //$NON-NLS-1$
-	}
-
-	public void run() {
-		NewWebSiteDialog dialog = new NewWebSiteDialog(UpdateUI.getActiveWorkbenchShell());
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getString("AddBookmarksAction.new")); //$NON-NLS-1$
-		if (dialog.open() == NewWebSiteDialog.OK) {
-			UpdateUI.getDefault().getUpdateModel().saveBookmarks();
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerAction.java
deleted file mode 100644
index 269734b..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerAction.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.update.internal.ui;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * Insert the type's description here.
- * @see IWorkbenchWindowActionDelegate
- */
-public class ConfigurationManagerAction implements IWorkbenchWindowActionDelegate {
-
-	IWorkbenchWindow window;
-	ConfigurationManagerWindow openedWindow;
-	/**
-	 * The constructor.
-	 */
-	public ConfigurationManagerAction() {
-	}
-
-	/**
-	 * Insert the method's description here.
-	 */
-	public void run(IAction action) {
-		BusyIndicator
-			.showWhile(window.getShell().getDisplay(), new Runnable() {
-			public void run() {
-				openConfigurationManager();
-			}
-		});
-	}
-
-	private void openConfigurationManager() {
-		if (openedWindow!=null) {
-			restoreConfigurationWindow();
-			return;
-		}
-		ConfigurationManagerWindow cwindow = new ConfigurationManagerWindow(window.getShell());
-		cwindow.create();
-		cwindow.getShell().setText(UpdateUI.getString("ConfigurationManagerAction.title")); //$NON-NLS-1$
-		cwindow.getShell().setSize(800, 600);
-		cwindow.getShell().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				openedWindow = null;
-			}
-		});
-		cwindow.updateActionBars();
-		openedWindow = cwindow;
-		cwindow.open();
-	}
-	
-	private void restoreConfigurationWindow() {
-		Shell shell = openedWindow.getShell();
-		if (shell.getMinimized())
-			shell.setMinimized(false);
-		shell.open();
-	}
-
-	/**
-	 * Insert the method's description here.
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerWindow.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerWindow.java
deleted file mode 100644
index 97b1cca..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/ConfigurationManagerWindow.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.internal.ui;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.views.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * 
- */
-public class ConfigurationManagerWindow
-	extends ApplicationWindow
-	{
-	private ConfigurationView view;
-	private GlobalAction propertiesAction;
-	private IAction propertiesActionHandler;
-	
-	class GlobalAction extends Action implements IPropertyChangeListener {
-		private IAction handler;
-
-		public GlobalAction() {
-		}
-
-		public void setActionHandler(IAction action) {
-			if (handler != null) {
-				handler.removePropertyChangeListener(this);
-				handler = null;
-			}
-			if (action != null) {
-				this.handler = action;
-				action.addPropertyChangeListener(this);
-			}
-			if (handler != null) {
-				setEnabled(handler.isEnabled());
-				setChecked(handler.isChecked());
-			}
-		}
-
-		public void propertyChange(PropertyChangeEvent event) {
-			if (event.getProperty().equals(Action.ENABLED)) {
-				Boolean bool = (Boolean) event.getNewValue();
-				setEnabled(bool.booleanValue());
-			} else if (event.getProperty().equals(Action.CHECKED)) {
-				Boolean bool = (Boolean) event.getNewValue();
-				setChecked(bool.booleanValue());
-			}
-		}
-
-		public void run() {
-			if (handler != null)
-				handler.run();
-		}
-	}
-
-	/**
-	 * @param parentShell
-	 */
-	public ConfigurationManagerWindow(Shell parentShell) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL);
-		// Setup window.
-		addMenuBar();
-		addActions();
-		addToolBar(SWT.FLAT);
-		addStatusLine();
-	}
-
-	private void addActions() {
-		IMenuManager menuBar = getMenuBarManager();
-		IMenuManager fileMenu = new MenuManager(UpdateUI.getString("ConfigurationManagerWindow.fileMenu")); //$NON-NLS-1$
-		menuBar.add(fileMenu);
-
-		propertiesAction = new GlobalAction();
-		propertiesAction.setText(UpdateUI.getString("ConfigurationManagerWindow.properties")); //$NON-NLS-1$
-		propertiesAction.setEnabled(false);
-
-		fileMenu.add(propertiesAction);
-		fileMenu.add(new Separator());
-
-		Action closeAction = new Action() {
-			public void run() {
-				close();
-			}
-		};
-		closeAction.setText(UpdateUI.getString("ConfigurationManagerWindow.close")); //$NON-NLS-1$
-		fileMenu.add(closeAction);
-	}
-	
-	private void hookGlobalActions() {
-		if(propertiesActionHandler!=null)
-			propertiesAction.setActionHandler(propertiesActionHandler);
-	}
-	
-	protected Control createContents(Composite parent) {
-		view = new ConfigurationView(this);
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		layout.verticalSpacing = 0;
-		container.setLayout(layout);
-
-		GridData gd;
-		Label separator = new Label(container, SWT.SEPARATOR | SWT.HORIZONTAL);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.heightHint = 1;
-		separator.setLayoutData(gd);
-
-		view.createPartControl(container);
-		Control viewControl = view.getControl();
-		gd = new GridData(GridData.FILL_BOTH);
-		viewControl.setLayoutData(gd);
-		hookGlobalActions();
-
-		updateActionBars();
-
-		try {
-			ILocalSite localSite = SiteManager.getLocalSite();
-			view.getTreeViewer().setSelection(new StructuredSelection(localSite));
-		}
-		catch (CoreException e) {
-		}
-		
-		UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider();
-		getShell().setImage(provider.get(UpdateUIImages.DESC_CONFIGS_VIEW, 0));
-		
-		return container;
-	}
-
-	public void updateActionBars() {
-		getMenuBarManager().updateAll(false);
-		getToolBarManager().update(false);
-		getStatusLineManager().update(false);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#close()
-	 */
-	public boolean close() {
-		if (view != null)
-			view.dispose();
-		return super.close();
-	}
-	public StatusLineManager getStatusLineManager() {
-		return super.getStatusLineManager();
-	}
-	public void setPropertiesActionHandler(IAction handler){
-		propertiesActionHandler=handler;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/EditBookmarksAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/EditBookmarksAction.java
deleted file mode 100644
index dc91e36..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/EditBookmarksAction.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- */
-public class EditBookmarksAction extends Action {
-
-	public EditBookmarksAction() {
-		setText(UpdateUI.getString("EditBookmarksAction.edit")); //$NON-NLS-1$
-	}
-	
-	public void run() {
-		WebBookmarksDialog dialog = new WebBookmarksDialog(UpdateUI.getActiveWorkbenchShell());
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getString("EditBookmarksAction.title")); //$NON-NLS-1$
-		dialog.getShell().setSize(300,300);
-		dialog.open();
-	}
-
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/InstallWizardAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/InstallWizardAction.java
deleted file mode 100644
index 795da80..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/InstallWizardAction.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * Insert the type's description here.
- * @see IWorkbenchWindowActionDelegate
- */
-public class InstallWizardAction extends Action implements IWorkbenchWindowActionDelegate {
-
-	IWorkbenchWindow window;
-	/**
-	 * The constructor.
-	 */
-	public InstallWizardAction() {
-	}
-	public void run() {
-		init(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-		run(null);
-	}
-
-	/**
-	 */
-	public void run(IAction action) {
-		BusyIndicator
-			.showWhile(window.getShell().getDisplay(), new Runnable() {
-			public void run() {
-				doRun();
-			}
-		});
-	}
-
-	private void doRun() {
-		openNewUpdatesWizard();
-	}
-	
-	private void openNewUpdatesWizard() {
-		InstallWizard wizard = new InstallWizard();
-		WizardDialog dialog = new ResizableWizardDialog(window.getShell(), wizard);
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getString("InstallWizardAction.title")); //$NON-NLS-1$
-		SWTUtil.setDialogSize(dialog, 600, 500);
-		if (dialog.open() == IDialogConstants.OK_ID)
-			UpdateUI.requestRestart(wizard.isRestartNeeded());
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/RestartDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/RestartDialog.java
deleted file mode 100644
index d1c53a0..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/RestartDialog.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.update.internal.core.*;
-
-/**
- * A dialog which prompts the user to restart after an update operation
- * and provides Yes, No, Continue buttons. 
- */
-public class RestartDialog extends MessageDialog {
-	private static final int CONTINUE = 2;
-	private final static String[] yesNo = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL};
-	private final static String[] yesNoApply = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, UpdateUI.getString("ApplyChanges")}; //$NON-NLS-1$
-	
-	private int buttonId = 0;
-	
-	/**
-	 * Creates a new dialog
-	 * @see MessageDialog#MessageDialog(org.eclipse.swt.widgets.Shell, java.lang.String, org.eclipse.swt.graphics.Image, java.lang.String, int, java.lang.String[], int)
-	 */
-	public RestartDialog(Shell parent, String title, String message, boolean restartNeeded) {
-		super(parent,
-				title,
-				null,	// accept the default window icon
-				message,
-				QUESTION,
-				restartNeeded ? yesNo : yesNoApply, 
-				0);		// yes is the default
-	}
-
-	/**
-	 * Convenience method to open the Yes/No/Continue question dialog.
-	 *
-	 * @param parent the parent shell of the dialog, or <code>null</code> if none
-	 * @param restartIsReallyNeeded when false, the changes are applied to the current config
-	 * @return <code>true</code> if the user presses  YES
-	 *    <code>false</code> otherwise
-	 */
-	public static boolean openQuestion(Shell parent, boolean restartIsReallyNeeded) {
-		String title = UpdateUI.getString("RestartTitle"); //$NON-NLS-1$
-		String message = restartIsReallyNeeded ? UpdateUI.getString("RestartMessage"): UpdateUI.getString("OptionalRestartMessage"); //$NON-NLS-1$ //$NON-NLS-2$
-		RestartDialog dialog = new RestartDialog(parent, title,	message, restartIsReallyNeeded);
-		int button= dialog.open();
-		if (button == 2)
-			InstallConfiguration.applyChanges();
-		return button == 0; // Yes
-	}
-	
-	/**
-	 * When a button is pressed, store the preference.
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-	 */
-	protected void buttonPressed(int id) {
-		if (id == 2) { 
-			buttonId= CONTINUE;
-		} 
-		
-		super.buttonPressed(id);
-	}
-	
-	/**
-	 * Returns the user's selection,
-	 * <code>null</code> if the user hasn't chosen yet.
-	 * 
-	 * @return the user's selection or <code>null</code>
-	 */
-	public int getResult() {
-		return buttonId;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateLabelProvider.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateLabelProvider.java
deleted file mode 100644
index 9cd3060..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateLabelProvider.java
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUI.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUI.java
deleted file mode 100644
index 978aab0..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUI.java
+++ /dev/null

@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.net.URLEncoder;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.help.browser.*;
-import org.eclipse.help.internal.browser.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.program.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.plugin.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.security.*;
-import org.osgi.framework.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UpdateUI extends AbstractUIPlugin {
-	public static final String PLUGIN_ID = "org.eclipse.update.ui"; //$NON-NLS-1$
-	public static final String WEB_APP_ID = "org.eclipse.update"; //$NON-NLS-1$
-
-	
-	//The shared instance.
-	private static UpdateUI plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	private UpdateModel model;
-	private UpdateManagerAuthenticator authenticator;
-	private String appServerHost;
-	private int appServerPort;
-	private UpdateLabelProvider labelProvider;
-	private static boolean remindOnCancel = true;
-
-	/**
-	 * The constructor.
-	 */
-	public UpdateUI() {
-
-		plugin = this;
-		try {
-			resourceBundle =
-				ResourceBundle.getBundle(
-					"org.eclipse.update.internal.ui.UpdateUIPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UpdateUI getDefault() {
-		return plugin;
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		return getDefault().internalGetActivePage();
-	}
-
-	private IWorkbenchPage internalGetActivePage() {
-		IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
-		if (window != null)
-			return window.getActivePage();
-		return null;
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		return window != null ? window.getShell() : null;
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	public UpdateLabelProvider getLabelProvider() {
-		if (labelProvider == null)
-			labelProvider = new UpdateLabelProvider();
-		return labelProvider;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getString(String key) {
-		ResourceBundle bundle = UpdateUI.getDefault().getResourceBundle();
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static String getFormattedMessage(String key, String[] args) {
-		String text = getString(key);
-		return java.text.MessageFormat.format(text, args);
-	}
-
-	public static String getFormattedMessage(String key, String arg) {
-		String text = getString(key);
-		return java.text.MessageFormat.format(text, new String[] { arg });
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		model = new UpdateModel();
-		authenticator = new UpdateManagerAuthenticator();
-		Authenticator.setDefault(authenticator);
-		int historyPref =
-			getPluginPreferences().getInt(UpdateCore.P_HISTORY_SIZE);
-		if (historyPref > 0) {
-			UpdateCore.DEFAULT_HISTORY = historyPref;
-		}
-	}
-	
-	
-
-	public boolean isWebAppStarted() {
-		return appServerHost != null;
-	}
-
-	public String getAppServerHost() {
-		return appServerHost;
-	}
-
-	public int getAppServerPort() {
-		return appServerPort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (model != null)
-			model.shutdown();
-
-		if (labelProvider != null)
-			labelProvider.dispose();
-		super.stop(context);
-
-	}
-
-	public UpdateModel getUpdateModel() {
-		return model;
-	}
-
-	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 (status.getSeverity() != IStatus.INFO) {
-			if (showErrorDialog)
-				ErrorDialog.openError(
-					getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			//ResourcesPlugin.getPlugin().getLog().log(status);
-//			 Should log on the update plugin's log
-//			Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status);
-			Bundle bundle = Platform.getBundle("org.eclipse.update.ui");  //$NON-NLS-1$
-			Platform.getLog(bundle).log(status);
-		} else {
-			MessageDialog.openInformation(
-				getActiveWorkbenchShell(),
-				null,
-				status.getMessage());
-		}
-	}
-
-	public static IFeature[] searchSite(
-		String featureId,
-		IConfiguredSite site,
-		boolean onlyConfigured)
-		throws CoreException {
-		IFeatureReference[] references = null;
-
-		if (onlyConfigured)
-			references = site.getConfiguredFeatures();
-		else
-			references = site.getSite().getFeatureReferences();
-		Vector result = new Vector();
-
-		for (int i = 0; i < references.length; i++) {
-			IFeature feature = references[i].getFeature(null);
-			String id = feature.getVersionedIdentifier().getIdentifier();
-			if (featureId.equals(id)) {
-				result.add(feature);
-			}
-		}
-		return (IFeature[]) result.toArray(new IFeature[result.size()]);
-	}
-
-	public static IFeature[] getInstalledFeatures(IFeature feature) {
-		return getInstalledFeatures(feature, true);
-	}
-
-	public static IFeature[] getInstalledFeatures(
-		IFeature feature,
-		boolean onlyConfigured) {
-		Vector features = new Vector();
-		try {
-			ILocalSite localSite = SiteManager.getLocalSite();
-			IInstallConfiguration config = localSite.getCurrentConfiguration();
-			IConfiguredSite[] isites = config.getConfiguredSites();
-			VersionedIdentifier vid = feature.getVersionedIdentifier();
-			String id = vid.getIdentifier();
-
-			for (int i = 0; i < isites.length; i++) {
-				IConfiguredSite isite = isites[i];
-				IFeature[] result =
-					UpdateUI.searchSite(id, isite, onlyConfigured);
-				for (int j = 0; j < result.length; j++) {
-					IFeature installedFeature = result[j];
-					features.add(installedFeature);
-				}
-			}
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-		}
-		return (IFeature[]) features.toArray(new IFeature[features.size()]);
-	}
-
-
-	/**
-	 * Gets the authenticator.
-	 * @return Returns a UpdateManagerAuthenticator
-	 */
-	public UpdateManagerAuthenticator getAuthenticator() {
-		return authenticator;
-	}
-
-	public static URL getOriginatingURL(String id) {
-		IDialogSettings section = getOriginatingURLSection();
-		String value = section.get(id);
-		if (value != null) {
-			try {
-				return new URL(value);
-			} catch (MalformedURLException e) {
-			}
-		}
-		return null;
-	}
-
-	public static void setOriginatingURL(String id, URL url) {
-		IDialogSettings section = getOriginatingURLSection();
-		section.put(id, url.toString());
-	}
-
-	private static IDialogSettings getOriginatingURLSection() {
-		IDialogSettings settings = getDefault().getDialogSettings();
-		IDialogSettings section = settings.getSection("originatingURLs"); //$NON-NLS-1$
-		if (section == null)
-			section = settings.addNewSection("originatingURLs"); //$NON-NLS-1$
-		return section;
-	}
-
-	
-	/**
-	 * Prompts the user to restart
-	 * @param restartIsReallyNeeded true when a restart is needed, false if the user feels lucky (tm) and wants the changes
-	 * applied to the current config
-	 */
-	public static void requestRestart(boolean restartIsReallyNeeded) {
-		boolean restart =
-			RestartDialog.openQuestion(
-				getActiveWorkbenchShell(),
-				restartIsReallyNeeded);
-		if (restart)
-			PlatformUI.getWorkbench().restart();
-	}
-
-	public static void showURL(String url) {
-		showURL(url, false);
-	}
-	
-	public static void showURL(String url, boolean encodeHostAndPort) {
-		if (encodeHostAndPort)
-			url = encodeHostAndPort(url);
-
-		if (SWT.getPlatform().equals("win32")) { //$NON-NLS-1$
-			Program.launch(url);
-		} else {
-			IBrowser browser = BrowserManager.getInstance().createBrowser();
-			try {
-				browser.displayURL(url);
-			} catch (Exception e) {
-				UpdateUI.logException(e);
-			}
-		}
-	}
-
-	private static String encodeHostAndPort(String urlName) {
-		String callbackURL = getCallbackURLAsString();
-		if (callbackURL == null)
-			return urlName;
-		String callbackParameter = "updateURL=" + callbackURL; //$NON-NLS-1$
-		if (urlName.indexOf('?') != -1)
-			return urlName + "&" + callbackParameter; //$NON-NLS-1$
-		else
-			return urlName + "?" + callbackParameter; //$NON-NLS-1$
-	}
-	
-	private static String getCallbackURLAsString() {
-		String host = getDefault().getAppServerHost();
-		int port = getDefault().getAppServerPort();
-		if (host == null || port == 0)
-			return null;
-		else {
-			String value =
-				"http://" //$NON-NLS-1$
-					+ host
-					+ ":" //$NON-NLS-1$
-					+ port
-					+ "/" //$NON-NLS-1$
-					+ WEB_APP_ID
-					+ "/install"; //$NON-NLS-1$
-			try {
-				value = URLEncoder.encode(value, "UTF-8"); //$NON-NLS-1$
-			} catch (UnsupportedEncodingException e) {
-			}
-			return value;
-		}
-	}
-	
-	public static boolean getRemindOnCancel() {
-		return remindOnCancel;
-	}
-	
-	public static void setRemindOnCancel(boolean remind) {
-		remindOnCancel = remind; 
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIImages.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIImages.java
deleted file mode 100644
index ba0e51a..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIImages.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
-
-import java.net.*;
-
-import org.eclipse.jface.resource.*;
-
-/**
- * Bundle of all images used by the PDE plugin.
- */
-public class UpdateUIImages {
-
-	public final static String ICONS_PATH = "icons/"; //$NON-NLS-1$
-
-	/**
-	 * Set of predefined Image Descriptors.
-	 */
-	
-	private static final String PATH_OBJ= ICONS_PATH+"obj16/"; //$NON-NLS-1$
-	private static final String PATH_VIEW = ICONS_PATH+"eview16/"; //$NON-NLS-1$
-	private static final String PATH_LCL= ICONS_PATH+"elcl16/"; //$NON-NLS-1$
-	private static final String PATH_LCL_DISABLED= ICONS_PATH+"dlcl16/"; //$NON-NLS-1$
-	private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$
-	private static final String PATH_WIZBAN = ICONS_PATH + "wizban/"; //$NON-NLS-1$
-	public static final String PATH_FORMS = ICONS_PATH + "forms/"; //$NON-NLS-1$
-
-
-	/**
-	 * Frequently used images
-	 */
-
-	/**
-	 * OBJ16
-	 */
-	public static final ImageDescriptor DESC_APP_OBJ = create(PATH_OBJ, "app_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_BFOLDER_OBJ = create(PATH_OBJ, "bfolder_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CATEGORY_OBJ = create(PATH_OBJ, "category_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CONFIG_OBJ = create(PATH_OBJ, "config_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FEATURE_OBJ = create(PATH_OBJ, "feature_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EFIX_OBJ = create(PATH_OBJ, "efix2_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HISTORY_OBJ = create(PATH_OBJ, "history_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LSITE_OBJ = create(PATH_OBJ, "lsite_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PSITE_OBJ = create(PATH_OBJ, "psite_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ESITE_OBJ = create(PATH_OBJ, "esite_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SITE_OBJ = create(PATH_OBJ, "site_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_WEB_SITE_OBJ = create(PATH_OBJ, "web_bkmrk_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_UNCONF_FEATURE_OBJ = create(PATH_OBJ, "unconf_feature_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_UPDATES_OBJ = create(PATH_OBJ, "updates_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NOTINST_FEATURE_OBJ = create(PATH_OBJ, "notinstalled_feature_obj.gif");	 //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ERR_ST_OBJ = create(PATH_OBJ, "error_st_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OK_ST_OBJ = create(PATH_OBJ, "ok_st_obj.gif"); //$NON-NLS-1$
-
-	
-	/**
-	 * OVR16
-	 */
-	public static final ImageDescriptor DESC_LINKED_CO   = create(PATH_OVR, "linked_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_UPDATED_CO   = create(PATH_OVR, "updated_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_INSTALLABLE_CO = create(PATH_OVR, "installable_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CURRENT_CO = create(PATH_OVR, "current_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ERROR_CO = create(PATH_OVR, "error_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_WARNING_CO = create(PATH_OVR, "warning_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_MOD_CO = create(PATH_OVR, "mod_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ADD_CO = create(PATH_OVR, "add_stat.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEL_CO = create(PATH_OVR, "del_stat.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_UNCONF_CO = create(PATH_OVR, "unconfigured_co.gif"); //$NON-NLS-1$
-
-	/**
-	 * VIEW16
-	 */
-
-	public static final ImageDescriptor DESC_CONFIGS_VIEW = create(PATH_VIEW, "configs.gif"); //$NON-NLS-1$
-
-	/**
-	 * LCL
-	 */
-
-//	public static final ImageDescriptor DESC_SHOW_UNCONF = create(PATH_LCL, "show_unconf.gif"); //$NON-NLS-1$
-//	public static final ImageDescriptor DESC_SHOW_UNCONF_H = create(PATH_LCL_HOVER, "show_unconf.gif"); //$NON-NLS-1$
-//	public static final ImageDescriptor DESC_SHOW_UNCONF_D = create(PATH_LCL_DISABLED, "show_unconf.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_HIERARCHY = create(PATH_LCL, "hierarchicalLayout.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_HIERARCHY_D = create(PATH_LCL_DISABLED, "hierarchicalLayout.gif"); //$NON-NLS-1$
-
-	/**
-	 * WIZ
-	 */
-//	public static final ImageDescriptor DESC_INSTALL_WIZ  = create(PATH_WIZBAN, "install_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_UPDATE_WIZ  = create(PATH_WIZBAN, "update_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CONFIG_WIZ  = create(PATH_WIZBAN, "config_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_UNINSTALL_WIZ  = create(PATH_WIZBAN, "uninstall_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_INSTALL_BANNER  = create(PATH_WIZBAN, "def_wizban.jpg"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROVIDER = create(PATH_FORMS, "def_provider.jpg"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ITEM = create(PATH_FORMS, "topic.gif"); //$NON-NLS-1$
-
-	private static ImageDescriptor create(String prefix, String name) {
-		return ImageDescriptor.createFromURL(makeImageURL(prefix, name));
-	}
-
-
-	private static URL makeImageURL(String prefix, String name) {
-		try {
-			URL base = UpdateUI.getDefault().getBundle().getEntry(prefix);
-			return new URL(base, name);
-		}
-		catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
deleted file mode 100644
index 052728d..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
+++ /dev/null

@@ -1,405 +0,0 @@
-###############################################################################

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

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

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

-# which accompanies this distribution, and is available at

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

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

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

-# 

-#

-#

-RestartTitle = Install/Update

-RestartMessage = You will need to restart the workbench for the changes to take effect. \

-Would you like to restart now?

-

-OptionalRestartMessage = It is recommended you restart the workbench for the changes to take effect, \

-but it may be possible to apply the changes to the current configuration without restarting.\

-Would you like to restart now?

-

-ApplyChanges=Apply Changes

-

-AddBookmarksAction.add=Add Bookmark...

-AddBookmarksAction.new=New Bookmark

-

-ConfigurationManagerAction.title=Product Configuration

-ConfigurationManagerWindow.fileMenu=&File

-ConfigurationManagerWindow.properties=&Properties@Alt+Enter

-ConfigurationManagerWindow.close=&Close@Alt+F4

-

-EditBookmarksAction.edit=Edit Bookmarks...

-EditBookmarksAction.title=Bookmarks

-

-InstallWizardAction.title=Install/Update

-InstallWizard.retryTitle = Problem occurred

-InstallWizard.retry = Do you want to retry?

-

-WebBookmarksDialog.label=Current Bookmarks:

-WebBookmarksDialog.add=Add...

-WebBookmarksDialog.new=New Bookmark

-WebBookmarksDialog.edit=Edit...

-WebBookmarksDialog.editTitle=Edit Bookmark

-WebBookmarksDialog.remove=Remove

-

-DiscoveryFolder.name=Sites to Visit

-FeatureAdapter.failure=<failure>

-SiteBookmark.connecting = Connecting to "{0}"...

-SiteBookmark.downloading = Downloading:\ 

-SiteCategory.other.label = Other

-SiteCategory.other.description = Features found under this category are either not categorized or their categories could not be found on server.

-

-MainPreferencePage.checkSignature = Check digital &signatures of downloaded archives

-MainPreferencePage.historySize = &Maximum number of 'History' configurations:

-MainPreferencePage.updateVersions = Valid updates

-MainPreferencePage.updateVersions.equivalent = e&quivalent (1.0.1 -> 1.0.2 - only service increments)

-MainPreferencePage.updateVersions.compatible = &compatible (1.0.9 -> 1.1.0 - service and minor increments)

-MainPreferencePage.updatePolicy = &Update Policy

-MainPreferencePage.updatePolicyURL = Po&licy URL:

-MainPreferencePage.proxyGroup = Proxy settings

-MainPreferencePage.enableHttpProxy = E&nable HTTP proxy connection

-MainPreferencePage.httpProxyHost = &HTTP proxy host address:

-MainPreferencePage.httpProxyPort =  HTTP &proxy host port:

-MainPreferencePage.digitalSignature.title = Digital Signature Check

-MainPreferencePage.digitalSignature.message = You have chosen to disable digital signature \

-checks for downloaded archives. Note that unsigned archives may \

-contain software that can harm your computer.

-

-UpdateSettingsPreferencePage.description=Settings for automatic feature update

-UpdateSettingsPreferencePage.label=Address &Mappings URL:

-UpdateSettingsPreferencePage.invalid=Invalid mappings URL

-

-ConfigurationActivitiesPropertyPage.label=Activities that caused the creation of this configuration:

-

-ConfiguredSitePropertyPage.path=Location path: 

-ConfiguredSitePropertyPage.type=Location type: 

-ConfiguredSitePropertyPage.enabled=Enabled: 

-ConfiguredSitePropertyPage.yes=yes

-ConfiguredSitePropertyPage.no=no

-ConfiguredSitePropertyPage.private=private

-ConfiguredSitePropertyPage.extension=product extension

-ConfiguredSitePropertyPage.product=product

-ConfiguredSitePropertyPage.unknown=unknown

-

-FeatureCopyrightPropertyPage.showInBrowser=Show in Browser

-FeatureCopyrightPropertyPage.noCopyright=Feature does not contain a copyright statement

-

-FeatureGeneralPropertyPage.name=Name:

-FeatureGeneralPropertyPage.id=Identifier:

-FeatureGeneralPropertyPage.version=Version:

-FeatureGeneralPropertyPage.provider=Provider:

-FeatureGeneralPropertyPage.size=Size:

-FeatureGeneralPropertyPage.platforms=Supported Platforms

-FeatureGeneralPropertyPage.os=Operating System: 

-FeatureGeneralPropertyPage.ws=Windowing System: 

-FeatureGeneralPropertyPage.arch=CPU Architecture: 

-FeatureGeneralPropertyPage.nl=Languages: 

-FeatureGeneralPropertyPage.all=all

-FeatureGeneralPropertyPage.desc=Description

-

-FeatureLicensePropertyPage.showInBrowser=Show in Browser

-FeatureLicensePropertyPage.noLicense=Feature does not contain a license.

-

-FeatureStatusPropertyPage.pendingChanges=The feature has pending changes.  Therefore, its status cannot be determined until you restart the workbench.

-FeatureStatusPropertyPage.reason=Reason:

-FeatureStatusPropertyPage.missingOptional=This optional feature is currently not installed.

-FeatureStatusPropertyPage.missing=Referenced feature not found.

-FeatureStatusPropertyPage.goodConfiguration=The feature is configured properly.

-

-JarVerificationDialog.wtitle = Jar Verification

-JarVerificationDialog.Title= Feature verification

-JarVerificationDialog.Verification=Verification

-JarVerificationDialog.ComponentNotInstalled=This feature will not be installed.

-

-JarVerificationDialog.AboutToInstall.File=Warning: You are about to install an unsigned feature file.

-JarVerificationDialog.NotDigitallySigned.File= Warning: This feature file has not been digitally signed.

-JarVerificationDialog.CannotVerifyProvider.File=The provider of this feature file cannot be verified.

-JarVerificationDialog.CorruptedContent.File=The content of this feature file has been corrupted

-JarVerificationDialog.SignedComponent.File=You are about to install a signed feature file.

-JarVerificationDialog.UnknownCertificate.File=The certificates used to authenticate this feature file are not recognized.

-JarVerificationDialog.UnableToVerifyProvider.File=The provider of this feature file cannot be verified.

-JarVerificationDialog.ProviderKnown.File=The provider of this feature file has been validated by a trusted third party.

-JarVerificationDialog.KnownCertificate.File=One of the certificates used to authenticate this feature file was recognized.

-

-JarVerificationDialog.AboutToInstall.Feature=Warning: You are about to install an unsigned feature.

-JarVerificationDialog.NotDigitallySigned.Feature= Warning: This feature has not been digitally signed.

-JarVerificationDialog.CannotVerifyProvider.Feature=The provider of this feature cannot be verified.

-JarVerificationDialog.CorruptedContent.Feature=The content of this feature has been corrupted

-JarVerificationDialog.SignedComponent.Feature=You are about to install a signed feature.

-JarVerificationDialog.UnknownCertificate.Feature=The certificates used to authenticate this feature are not recognized.

-JarVerificationDialog.UnableToVerifyProvider.Feature=The provider of this feature cannot be verified.

-JarVerificationDialog.ProviderKnown.Feature=The provider of this feature has been validated by a trusted third party.

-JarVerificationDialog.KnownCertificate.Feature=One of the certificates used to authenticate this feature was recognized.

-

-JarVerificationDialog.Caution=\r\nCaution: \"{0}\" asserts that the content of this feature is safe. \r\nYou should only install this feature if you trust \"{0}\" to make that assertion

-JarVerificationDialog.FileName=File Identifier:

-JarVerificationDialog.FeatureName=Feature name:

-JarVerificationDialog.FeatureIdentifier=Feature Identifier:

-JarVerificationDialog.Provider=	Provider:

-JarVerificationDialog.MayChooseToInstall=You may choose to install the feature or cancel its installation.

-JarVerificationDialog.MayChooseToContinue=You may choose to continue to install the feature or cancel its installation.

-JarVerificationDialog.Install=&Install

-JarVerificationDialog.Continue=C&ontinue

-JarVerificationDialog.Cancel=&Cancel

-JarVerificationDialog.RootCA= According to: 

-JarVerificationDialog.SubjectCA= File signed by: 

-JarVerificationDialog.CertificateInfo= Certificate:

-

-UserVerificationDialog.PasswordRequired=Password Required

-UserVerificationDialog.ConnectTo=Connect to: 

-UserVerificationDialog.Password=Password:

-UserVerificationDialog.UserName=User name:

-

-ConfigurationPreviewForm.configDescription=This is the description of the current configuration.

-ConfigurationPreviewForm.install=Install Location

-

-ConfigurationView.missingFeature = {0} (not installed)

-ConfigurationView.current=Current Configuration

-ConfigurationView.pending=\ (pending changes)

-ConfigurationView.error=Error

-ConfigurationView.collapseLabel=Collapse All

-ConfigurationView.collapseTooltip=Collapse All

-ConfigurationView.revertLabel=Revert...

-ConfigurationView.installHistory =Installation History

-ConfigurationView.extLocation=Extension Location...

-ConfigurationView.uninstall=Uninstall

-ConfigurationView.install=Install

-ConfigurationView.anotherVersion=&Another Version...

-ConfigurationView.findUpdates=Find Updates...

-ConfigurationView.showNestedFeatures=Show Nested Features

-ConfigurationView.showNestedTooltip=Show Nested Features

-ConfigurationView.showInstall=Show Install Locations

-ConfigurationView.showInstallTooltip=Show Install Locations

-ConfigurationView.showDisabled=Show Disabled Features

-ConfigurationView.showDisabledTooltip=Show Disabled Features

-ConfigurationView.new=New

-ConfigurationView.replaceWith=Replace with

-ConfigurationView.revertPreviousLabel=Revert to Previous

-ConfigurationView.revertPreviousDesc=You can revert to one of the previous configurations if you are having problems with the current one.

-ConfigurationView.updateLabel=Scan for Updates

-ConfigurationView.updateDesc=Search for updates for all the installed features.

-ConfigurationView.detectedChanges=Detected Changes...

-ConfigurationView.detectedLabel=Process Detected Changes

-ConfigurationView.detectedDesc=Process configuration changes that were detected by the configuration manager.

-ConfigurationView.installHistLabel=View Installation History

-ConfigurationView.installHistDesc=View all activities since the installation of the product.

-ConfigurationView.activitiesLabel=Show Activities

-ConfigurationView.activitiesDesc=View the activities that caused the creation of this configuration.

-ConfigurationView.enableLocDesc=You can enable or disable an entire install location. Disabling a location is equivalent to disabling every feature in it.

-ConfigurationView.extLocLabel=Add an Extension Location

-ConfigurationView.extLocDesc=Locate and add an extension location to the current configuration.

-ConfigurationView.propertiesLabel=Show Properties

-ConfigurationView.installPropDesc=View the properties of the install location.

-ConfigurationView.replaceVersionLabel=Replace With Another Version

-ConfigurationView.replaceVersionDesc=Disables the current version of the feature and replaces it with another version from the list of the currently disabled features.

-ConfigurationView.enableFeatureDesc=You can enable or disable a feature. Function provided by the feature will be removed but the feature itself will still be present to be enabled later.

-ConfigurationView.installOptionalLabel=Install from Originating Server

-ConfigurationView.installOptionalDesc=This optional feature was not originally installed. You can install it now by connecting to the originating server of the parent.

-ConfigurationView.uninstallLabel=Uninstall

-ConfigurationView.uninstallDesc=This feature is currently not used and can be uninstalled from the product.

-ConfigurationView.scanLabel=Scan for Updates

-ConfigurationView.scanDesc=Search for updates for this feature.

-ConfigurationView.featurePropLabel=Show Properties

-ConfigurationView.featurePropDesc=View properties of the feature such as version, provider name, license agreement etc.

-

-Actions.brokenConfigQuestion=The current configuration contains errors and this operation can have unpredictable results. Do you want to continue ?

-

-FeatureStateAction.disable=Disable

-FeatureStateAction.enable=Enable

-FeatureStateAction.disableQuestion=Do you want to disable this feature?

-FeatureStateAction.EnableQuestion=Do you want to enable this feature?

-FeatureStateAction.dialogTitle=Current Configuration

-

-FeatureUninstallAction.uninstall=Uninstall

-FeatureUninstallAction.uninstallQuestion=Do you want to uninstall this feature?

-FeatureUninstallAction.dialogTitle=Current Configuration

-

-SiteStateAction.dialogTitle=Current Configuration

-SiteStateAction.disableLabel=Disable

-SiteStateAction.disableMessage=Do you want to disable all the features in "{0}"?

-SiteStateAction.enableLabel=Enable

-SiteStateAction.enableMessage=Do you want to enable features in "{0}"?

-

-FindUpdatesAction.updates=Updates

-

-InstallationHistoryAction.title=Installation History

-InstallationHistoryAction.desc=The list below represents the history of your update activities from the product installation to date. Each operation carries a date it commenced, as well as activities performed. Operations are sorted by date in ascending order.

-InstallationHistoryAction.activity=ACTIVITY

-InstallationHistoryAction.dateTime=Date / Time

-InstallationHistoryAction.target=Target

-InstallationHistoryAction.action=Action

-InstallationHistoryAction.status=Status

-InstallationHistoryAction.errors=Errors while creating installation history file.

-

-NewExtensionLocationAction.selectExtLocation=Select an extension location.

-NewExtensionLocationAction.extInfoTitle=Invalid Extension

-NewExtensionLocationAction.extInfoMessage=Selected location does not contain extension.  Please select another location.

-

-ActivitiesTableViewer.enabled=Enabled

-ActivitiesTableViewer.featureInstalled=Feature Installed

-ActivitiesTableViewer.featureRemoved=Feature Removed

-ActivitiesTableViewer.siteInstalled=Site Installed

-ActivitiesTableViewer.siteRemoved=Site Removed

-ActivitiesTableViewer.disabled=Disabled

-ActivitiesTableViewer.revert=Revert

-ActivitiesTableViewer.reconcile=Reconcile

-ActivitiesTableViewer.unknown=unknown

-ActivitiesTableViewer.date=Date

-ActivitiesTableViewer.target=Target

-ActivitiesTableViewer.action=Action

-

-DeltaFeatureAdapter.shortName = {0} ({1})

-DeltaFeatureAdapter.longName = {0} ({1}) in {2}

-

-DuplicateConflictsDialog.title = Duplicate Conflicts

-DuplicateConflictsDialog.message = If you continue with the update/install, \

-the resulting configuration will contain duplication conflicts \

-that may cause parts of the product to be unusable. Do you want to \

-continue?

-DuplicateConflictsDialog.treeLabel = &Detected conflicts:

-

-InstallDeltaWizard.wtitle = Configuration Changes

-InstallDeltaWizard.processing = Processing pending changes:

-InstallDeltaWizard.title = Pending Configuration Changes

-InstallDeltaWizard.desc = Check the changes you wish to process now. Remove changes that should never be processed.

-InstallDeltaWizard.label = Detected &changes:

-InstallDeltaWizard.delete = &Remove

-InstallDeltaWizard.errors = &Error Details...

-InstallDeltaWizard.message = Selected update will result in an invalid configuration.

-

-ModeSelectionPage.title=Feature Updates

-ModeSelectionPage.desc=Choose the way you want to search for features to install

-ModeSelectionPage.updates=Search for updates of the currently installed features

-ModeSelectionPage.newFeatures=Search for new features to install

-

-MoreInfoGenerator.notInstalled=not installed

-MoreInfoGenerator.all=all

-MoreInfoGenerator.license=License

-MoreInfoGenerator.HTMLlicense=HTML version of the license agreement

-MoreInfoGenerator.licenseAvailable=is also available.

-MoreInfoGenerator.copyright=Copyright

-MoreInfoGenerator.HTMLcopyright=HTML version of the copyright

-MoreInfoGenerator.copyrightAvailable=is also available.

-MoreInfoGenerator.platforms=Supported Platforms

-MoreInfoGenerator.footprint=Footprint

-MoreInfoGenerator.downloadSize=Download size:

-MoreInfoGenerator.installSize=Install size:

-MoreInfoGenerator.downloadTime=Estimated download time:

-MoreInfoGenerator.lessthanone=less than one minute

-MoreInfoGenerator.desc=Description

-MoreInfoGenerator.moreInfo=More info...

-

-NewUpdateSiteDialog.name=Name: 

-NewUpdateSiteDialog.url=URL: 

-

-InstallWizard.wtitle=Install

-InstallWizard.OptionalFeaturesPage.title= Optional Features

-InstallWizard.OptionalFeaturesPage.desc = Some of the features that are included in this feature are optional.

-InstallWizard.OptionalFeaturesPage.treeLabel = &Available optional features:

-InstallWizard.OptionalFeaturesPage.selectAll = &Select All

-InstallWizard.OptionalFeaturesPage.deselectAll = &Deselect All

-

-InstallWizard.ReviewPage.counter = {0} of {1} selected.

-InstallWizard.ReviewPage.title=Search Results

-InstallWizard.ReviewPage.desc=Select features to install from the search result list.

-InstallWizard.ReviewPage.label=Select the &features to install:

-InstallWizard.ReviewPage.selectAll=&Select All

-InstallWizard.ReviewPage.deselectAll=&Deselect All

-InstallWizard.ReviewPage.moreInfo=&More Info

-InstallWizard.ReviewPage.properties=&Properties

-InstallWizard.ReviewPage.showStatus=&Error Details...

-InstallWizard.ReviewPage.filterFeatures=\ &Filter features included in other features on the list

-InstallWizard.ReviewPage.filterPatches=\ &Filter patches included in other patches on the list

-InstallWizard.ReviewPage.feature=Feature

-InstallWizard.ReviewPage.version=Version

-InstallWizard.ReviewPage.provider=Provider

-InstallWizard.ReviewPage.prop=&Properties

-InstallWizard.ReviewPage.invalid.long=Invalid combination - select \"Show Status...\" for details.

-InstallWizard.ReviewPage.invalid.short=Invalid combination

-InstallWizard.ReviewPage.cycle=Cycle starting at {0}

-

-InstallWizard.LicensePage.accept = I &accept the terms in the license agreement

-InstallWizard.LicensePage.accept2 = I &accept the terms in the license agreements

-InstallWizard.LicensePage.decline = I &do not accept the terms in the license agreement

-InstallWizard.LicensePage.decline2 = I &do not accept the terms in the license agreements

-InstallWizard.LicensePage.desc = This feature has a license \

-agreement that you need to accept before proceeding with \

-the installation.

-InstallWizard.LicensePage.desc2 = Some of the features have license \

-agreements that you need to accept before proceeding with \

-the installation.

-InstallWizard.LicensePage.down=Next &License

-InstallWizard.LicensePage.header={0} out of {1}: {2} ({3})

-InstallWizard.LicensePage.title = Feature License

-InstallWizard.LicensePage.up=&Previous License

-

-InstallWizard.TargetPage.title = Install Location

-InstallWizard.TargetPage.desc = Choose the location where the features will be installed.

-InstallWizard.TargetPage.jobsLabel = &Features to install:

-InstallWizard.TargetPage.siteLabel = A&vailable sites:

-InstallWizard.TargetPage.new = &Add Site...

-InstallWizard.TargetPage.delete = &Remove Site

-InstallWizard.TargetPage.requiredSpace = Required space:

-InstallWizard.TargetPage.availableSpace = Free space:

-InstallWizard.TargetPage.location = Target Location

-InstallWizard.TargetPage.location.message = Select a new install location

-InstallWizard.TargetPage.location.empty = Target install location must be selected. If none is available, create a new one.

-InstallWizard.TargetPage.location.exists = Target location already exists.

-InstallWizard.TargetPage.location.error.title = Invalid Location

-InstallWizard.TargetPage.location.error.message = The selected location cannot be used to install features: {0}

-InstallWizard.TargetPage.location.error.reason = Reason: {0}

-InstallWizard.TargetPage.size = {0}KB

-InstallWizard.TargetPage.unknownSize = Unknown

-IntallWizard.TargetPage.patchError = Patch '{0}' must be installed in the same site as '{1}'

-

-RevertConfigurationWizard.wtitle=Revert to a Previous Configuration

-RevertConfigurationWizardPage.title=Revert to a Previous Configuration

-RevertConfigurationWizardPage.desc=Choose a stable configuration to which you would like to revert

-RevertConfigurationWizardPage.label=&Past configurations:

-RevertConfigurationWizardPage.activities=&Activities that caused the creation of this configuration:

-RevertConfigurationWizardPage.question=This operation requires restarting the workbench.  Would you like to proceed?

-

-Revert.ProblemDialog.title = Restore Problems

-

-ShowActivitiesDialog.title = Current Configuration

-ShowActivitiesDialog.date = Date:

-ShowActivitiesDialog.loc = Location: 

-ShowActivitiesDialog.label = Activities that caused the creation of the current configuration:

-

-SitePage.title=Update sites to visit

-SitePage.desc=Select update sites to visit while looking for new features.

-SitePage.label=&Sites to include in search:

-SitePage.addUpdateSite=Add &Update Site...

-SitePage.addLocalSite=Add &Local Site...

-SitePage.addLocalZippedSite=Add &Archived Site...

-SitePage.edit=&Edit...

-SitePage.remove=&Remove

-SitePage.ignore=Ignore features not applicable to this environment

-SitePage.new=New Update Site

-SitePage.dialogEditLocal=Edit Local Site

-SitePage.dialogEditUpdateSite=Edit Update Site

-SitePage.connecting=Connecting

-SearchRunner.connectionError=Connection error

-

-LocalSiteSelector.dialogMessage=Select a local update site.

-LocalSiteSelector.dirInfoTitle=Invalid Site

-LocalSiteSelector.dirInfoMessage=Selected location does not contain an update site.  Please select another location.

-LocalSiteSelector.dialogMessagezip=Select Local Site Archive

-LocalSiteSelector.zipInfoTitle=Invalid Site

-LocalSiteSelector.zipInfoMessage=Selected archive does not contain an update site.  Please select another archive.

-

-InstallServlet.unknownServerURL=Update server URL is unknown.

-InstallServlet.noFeatures=No features to install.

-InstallServlet.inProgress = Another install session is already in progress.

-InstallServlet.incorrectURLFormat=Update server URL has incorrect format: {0}

-InstallServlet.contactWebmaster=Contact Web master that maintains the page that initiated this operation.

-

-MissingFeature.provider = N/A

-MissingFeature.desc.unknown = The feature was not loaded due to errors. Open feature properties for details.

-MissingFeature.desc.optional = This optional feature has not been installed.

-InstallDeltaWizard.reminder=To process these changes at a later time, go to Help->Software Updates->Manage Configuration...

-SwapFeatureWizard.title=Replace With Another Version

-SwapFeatureWizardPage.title=Replace With Another Version

-SwapFeatureWizardPage.desc=Disable the current version of the feature and replace it with one of the versions from the list

-SwapFeatureWizardPage.label=&Available disabled versions:


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/WebBookmarksDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/WebBookmarksDialog.java
deleted file mode 100644
index 9791ace..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/WebBookmarksDialog.java
+++ /dev/null

@@ -1,207 +0,0 @@
-package org.eclipse.update.internal.ui;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.operations.*;
-
-/**
- * @author Wassim Melhem
- */
-public class WebBookmarksDialog extends Dialog {
-	
-	class ModelListener implements IUpdateModelChangedListener {
-		public void objectChanged(Object object, String property) {
-			viewer.refresh();
-		}
-
-		public void objectsAdded(Object parent, Object[] children) {
-			viewer.refresh();
-		}
-
-		public void objectsRemoved(Object parent, Object[] children) {
-			viewer.refresh();
-		}
-	}
-	
-	class ContentProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-			Object[] bookmarks = model.getBookmarkLeafs();
-			Object[] sitesToVisit = discoveryFolder.getChildren(discoveryFolder);
-			Object[] all = new Object[bookmarks.length + sitesToVisit.length];
-			System.arraycopy(bookmarks, 0, all, 0, bookmarks.length);
-			System.arraycopy(sitesToVisit, 0, all, bookmarks.length, sitesToVisit.length);
-			return all;
-		}
-		
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		public void dispose() {
-		}
-	}
-	
-	class WebSiteLabelProvider extends LabelProvider {
-		public Image getImage(Object element) {
-			UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider();
-			if (element instanceof BookmarkFolder) 
-				return provider.get(UpdateUIImages.DESC_BFOLDER_OBJ,0);
-			if (element instanceof SiteBookmark)
-				return provider.get(UpdateUIImages.DESC_WEB_SITE_OBJ,0);
-			return null;
-		}
-		public String getText(Object element) {
-			return super.getText(element);
-		}
-		
-	}
-	
-	private Button addButton;
-	private Button editButton;
-	private Button removeButton;
-	private ModelListener modelListener;
-	private TableViewer viewer;
-	private DiscoveryFolder discoveryFolder = new DiscoveryFolder();
-
-	public WebBookmarksDialog(Shell parentShell) {
-		super(parentShell);
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-		modelListener = new ModelListener();
-		UpdateUI.getDefault().getUpdateModel().addUpdateModelChangedListener(
-			modelListener);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Label label = new Label(container, SWT.NONE);
-		label.setText(UpdateUI.getString("WebBookmarksDialog.label")); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		
-		Table table = new Table(container, SWT.BORDER | SWT.V_SCROLL);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		viewer = new TableViewer(table);		
-		viewer.setContentProvider(new ContentProvider());
-		viewer.setLabelProvider(new WebSiteLabelProvider());
-		viewer.setInput(UpdateUI.getDefault().getUpdateModel());
-		
-		viewer.addFilter(new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				if (element instanceof SiteBookmark)
-					return ((SiteBookmark)element).isWebBookmark();
-				return true;
-			}
-		});
-		
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				IStructuredSelection ssel =
-					(IStructuredSelection) e.getSelection();
-				if (ssel.size() == 0) 
-					return;				
-				SiteBookmark bookmark = (SiteBookmark)ssel.getFirstElement();
-				Object parent = bookmark.getParent(bookmark);
-				editButton.setEnabled(parent == null || !parent.equals(discoveryFolder));
-				removeButton.setEnabled(parent == null || !parent.equals(discoveryFolder));
-			}
-		});
-
-		createButtons(container);
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-	
-	private void createButtons(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-		
-
-		addButton = new Button(container, SWT.PUSH);
-		addButton.setText(UpdateUI.getString("WebBookmarksDialog.add")); //$NON-NLS-1$
-		addButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		addButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				NewWebSiteDialog dialog = new NewWebSiteDialog(getShell());
-				dialog.create();
-				dialog.getShell().setText(UpdateUI.getString("WebBookmarksDialog.new")); //$NON-NLS-1$
-				dialog.open();
-			}
-		});
-				
-		editButton = new Button(container, SWT.PUSH);
-		editButton.setText(UpdateUI.getString("WebBookmarksDialog.edit")); //$NON-NLS-1$
-		editButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		editButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection ssel =
-					(IStructuredSelection) viewer.getSelection();
-				SiteBookmark bookmark = (SiteBookmark) ssel.getFirstElement();		
-				EditSiteDialog dialog = new EditSiteDialog(getShell(), bookmark);
-				dialog.create();
-				dialog.getShell().setText(UpdateUI.getString("WebBookmarksDialog.editTitle")); //$NON-NLS-1$
-				dialog.open();
-			}
-		});
-		editButton.setEnabled(false);
-		
-		removeButton = new Button(container, SWT.PUSH);
-		removeButton.setText(UpdateUI.getString("WebBookmarksDialog.remove")); //$NON-NLS-1$
-		removeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		removeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection ssel =
-					(IStructuredSelection) viewer.getSelection();
-				SiteBookmark bookmark = (SiteBookmark) ssel.getFirstElement();
-				UpdateUI.getDefault().getUpdateModel().removeBookmark(bookmark);
-			}
-		});
-		removeButton.setEnabled(false);
-		
-		
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(
-			parent,
-			IDialogConstants.CANCEL_ID,
-			IDialogConstants.CANCEL_LABEL,
-			false);
-	}
-	
-	protected void okPressed() {
-		super.okPressed();
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		UpdateUI.getDefault().getUpdateModel().removeUpdateModelChangedListener(
-			modelListener);
-	}
-
-	protected void cancelPressed() {
-		UpdateUI.getDefault().getUpdateModel().reset();
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		UpdateUI.getDefault().getUpdateModel().removeUpdateModelChangedListener(
-			modelListener);
-		super.cancelPressed();
-	}
-	
-	
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkFolder.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkFolder.java
deleted file mode 100644
index ba76b5c..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkFolder.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.update.internal.ui.model;
-
-import java.util.*;
-
-public class BookmarkFolder extends NamedModelObject {
-	protected ArrayList children= new ArrayList();
-	public BookmarkFolder() {
-	}
-	
-	public BookmarkFolder(String name) {
-		super(name);
-	}
-	
-	public Object[] getChildren(Object parent) {
-		return children.toArray();
-	}
-	
-	public boolean hasChildren() {
-		return children.size()>0;
-	} 
-	
-	public void addChild(NamedModelObject object) {
-		internalAdd(object);
-		notifyObjectsAdded(this, new Object[] {object});
-	}
-
-	public void addChildren(NamedModelObject [] objects) {
-		for (int i=0; i<objects.length; i++) {
-			internalAdd(objects[i]);
-		}
-		notifyObjectsAdded(this, objects);
-	}
-	
-	protected void internalAdd(NamedModelObject child) {
-		children.add(child);
-		child.setModel(getModel());
-		child.setParent(this);
-	}
-	
-	public void removeChildren(NamedModelObject [] objects) {
-		for (int i=0; i<objects.length; i++) {
-			children.remove(objects[i]);
-			objects[i].setParent(null);
-		}
-		notifyObjectsRemoved(this, objects);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkUtil.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkUtil.java
deleted file mode 100644
index 218f68c..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/BookmarkUtil.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.xml.parsers.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.internal.ui.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-public class BookmarkUtil {
-	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-
-	public static void parse(String fileName, Vector bookmarks) {
-		File file = new File(fileName);
-		if (!file.exists())
-			return;
-
-		try {
-			documentBuilderFactory.setNamespaceAware(true);
-			DocumentBuilder parser = documentBuilderFactory.newDocumentBuilder();
-			Document doc = parser.parse(fileName);
-			Node root = doc.getDocumentElement();
-			processRoot(root, bookmarks);
-		} catch (ParserConfigurationException e) {
-			UpdateUI.logException(e);
-		} catch (SAXException e) {
-			UpdateUI.logException(e);
-		} catch (IOException e) {
-			UpdateUI.logException(e);
-		}
-	}
-
-	public static SiteBookmark[] getBookmarks(Vector bookmarks) {
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < bookmarks.size(); i++) {
-			processEntry(bookmarks.get(i), result);
-		}
-		return (SiteBookmark[]) result.toArray(new SiteBookmark[result.size()]);
-	}
-
-	public static BookmarkFolder getFolder(Vector bookmarks, IPath path) {
-		NamedModelObject object = find(bookmarks, path);
-		if (object != null && object instanceof BookmarkFolder)
-			return (BookmarkFolder) object;
-		return null;
-	}
-
-	public static NamedModelObject find(Vector bookmarks, IPath path) {
-		Object[] array = bookmarks.toArray();
-		return find(array, path);
-	}
-
-	private static NamedModelObject find(Object[] array, IPath path) {
-		String name = path.segment(0);
-		for (int i = 0; i < array.length; i++) {
-			NamedModelObject obj = (NamedModelObject) array[i];
-			if (obj.getName().equals(name)) {
-				if (obj instanceof BookmarkFolder) {
-					if (path.segmentCount() > 1) {
-						IPath childPath = path.removeFirstSegments(1);
-						BookmarkFolder folder = (BookmarkFolder) obj;
-						return find(folder.getChildren(null), childPath);
-					}
-				}
-				return obj;
-			}
-		}
-		return null;
-	}
-
-	private static void processRoot(Node root, Vector bookmarks) {
-		if (root.getNodeName().equals("bookmarks")) { //$NON-NLS-1$
-			NodeList children = root.getChildNodes();
-			processChildren(children, null, bookmarks);
-		}
-	}
-	private static void processChildren(
-		NodeList children,
-		BookmarkFolder folder,
-		Vector bookmarks) {
-		UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node child = children.item(i);
-			NamedModelObject object = null;
-			if (child.getNodeType() == Node.ELEMENT_NODE) {
-				if (child.getNodeName().equals("site")) { //$NON-NLS-1$
-					object = createSite(child);
-
-				} else if (child.getNodeName().equals("folder")) { //$NON-NLS-1$
-					object = createFolder(child);
-				}
-			}
-			if (object != null) {
-				if (folder != null) {
-					folder.addChild(object);
-				} else {
-					bookmarks.add(object);
-				}
-				object.setModel(model);
-			}
-		}
-	}
-
-	private static SiteBookmark createSite(Node child) {
-		String name = getAttribute(child, "name"); //$NON-NLS-1$
-		URL url = null;
-		try {
-			url = new URL(getAttribute(child, "url")); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-		}
-
-		String web = getAttribute(child, "web"); //$NON-NLS-1$
-		boolean webBookmark = (web != null && web.equals("true")); //$NON-NLS-1$
-
-		String sel = getAttribute(child, "selected"); //$NON-NLS-1$
-		boolean selected = (sel != null && sel.equals("true")); //$NON-NLS-1$
-
-		SiteBookmark bookmark = new SiteBookmark(name, url, webBookmark, selected);
-
-		String local = getAttribute(child, "local"); //$NON-NLS-1$
-		bookmark.setLocal(local != null && local.equals("true")); //$NON-NLS-1$
-
-		String ign = getAttribute(child, "ignored-categories"); //$NON-NLS-1$
-		if (ign != null) {
-			StringTokenizer stok = new StringTokenizer(ign, ","); //$NON-NLS-1$
-			ArrayList array = new ArrayList();
-			while (stok.hasMoreTokens()) {
-				String tok = stok.nextToken();
-				array.add(tok);
-			}
-			bookmark.setIgnoredCategories((String[]) array.toArray(new String[array.size()]));
-		}
-		return bookmark;
-	}
-
-	private static BookmarkFolder createFolder(Node child) {
-		BookmarkFolder folder = new BookmarkFolder();
-		String name = getAttribute(child, "name"); //$NON-NLS-1$
-		folder.setName(name);
-		if (child.hasChildNodes()) {
-			NodeList children = child.getChildNodes();
-			processChildren(children, folder, null);
-		}
-		return folder;
-	}
-
-	public static void store(String fileName, Vector bookmarks) {
-		try {
-			FileOutputStream fos = new FileOutputStream(fileName);
-			OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF8"); //$NON-NLS-1$
-			PrintWriter writer = new PrintWriter(osw);
-			writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
-			writer.println("<bookmarks>"); //$NON-NLS-1$
-			for (int i = 0; i < bookmarks.size(); i++) {
-				Object obj = bookmarks.get(i);
-				writeObject("   ", obj, writer); //$NON-NLS-1$
-			}
-			writer.println("</bookmarks>"); //$NON-NLS-1$
-			writer.flush();
-			writer.close();
-			osw.close();
-			fos.close();
-		} catch (IOException e) {
-		}
-	}
-	private static void writeObject(
-		String indent,
-		Object obj,
-		PrintWriter writer) {
-		if (obj instanceof SiteBookmark) {
-			SiteBookmark bookmark = (SiteBookmark) obj;
-			String name = bookmark.getName();
-			String url = bookmark.getURL().toString();
-			String web = bookmark.isWebBookmark()?"true":"false"; //$NON-NLS-1$ //$NON-NLS-2$
-			String sel = bookmark.isSelected()?"true":"false"; //$NON-NLS-1$ //$NON-NLS-2$
-			String local = bookmark.isLocal() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
-			String [] ign = bookmark.getIgnoredCategories();
-			StringBuffer wign = new StringBuffer();
-			for (int i = 0; i < ign.length; i++) {
-				if (i > 0)
-					wign.append(',');
-				wign.append(ign[i]);
-			}
-			writer.print(indent + "<site name=\"" + name + "\" url=\"" + url + "\" web=\"" + web + "\" selected=\"" + sel + "\" local=\"" + local + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-			if (wign.length() > 0)
-				writer.print(" ignored-categories=\""+wign.toString()+"\""); //$NON-NLS-1$ //$NON-NLS-2$
-			writer.println("/>"); //$NON-NLS-1$
-		} else if (obj instanceof BookmarkFolder) {
-			BookmarkFolder folder = (BookmarkFolder) obj;
-			String name = folder.getName();
-			writer.println(indent + "<folder name=\"" + name + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
-			Object[] children = folder.getChildren(folder);
-			String indent2 = indent + "   "; //$NON-NLS-1$
-			for (int i = 0; i < children.length; i++) {
-				writeObject(indent2, children[i], writer);
-			}
-			writer.println(indent + "</folder>"); //$NON-NLS-1$
-		}
-	}
-
-	private static String getAttribute(Node node, String name) {
-		NamedNodeMap atts = node.getAttributes();
-		Node att = atts.getNamedItem(name);
-		if (att != null) {
-			return att.getNodeValue();
-		}
-		return ""; //$NON-NLS-1$
-	}
-	private static void processFolder(BookmarkFolder folder, ArrayList result) {
-		Object[] children = folder.getChildren(folder);
-		for (int i = 0; i < children.length; i++) {
-			processEntry(children[i], result);
-		}
-	}
-	private static void processEntry(Object obj, ArrayList result) {
-		if (obj instanceof SiteBookmark)
-			result.add(obj);
-		else if (obj instanceof BookmarkFolder) {
-			processFolder((BookmarkFolder) obj, result);
-		}
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredFeatureAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredFeatureAdapter.java
deleted file mode 100644
index 3d6f234..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredFeatureAdapter.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.model;

-

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

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

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

-

-/**

- * @version 	1.0

- * @author

- */

-public class ConfiguredFeatureAdapter

-	extends SimpleFeatureAdapter

-	implements IConfiguredFeatureAdapter {

-	private IConfiguredSiteAdapter adapter;

-	private boolean configured;

-	private boolean updated;

-

-	public ConfiguredFeatureAdapter(

-		IConfiguredSiteAdapter adapter,

-		IFeature feature,

-		boolean configured,

-		boolean updated,

-		boolean optional) {

-		super(feature, optional);

-		this.adapter = adapter;

-		this.configured = configured;

-		this.updated = updated;

-	}

-

-	public boolean equals(Object object) {

-		if (object == null)

-			return false;

-		if (object == this)

-			return true;

-		if (object instanceof ConfiguredFeatureAdapter) {

-			try {

-				ConfiguredFeatureAdapter ad = (ConfiguredFeatureAdapter) object;

-				return ad.getConfiguredSite().equals(getConfiguredSite())

-					&& ad.getFeature(null).equals(getFeature(null));

-			} catch (CoreException e) {

-			}

-		}

-		return false;

-	}

-

-	public IConfiguredSite getConfiguredSite() {

-		return adapter.getConfiguredSite();

-	}

-	public IInstallConfiguration getInstallConfiguration() {

-		return adapter.getInstallConfiguration();

-	}

-	public boolean isConfigured() {

-		return configured;

-	}

-

-	public boolean isUpdated() {

-		return updated;

-	}

-	public IFeatureAdapter[] getIncludedFeatures(IProgressMonitor monitor) {

-		try {

-			IIncludedFeatureReference[] included =

-				getFeature(null).getIncludedFeatureReferences();

-			ConfiguredFeatureAdapter[] result =

-				new ConfiguredFeatureAdapter[included.length];

-			if (monitor == null)

-				monitor = new NullProgressMonitor();

-			SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);

-			subMonitor.beginTask("", included.length); //$NON-NLS-1$

-

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

-				IIncludedFeatureReference fref = included[i];

-				IFeature feature;

-				boolean childConfigured = configured;

-				boolean updated = false;

-				try {

-					feature = fref.getFeature(

-							new SubProgressMonitor(subMonitor, 1));

-					childConfigured =

-						adapter.getConfiguredSite().isConfigured(feature);

-					///*

-					PluginVersionIdentifier refpid =

-						fref.getVersionedIdentifier().getVersion();

-					PluginVersionIdentifier fpid =

-						feature.getVersionedIdentifier().getVersion();

-					updated = !refpid.equals(fpid);

-					//*/

-				} catch (CoreException e) {

-					feature = new MissingFeature(getFeature(null), fref);

-					childConfigured = false;

-				}

-

-				result[i] =

-					new ConfiguredFeatureAdapter(

-						adapter,

-						feature,

-						childConfigured,

-						updated,

-						fref.isOptional());

-				result[i].setIncluded(true);

-			}

-			return result;

-		} catch (CoreException e) {

-			return new IFeatureAdapter[0];

-		}

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredSiteAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredSiteAdapter.java
deleted file mode 100644
index d52291a..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ConfiguredSiteAdapter.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.internal.ui.model;
-
-import org.eclipse.update.configuration.*;
-
-/**
- * @version 	1.0
- * @author
- */
-public class ConfiguredSiteAdapter
-	extends UIModelObject
-	implements IConfiguredSiteAdapter {
-	private IInstallConfiguration config;
-	private IConfiguredSite csite;
-		
-	public ConfiguredSiteAdapter(IInstallConfiguration config, IConfiguredSite csite) {
-		this.csite = csite;
-		this.config = config;
-	}
-	
-	public IConfiguredSite getConfiguredSite() {
-		return csite;
-	}
-
-	public IInstallConfiguration getInstallConfiguration() {
-		return config;
-	}
-	
-	public boolean equals(Object object) {
-		if (object==null) return false;
-		if (object == this) return true;
-		if (object instanceof ConfiguredSiteAdapter) {
-			ConfiguredSiteAdapter adapter = (ConfiguredSiteAdapter)object;
-			return csite!=null && csite.getSite().equals(adapter.getConfiguredSite().getSite());
-		}
-		return false;
-	}
-	
-	public String toString() {
-		return getConfiguredSite().getSite().getURL().toString();
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/DiscoveryFolder.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/DiscoveryFolder.java
deleted file mode 100644
index 040eb0e..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/DiscoveryFolder.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.internal.ui.model;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-public class DiscoveryFolder extends BookmarkFolder {
-	public DiscoveryFolder() {
-		super(UpdateUI.getString("DiscoveryFolder.name")); //$NON-NLS-1$
-		setModel(UpdateUI.getDefault().getUpdateModel());
-	}
-	public void initialize() {
-		children.clear();
-		try {
-			ILocalSite site = SiteManager.getLocalSite();
-			IInstallConfiguration config = site.getCurrentConfiguration();
-			IConfiguredSite[] csites = config.getConfiguredSites();
-			for (int i = 0; i < csites.length; i++) {
-				IConfiguredSite csite = csites[i];
-				IFeatureReference[] refs = csite.getConfiguredFeatures();
-				for (int j = 0; j < refs.length; j++) {
-					IFeatureReference ref = refs[j];
-					IFeature feature = ref.getFeature(null);
-					IURLEntry[] entries = feature.getDiscoverySiteEntries();
-					if (entries.length > 0) {
-						// Only add discovery sites if
-						// of root features
-						if (!isIncluded(ref, refs))
-							addBookmarks(entries);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-		}
-	}
-	private boolean isIncluded(
-		IFeatureReference ref,
-		IFeatureReference[] refs) {
-		try {
-			VersionedIdentifier vid = ref.getVersionedIdentifier();
-			for (int i = 0; i < refs.length; i++) {
-				IFeatureReference candidate = refs[i];
-				// Ignore self
-				if (candidate.equals(ref))
-					continue;
-				IFeature cfeature = candidate.getFeature(null);
-				IFeatureReference[] irefs =
-					cfeature.getIncludedFeatureReferences();
-				for (int j = 0; j < irefs.length; j++) {
-					IFeatureReference iref = irefs[j];
-					VersionedIdentifier ivid = iref.getVersionedIdentifier();
-					if (ivid.equals(vid)) {
-						// bingo - included in at least one feature
-						return true;
-					}
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-	private void addBookmarks(IURLEntry[] entries) {
-		for (int i = 0; i < entries.length; i++) {
-			IURLEntry entry = entries[i];
-			SiteBookmark bookmark =
-				new SiteBookmark(
-					entry.getAnnotation(),
-					entry.getURL(),
-					entry.getType() == IURLEntry.WEB_SITE);
-			bookmark.setReadOnly(entry.getType() != IURLEntry.WEB_SITE);
-			if (!contains(bookmark))
-				internalAdd(bookmark);
-		}
-	}
-	private boolean contains(SiteBookmark bookmark) {
-		for (int i = 0; i < children.size(); i++) {
-			Object o = children.get(i);
-			if (o instanceof SiteBookmark) {
-				// note: match on URL, not the label
-				if (bookmark.getURL().equals(((SiteBookmark) o).getURL()))
-					return true;
-			}
-		}
-		return false;
-	}
-	public Object[] getChildren(Object parent) {
-		if (hasChildren() == false)
-			initialize();
-		return super.getChildren(parent);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureAdapter.java
deleted file mode 100644
index 7e78e7c..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureAdapter.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.update.internal.ui.model;

-

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

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

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

-import org.eclipse.update.internal.ui.UpdateUI;

-

-/**

- * @version 	1.0

- * @author

- */

-public abstract class FeatureAdapter extends UIModelObject implements IFeatureAdapter {

-	private boolean included=false;

-

-	/*

-	 * @see IFeatureAdapter#getInstallConfiguration()

-	 */

-	public IInstallConfiguration getInstallConfiguration() {

-		return null;

-	}

-	

-	public boolean isIncluded() {

-		return included;

-	}

-	

-	protected void setIncluded(boolean included) {

-		this.included = included;

-	}

-	

-	public String toString() {

-		try {

-			IFeature feature = getFeature(null);

-			return feature.getLabel();

-		}

-		catch (CoreException e) {

-			return UpdateUI.getString("FeatureAdapter.failure"); //$NON-NLS-1$

-		}

-	}

-	public boolean hasIncludedFeatures(IProgressMonitor monitor) {

-		try {

-			IFeatureReference [] included = getFeature(monitor).getIncludedFeatureReferences();

-			return included.length>0;

-		}

-		catch (CoreException e) {

-			return false;

-		}

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureReferenceAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureReferenceAdapter.java
deleted file mode 100644
index 69f2005..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/FeatureReferenceAdapter.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.model;

-import java.lang.reflect.*;

-import java.net.*;

-

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

-import org.eclipse.jface.operation.*;

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

-import org.eclipse.update.internal.ui.*;

-

-public class FeatureReferenceAdapter extends FeatureAdapter {

-	private IFeatureReference featureRef;

-	private boolean touched;

-

-	public FeatureReferenceAdapter(IFeatureReference featureRef) {

-		this.featureRef = featureRef;

-		setIncluded(featureRef instanceof IIncludedFeatureReference);

-	}

-	

-	public IFeature getFeature(IProgressMonitor monitor) throws CoreException {

-		return featureRef.getFeature(monitor);

-	}

-	

-	public String getFastLabel() {

-		return featureRef.getURL().toString();

-	}

-	

-	public ISite getSite() {

-		return featureRef.getSite();

-	}

-	

-	public URL getURL() {

-		return featureRef.getURL();

-	}

-	

-	public boolean isOptional() {

-		return featureRef instanceof IIncludedFeatureReference ? 

-			((IIncludedFeatureReference)featureRef).isOptional():false;

-	}

-	

-	public void touchIncludedFeatures(IRunnableContext context) {

-		if (touched) return;

-		final IFeatureReference [] included;

-		

-		try {

-			included = 	getFeature(null).getIncludedFeatureReferences();

-		}

-		catch (CoreException e) {

-			return;

-		}

-		if (included.length == 0) return;

-		IRunnableWithProgress op = new IRunnableWithProgress () {

-			public void run(IProgressMonitor monitor) {

-				monitor.beginTask(UpdateUI.getString("SiteBookmark.downloading"), included.length); //$NON-NLS-1$

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

-					IFeatureReference ref = included[i];

-					try {

-						monitor.subTask(ref.getURL().toString());

-						ref.getFeature(new SubProgressMonitor(monitor, 1));

-						//monitor.worked(1);

-					}

-					catch (CoreException e) {

-					}

-				}

-				monitor.done();

-			}

-		};

-		try {

-			context.run(true, false, op);

-			touched=true;

-		}

-		catch (InvocationTargetException e) {

-		}

-		catch (InterruptedException e) {

-		}

-	}

-

-	public IFeatureAdapter[] getIncludedFeatures(IProgressMonitor monitor) {

-		try {

-			IFeatureReference[] included =

-				getFeature(monitor).getIncludedFeatureReferences();

-			FeatureReferenceAdapter[] result =

-				new FeatureReferenceAdapter[included.length];

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

-				result[i] = new FeatureReferenceAdapter(included[i]);

-			}

-			return result;

-		} catch (CoreException e) {

-			return new IFeatureAdapter[0];

-		}

-	}

-

-	public IFeatureReference getFeatureReference() {

-		return featureRef;

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredFeatureAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredFeatureAdapter.java
deleted file mode 100644
index 6b9743d..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredFeatureAdapter.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.internal.ui.model;

-

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IConfiguredFeatureAdapter extends IFeatureAdapter, IConfiguredSiteContext {

-	public boolean isConfigured();

-	public boolean isUpdated();

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteAdapter.java
deleted file mode 100644
index 85e270d..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteAdapter.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.internal.ui.model;
-
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IConfiguredSiteAdapter extends IConfiguredSiteContext {
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteContext.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteContext.java
deleted file mode 100644
index c7e278b..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IConfiguredSiteContext.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.update.internal.ui.model;
-
-import org.eclipse.update.configuration.*;
-
-/**
- * @version 	1.0
- * @author
- */
-public interface IConfiguredSiteContext {
-	public IInstallConfiguration getInstallConfiguration();
-	public IConfiguredSite getConfiguredSite();
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IFeatureAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IFeatureAdapter.java
deleted file mode 100644
index 0206b50..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/IFeatureAdapter.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.internal.ui.model;

-

-import java.net.*;

-

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

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

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IFeatureAdapter {

-	public URL getURL();

-	public ISite getSite();

-	public IFeature getFeature(IProgressMonitor monitor) throws CoreException;

-	public IFeatureAdapter [] getIncludedFeatures(IProgressMonitor monitor);

-	public boolean hasIncludedFeatures(IProgressMonitor monitor);

-	public boolean isIncluded();

-	public boolean isOptional();

-	public String getFastLabel();

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ISiteAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ISiteAdapter.java
deleted file mode 100644
index 6f58554..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/ISiteAdapter.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.internal.ui.model;

-

-import java.net.*;

-

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

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

-

-public interface ISiteAdapter {

-	

-	public String getLabel();

-	public URL getURL();

-	public ISite getSite(IProgressMonitor monitor);

-

-}

-


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/MissingFeature.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/MissingFeature.java
deleted file mode 100644
index 8f7719d..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/MissingFeature.java
+++ /dev/null

@@ -1,456 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.model;

-

-import java.io.*;

-import java.net.*;

-

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

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

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

-import org.eclipse.update.internal.ui.*;

-

-public class MissingFeature implements IFeature {

-

-	private URL url;

-	private ISite site;

-	private IFeatureReference reference;

-	private IFeature parent;

-	private IURLEntry desc;

-	private VersionedIdentifier id = new VersionedIdentifier(UpdateUI.getString("MissingFeature.id"), "0.0.0"); //$NON-NLS-1$ //$NON-NLS-2$

-	public MissingFeature(ISite site, URL url) {

-		this.site = site;

-		this.url = url;

-		desc = new IURLEntry() {

-			public URL getURL() {

-				return null;

-			}

-			public String getAnnotation() {

-				return UpdateUI.getString("MissingFeature.desc.unknown"); //$NON-NLS-1$

-			}

-			public Object getAdapter(Class key) {

-				return null;

-			}

-			public int getType() {

-				return IURLEntry.UPDATE_SITE;

-			}

-		};

-	}

-	public MissingFeature(IFeatureReference ref) {

-		this(null, ref);

-	}

-

-	public MissingFeature(IFeature parent, IFeatureReference ref) {

-		this(ref.getSite(), ref.getURL());

-		this.reference = ref;

-		this.parent = parent;

-

-		if (isOptional()) {

-			desc = new IURLEntry() {

-				public URL getURL() {

-					return null;

-				}

-				public String getAnnotation() {

-					return UpdateUI.getString("MissingFeature.desc.optional"); //$NON-NLS-1$

-				}

-				public Object getAdapter(Class key) {

-					return null;

-				}

-				public int getType() {

-					return IURLEntry.UPDATE_SITE;

-				}

-			};

-		}

-	}

-

-	public boolean isOptional() {

-		return reference != null

-			&& reference instanceof IIncludedFeatureReference

-			&& ((IIncludedFeatureReference) reference).isOptional();

-	}

-

-	public IFeature getParent() {

-		return parent;

-	}

-

-	public URL getOriginatingSiteURL() {

-		VersionedIdentifier vid = getVersionedIdentifier();

-		if (vid == null)

-			return null;

-		String key = vid.getIdentifier();

-		return UpdateUI.getOriginatingURL(key);

-	}

-

-	/*

-	 * @see IFeature#getIdentifier()

-	 */

-	public VersionedIdentifier getVersionedIdentifier() {

-		if (reference != null) {

-			try {

-				return reference.getVersionedIdentifier();

-			} catch (CoreException e) {

-			}

-		}

-		return id;

-	}

-

-	/*

-	 * @see IFeature#getSite()

-	 */

-	public ISite getSite() {

-		return site;

-	}

-

-	/*

-	 * @see IFeature#getLabel()

-	 */

-	public String getLabel() {

-		if (reference != null

-			&& reference instanceof IIncludedFeatureReference) {

-			String name = ((IIncludedFeatureReference) reference).getName();

-			if (name != null)

-				return name;

-		}

-		return url.toString();

-	}

-

-	/*

-	 * @see IFeature#getURL()

-	 */

-	public URL getURL() {

-		return url;

-	}

-

-	/*

-	 * @see IFeature#getUpdateInfo()

-	 */

-	public IURLEntry getUpdateSiteEntry() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getDiscoveryInfos()

-	 */

-	public IURLEntry[] getDiscoverySiteEntries() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getProvider()

-	 */

-	public String getProvider() {

-		return UpdateUI.getString("MissingFeature.provider"); //$NON-NLS-1$

-	}

-

-	/*

-	 * @see IFeature#getDescription()

-	 */

-	public IURLEntry getDescription() {

-		return desc;

-	}

-

-	/*

-	 * @see IFeature#getCopyright()

-	 */

-	public IURLEntry getCopyright() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getLicense()

-	 */

-	public IURLEntry getLicense() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getOS()

-	 */

-	public String getOS() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getWS()

-	 */

-	public String getWS() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getNL()

-	 */

-	public String getNL() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getArch()

-	 */

-	public String getOSArch() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getImage()

-	 */

-	public URL getImage() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getImports()

-	 */

-	public IImport[] getImports() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getArchives()

-	 */

-	public String[] getArchives() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#getDataEntries()

-	 */

-	public INonPluginEntry[] getNonPluginEntries() {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#addDataEntry(IDataEntry)

-	 */

-	public void addNonPluginEntry(INonPluginEntry dataEntry) {

-	}

-

-	/*

-	 * @see IFeature#getDownloadSize()

-	 */

-	public long getDownloadSize() {

-		return 0;

-	}

-

-	/*

-	 * @see IFeature#getInstallSize(ISite)

-	 */

-	public long getInstallSize() {

-		return 0;

-	}

-

-	/*

-	 * @see IFeature#isPrimary()

-	 */

-	public boolean isPrimary() {

-		return false;

-	}

-

-	/*

-	 * @see IFeature#getApplication()

-	 */

-	public String getApplication() {

-		return null;

-	}

-

-	/*

-	 * @see IPluginContainer#getPluginEntries()

-	 */

-	public IPluginEntry[] getPluginEntries() {

-		return new IPluginEntry[0];

-	}

-

-	/*

-	 * @see IPluginContainer#getPluginEntryCount()

-	 */

-	public int getPluginEntryCount() {

-		return 0;

-	}

-

-	/*

-	 * @see IPluginContainer#getDownloadSize(IPluginEntry)

-	 */

-	public long getDownloadSize(IPluginEntry entry) {

-		return 0;

-	}

-

-	/*

-	 * @see IPluginContainer#getInstallSize(IPluginEntry)

-	 */

-	public long getInstallSize(IPluginEntry entry) {

-		return 0;

-	}

-

-	/*

-	 * @see IPluginContainer#addPluginEntry(IPluginEntry)

-	 */

-	public void addPluginEntry(IPluginEntry pluginEntry) {

-	}

-

-	/*

-	 * @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 IFeature#setFeatureContentProvider(IFeatureContentProvider)

-	 */

-	public void setFeatureContentProvider(IFeatureContentProvider featureContentProvider) {

-	}

-

-	/*

-	 * @see IFeature#getFeatureContentConsumer()

-	 */

-	public IFeatureContentConsumer getFeatureContentConsumer()

-		throws CoreException {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#setSite(ISite)

-	 */

-	public void setSite(ISite site) throws CoreException {

-		this.site = site;

-	}

-

-	/*

-	 * @see IFeature#getFeatureContentProvider()

-	 */

-	public IFeatureContentProvider getFeatureContentProvider()

-		throws CoreException {

-		return null;

-	}

-

-	/*

-	 * @see IFeature#install(IFeature,IVerifier, IProgressMonitor)

-	 */

-	public IFeatureReference install(

-		IFeature targetFeature,

-		IVerificationListener verificationListener,

-		IProgressMonitor monitor)

-		throws CoreException {

-		return null;

-	}

-

-	/*

-	 * @see org.eclipse.update.core.IFeature#install(IFeature, IFeatureReference[], IVerificationListener, IProgressMonitor)

-	 */

-	public IFeatureReference install(

-		IFeature targetFeature,

-		IFeatureReference[] optionalFeatures,

-		IVerificationListener verificationListener,

-		IProgressMonitor monitor)

-		throws InstallAbortedException, CoreException {

-		return null;

-	}

-	/*

-	 * @see IFeature#remove(IProgressMonitor)

-	 */

-	public void remove(IProgressMonitor monitor) throws CoreException {

-	}

-

-	/*

-	 * @see IPluginContainer#remove(IPluginEntry, IProgressMonitor)

-	 */

-	public void remove(IPluginEntry entry, IProgressMonitor monitor)

-		throws CoreException {

-	}

-

-	/*

-	 * @see IFeature#getNonPluginEntryCount()

-	 */

-	public int getNonPluginEntryCount() {

-		return 0;

-	}

-

-	/*

-	 * @see IFeature#getInstallHandlerEntry()

-	 */

-	public IInstallHandlerEntry getInstallHandlerEntry() {

-		return null;

-	}

-	/*

-	 * @see IFeature#getIncludedFeatureReferences()

-	 */

-	public IIncludedFeatureReference[] getIncludedFeatureReferences()

-		throws CoreException {

-		return new IIncludedFeatureReference[0];

-	}

-

-	/**

-	 * @see IFeature#getAffinityFeature()

-	 */

-	public String getAffinityFeature() {

-		return null;

-	}

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawIncludedFeatureReferences()

-	 */

-	public IIncludedFeatureReference[] getRawIncludedFeatureReferences()

-		throws CoreException {

-		return getIncludedFeatureReferences();

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawNonPluginEntries()

-	 */

-	public INonPluginEntry[] getRawNonPluginEntries() {

-		return getNonPluginEntries();

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawPluginEntries()

-	 */

-	public IPluginEntry[] getRawPluginEntries() {

-		return getPluginEntries();

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getPrimaryPluginID()

-	 */

-	public String getPrimaryPluginID() {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#getRawImports()

-	 */

-	public IImport[] getRawImports() {

-		return new IImport[0];

-	}

-

-	/**

-	 * @see org.eclipse.update.core.IFeature#isPatch()

-	 */

-	public boolean isPatch() {

-		return false;

-	}

-	

-	public boolean isExclusive() {

-		return false;

-	}

-

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/NamedModelObject.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/NamedModelObject.java
deleted file mode 100644
index 9cb2f89..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/NamedModelObject.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.model;
-
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.ui.model.*;
-
-public class NamedModelObject extends UIModelObject 
-							implements IWorkbenchAdapter, Serializable  {
-	private String name;
-	transient private NamedModelObject parent;
-	
-	public static final String P_NAME="p_name"; //$NON-NLS-1$
-	
-	public NamedModelObject() {
-	}
-	
-	public NamedModelObject(String name) {
-		this.name = name;
-	}
-	
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IWorkbenchAdapter.class)) {
-			return this;
-		}
-		return super.getAdapter(adapter);
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public IPath getPath() {
-		Object parent = getParent(null);
-		if (parent!=null && parent instanceof NamedModelObject)
-			return ((NamedModelObject)parent).getPath().append(getName());
-		else
-			return new Path(getName());
-	}
-	
-	public String toString() {
-		return getName();
-	}
-	
-	public void setName(String name) {
-		this.name = name;
-		notifyObjectChanged(P_NAME);
-	}
-	
-	/**
-	 * @see IWorkbenchAdapter#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parent) {
-		return null;
-	}
-
-
-	/**
-	 * @see IWorkbenchAdapter#getImageDescriptor(Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object obj) {
-		return null;
-	}
-
-
-	/**
-	 * @see IWorkbenchAdapter#getLabel(Object)
-	 */
-	public String getLabel(Object obj) {
-		return getName();
-	}
-
-
-	/**
-	 * @see IWorkbenchAdapter#getParent(Object)
-	 */
-	public Object getParent(Object arg0) {
-		return parent;
-	}
-	public void setParent(NamedModelObject parent) {
-		this.parent = parent;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SimpleFeatureAdapter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SimpleFeatureAdapter.java
deleted file mode 100644
index a6a23f4..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SimpleFeatureAdapter.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.update.internal.ui.model;

-

-import java.net.*;

-

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

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

-

-/**

- * @version 	1.0

- * @author

- */

-public class SimpleFeatureAdapter extends FeatureAdapter {

-	protected IFeature feature;

-	private boolean optional;

-	public SimpleFeatureAdapter(IFeature feature) {

-		this(feature, false);

-	}

-	public SimpleFeatureAdapter(IFeature feature, boolean optional) {

-		this.feature = feature;

-		this.optional = optional;

-	}

-	

-	public IFeature getFeature(IProgressMonitor monitor) throws CoreException {

-		return feature;

-	}

-	

-	public String getFastLabel() {

-		return feature.getLabel();

-	}

-	

-	public URL getURL() {

-		return feature.getURL();

-	}

-	

-	public ISite getSite() {

-		return feature.getSite();

-	}

-	

-	public IFeatureAdapter[] getIncludedFeatures(IProgressMonitor monitor) {

-		try {

-			IIncludedFeatureReference[] included = getFeature(monitor).getIncludedFeatureReferences();

-			SimpleFeatureAdapter[] result =

-				new SimpleFeatureAdapter[included.length];

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

-				result[i] =

-					new SimpleFeatureAdapter(included[i].getFeature(null), included[i].isOptional());

-				result[i].setIncluded(true);

-			}

-			return result;

-		} catch (CoreException e) {

-			return new IFeatureAdapter[0];

-		}

-	}

-	public boolean isOptional() {

-		return optional;

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteBookmark.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteBookmark.java
deleted file mode 100644
index c46c543..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteBookmark.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.model;

-

-import java.net.*;

-import java.util.*;

-

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

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

-import org.eclipse.update.internal.ui.*;

-

-public class SiteBookmark extends NamedModelObject 

-							implements ISiteAdapter {

-	public static final String P_URL="p_url"; //$NON-NLS-1$

-	public static final String P_TYPE="p_type"; //$NON-NLS-1$

-	

-	private URL url;

-	transient private ISite site;

-	transient private Vector catalog;

-	transient private SiteCategory otherCategory;

-	private boolean webBookmark;

-	private boolean selected;

-	private String [] ignoredCategories = new String[0];

-	private boolean readOnly = false;

-	private boolean local = false;

-

-	public SiteBookmark() {

-	}

-	

-	public SiteBookmark(String name, URL url, boolean webBookmark) {

-		this(name, url, webBookmark, false);

-	}

-	

-	public SiteBookmark(String name, URL url, boolean webBookmark, boolean selected) {

-		super(name);

-		this.url = url;

-		this.webBookmark = webBookmark;

-		this.selected = selected;

-	}

-

-	public void setSelected(boolean selected) {

-		this.selected = selected;

-	}

-	

-	public boolean isSelected() {

-		return selected;

-	}

-	

-	public String [] getIgnoredCategories() {

-		return ignoredCategories;

-	}

-	

-	public void setIgnoredCategories(String [] categories) {

-		this.ignoredCategories = categories;

-	}

-	

-	public void setWebBookmark(boolean value) {

-		if (isLocal()) return;

-		this.webBookmark = value;

-		notifyObjectChanged(P_TYPE);

-	}

-	

-	public boolean isWebBookmark() {

-		return webBookmark;

-	}

-	

-	public URL getURL() {

-		return url;

-	}

-

-

-	public void setURL(URL url) {

-		this.url = url;

-		site = null;

-		notifyObjectChanged(P_URL);

-	}

-	

-	public ISite getSite(IProgressMonitor monitor) {

-		return getSite(true, monitor);

-	}

-	

-	public ISite getSite(boolean showDialogIfFailed, IProgressMonitor monitor) {

-		if (site==null) {

-			try {

-				connect(monitor);

-			}

-			catch (CoreException e) {

-				UpdateUI.logException(e, showDialogIfFailed);

-			}

-		}

-		return site;

-	}

-	

-	public boolean isSiteConnected() {

-		return site!=null;

-	}

-	

-	public void connect(IProgressMonitor monitor) throws CoreException {

-		connect(true, monitor);

-	}

-	

-	public void connect(boolean useCache, IProgressMonitor monitor) throws CoreException {

-		if (monitor==null) monitor = new NullProgressMonitor();

-		monitor.beginTask("", 2); //$NON-NLS-1$

-		monitor.subTask(UpdateUI.getFormattedMessage("SiteBookmark.connecting", url.toString())); //$NON-NLS-1$

-		site = SiteManager.getSite(url, useCache, new SubProgressMonitor(monitor, 1));

-		if (site!=null) createCatalog(new SubProgressMonitor(monitor, 1));

-		else

-			catalog = new Vector();

-	}

-	

-	private void createCatalog(IProgressMonitor monitor) {

-		catalog = new Vector();

-		otherCategory = new SiteCategory(this, null, null);

-		// Add all the categories

-		ICategory [] categories;

-		categories = site.getCategories();

-		

-		ISiteFeatureReference [] featureRefs;

-		featureRefs = site.getRawFeatureReferences();

-		

-		monitor.beginTask("", featureRefs.length + categories.length); //$NON-NLS-1$

-

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

-			ICategory category = categories[i];

-			addCategoryToCatalog(category);

-			monitor.worked(1);

-		}

-		// Add features to categories

-

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

-			ISiteFeatureReference featureRef = featureRefs[i];

-			addFeatureToCatalog(featureRef);

-			monitor.worked(1);

-		}

-		if (otherCategory.getChildCount()>0)

-		   catalog.add(otherCategory);

-	}

-

-	public Object [] getCatalog(boolean withCategories, IProgressMonitor monitor) {

-		if (withCategories)

-			return catalog.toArray();

-		else {

-			// Make a flat catalog

-			Vector flatCatalog = new Vector();

-			for (int i=0; i<catalog.size(); i++) {

-				SiteCategory category = (SiteCategory)catalog.get(i);

-				category.addFeaturesTo(flatCatalog);

-			}

-			return flatCatalog.toArray();

-		}

-	}

-	

-	private void addCategoryToCatalog(ICategory category) {

-		String name = category.getName();

-		int loc = name.indexOf('/');

-		if (loc == -1) {

-			// first level

-			catalog.add(new SiteCategory(this, name, category));

-		}

-		else {

-			IPath path = new Path(name);

-			name = path.lastSegment().toString();

-			path = path.removeLastSegments(1);

-			SiteCategory parentCategory = findCategory(path, catalog.toArray());

-			if (parentCategory!=null) {

-				parentCategory.add(new SiteCategory(this, name, category));

-			}

-		}

-	}

-	private void addFeatureToCatalog(ISiteFeatureReference feature) {

-		ICategory [] categories = feature.getCategories();

-		boolean orphan = true;

-

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

-			ICategory category = categories[i];

-			String name = category.getName();

-			IPath path = new Path(name);

-			SiteCategory parentCategory = findCategory(path, catalog.toArray());

-			if (parentCategory!=null) {

-		   		parentCategory.add(new FeatureReferenceAdapter(feature));

-		   		orphan = false;

-			}

-		}

-		if (orphan)

-			otherCategory.add(new FeatureReferenceAdapter(feature));

-	}

-	

-	private SiteCategory findCategory(IPath path, Object [] children) {

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

-			Object child = children[i];

-			if (child instanceof SiteCategory) {

-				SiteCategory sc = (SiteCategory)child;

-				if (sc.getName().equals(path.segment(0))) {

-				   if (path.segmentCount()==1) return sc;

-					else {

-						path = path.removeFirstSegments(1);

-						return findCategory(path, sc.getChildren());

-					}

-				}

-			}

-		}

-		return null;

-	}

-	/**

-	 * @see ISiteAdapter#getLabel()

-	 */

-	public String getLabel() {

-		return getName();

-	}

-	

-	public void setReadOnly(boolean readOnly) {

-		this.readOnly = readOnly;

-	}

-	

-	public boolean isReadOnly() {

-		return readOnly;

-	}

-	

-	public void setLocal(boolean local) {

-		this.local = local;

-	}

-	

-	public boolean isLocal() {

-		return local;

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteCategory.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteCategory.java
deleted file mode 100644
index e3250aa..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/SiteCategory.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.model;

-import java.lang.reflect.*;

-import java.net.*;

-import java.util.*;

-

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

-import org.eclipse.jface.operation.*;

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

-import org.eclipse.update.internal.ui.*;

-

-public class SiteCategory extends UIModelObject {

-

-	Vector children;

-	private ICategory category;

-	private String name;

-	private boolean touched;

-	private int featureCount;

-	private boolean canceled;

-	private SiteBookmark bookmark;

-

-	class OtherCategory implements ICategory {

-		IURLEntry entry;

-		public OtherCategory() {

-			entry = new IURLEntry() {

-				public String getAnnotation() {

-					return UpdateUI.getString("SiteCategory.other.description"); //$NON-NLS-1$

-				}

-				public URL getURL() {

-					return null;

-				}

-				public Object getAdapter(Class clazz) {

-					return null;

-				}

-				public int getType() {

-					return IURLEntry.UPDATE_SITE;

-				}

-			};

-		}

-		public String getName() {

-			return SiteCategory.this.getName();

-		}

-		public String getLabel() {

-			return SiteCategory.this.getName();

-		}

-		public IURLEntry getDescription() {

-			return entry;

-		}

-		public Object getAdapter(Class clazz) {

-			return null;

-		}

-	}

-

-	public SiteCategory(SiteBookmark bookmark, String name, ICategory category) {

-		this.bookmark = bookmark;

-		if (category == null) {

-			this.name = UpdateUI.getString("SiteCategory.other.label"); //$NON-NLS-1$

-			this.category = new OtherCategory();

-		} else {

-			this.name = name;

-			this.category = category;

-		}

-		children = new Vector();

-	}

-	

-	public SiteBookmark getBookmark() {

-		return bookmark;

-	}

-

-	public boolean isOtherCategory() {

-		return category instanceof OtherCategory;

-	}

-

-	public Object[] getChildren() {

-		return canceled ? new Object[0] : children.toArray();

-	}

-

-	public int getChildCount() {

-		return canceled ? 0 : children.size();

-	}

-

-	public String getName() {

-		return name;

-	}

-	public String getFullName() {

-		return category.getName();

-	}

-

-	public String toString() {

-		return category.getLabel();

-	}

-

-	public ICategory getCategory() {

-		return category;

-	}

-

-	void add(Object child) {

-		if (child instanceof IFeatureAdapter)

-			featureCount++;

-		children.add(child);

-	}

-

-	public void touchFeatures(IRunnableContext context) {

-		if (children.size() == 0 || touched || featureCount == 0)

-			return;

-

-		IRunnableWithProgress op = new IRunnableWithProgress() {

-			public void run(IProgressMonitor monitor) {

-				monitor.beginTask(

-					UpdateUI.getString("SiteBookmark.downloading"), //$NON-NLS-1$

-					featureCount);

-				for (int i = 0; i < children.size(); i++) {

-					Object child = children.get(i);

-					if (monitor.isCanceled())

-						break;

-					if (child instanceof IFeatureAdapter) {

-						IFeatureAdapter adapter = (IFeatureAdapter) child;

-						monitor.subTask(adapter.getFastLabel());

-						try {

-							adapter.getFeature(

-								new SubProgressMonitor(monitor, 1));

-						} catch (CoreException e) {

-						}

-					}

-				}

-				monitor.done();

-			}

-		};

-

-		try {

-			context.run(true, true, op);

-			touched = true;

-		} catch (InterruptedException e) {

-			canceled = true;

-		} catch (InvocationTargetException e) {

-		}

-	}

-

-	public void addFeaturesTo(Vector flatList) {

-		for (int i = 0; i < children.size(); i++) {

-			Object child = children.get(i);

-			if (child instanceof FeatureReferenceAdapter) {

-				FeatureReferenceAdapter cfeature =

-					(FeatureReferenceAdapter) child;

-				// Don't add duplicates - there may be the same

-				// feature present in several categories

-				if (findFeature(flatList, cfeature.getFeatureReference())

-					== null) {

-					flatList.add(child);

-				}

-			} else if (child instanceof SiteCategory) {

-				((SiteCategory) child).addFeaturesTo(flatList);

-			}

-		}

-	}

-

-	private FeatureReferenceAdapter findFeature(

-		Vector flatList,

-		IFeatureReference featureRef) {

-		for (int i = 0; i < flatList.size(); i++) {

-			FeatureReferenceAdapter cfeature =

-				(FeatureReferenceAdapter) flatList.get(i);

-			if (cfeature.getFeatureReference().equals(featureRef))

-				return cfeature;

-		}

-		return null;

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UIModelObject.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UIModelObject.java
deleted file mode 100644
index 6684dbf..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UIModelObject.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.update.internal.ui.model;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.ui.model.*;
-
-
-public class UIModelObject extends PlatformObject implements IWorkbenchAdapter {
-	UpdateModel model;
-	
-	public void setModel(UpdateModel model) {
-		this.model = model;
-	}
-	
-	public UpdateModel getModel() {
-		return model;
-	}
-	
-	protected void notifyObjectChanged(String property) {
-		if (model==null) return;
-		model.fireObjectChanged(this, property);
-	}
-	
-	protected void notifyObjectsAdded(Object parent, Object [] objects) {
-		if (model==null) return;
-		model.fireObjectsAdded(parent, objects);
-	}
-	
-	protected void notifyObjectsRemoved(Object parent, Object [] objects) {
-		if (model==null) return;
-		model.fireObjectsRemoved(parent, objects);
-	}
-	
-	public Object [] getChildren(Object obj) {
-		return new Object[0];
-	}
-	
-	public Object getParent(Object obj) {
-		return null;
-	}
-	public String getLabel(Object obj) {
-		return toString();
-	}
-	public ImageDescriptor getImageDescriptor(Object obj) {
-		return null;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UpdateModel.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UpdateModel.java
deleted file mode 100644
index 4aa957b..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/model/UpdateModel.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.model;

-

-import java.util.*;

-

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

-import org.eclipse.update.internal.ui.*;

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

-

-public class UpdateModel implements IAdaptable {

-	private Vector bookmarks = new Vector();

-	private Vector listeners = new Vector();

-	private static final String BOOKMARK_FILE = "bookmarks.xml"; //$NON-NLS-1$

-	

-	public UpdateModel() {

-		reset();

-	}

-	

-	public void reset() {

-		// load bookmarks

-		bookmarks.clear();

-		BookmarkUtil.parse(getBookmarksFileName(), bookmarks);

-	}

-	

-	private String getBookmarksFileName() {

-		IPath path = UpdateUI.getDefault().getStateLocation();

-		path = path.append(BOOKMARK_FILE);

-		return path.toOSString();

-	}

-	

-	public void shutdown() {

-		saveBookmarks();

-	}

-	

-	public void saveBookmarks() {

-		BookmarkUtil.store(getBookmarksFileName(), bookmarks);

-	}

-	

-	

-	public void addBookmark(NamedModelObject bookmark) {

-		bookmarks.add(bookmark);

-		bookmark.setModel(this);

-		fireObjectsAdded(null, new Object []{bookmark});

-	}

-	

-	public void removeBookmark(NamedModelObject bookmark) {

-		bookmarks.remove(bookmark);

-		bookmark.setModel(null);

-		fireObjectsRemoved(null, new Object []{bookmark});

-	}

-	

-	public NamedModelObject [] getBookmarks() {

-		return (NamedModelObject[])bookmarks.toArray(new NamedModelObject[bookmarks.size()]);

-	}

-	

-	public SiteBookmark [] getBookmarkLeafs() {

-		return BookmarkUtil.getBookmarks(bookmarks);

-	}

-	

-	public BookmarkFolder getFolder(IPath path) {

-		return BookmarkUtil.getFolder(bookmarks, path);

-	}

-	

-	public void addUpdateModelChangedListener(IUpdateModelChangedListener listener) {

-		if (!listeners.contains(listener)) 

-		   listeners.add(listener);

-	}

-

-

-	public void removeUpdateModelChangedListener(IUpdateModelChangedListener listener) {

-		if (listeners.contains(listener))

-			listeners.remove(listener);

-	}

-	

-	public void fireObjectsAdded(Object parent, Object [] children) {

-		for (Iterator iter=listeners.iterator();

-				iter.hasNext();) {

-			IUpdateModelChangedListener listener = (IUpdateModelChangedListener)iter.next();

-			listener.objectsAdded(parent, children);

-		}

-	}

-

-

-	public void fireObjectsRemoved(Object parent, Object [] children) {

-		for (Iterator iter=listeners.iterator();

-				iter.hasNext();) {

-			IUpdateModelChangedListener listener = (IUpdateModelChangedListener)iter.next();

-			listener.objectsRemoved(parent, children);

-		}

-	}

-	

-	public void fireObjectChanged(Object object, String property) {

-		for (Iterator iter=listeners.iterator();

-			iter.hasNext();) {

-			IUpdateModelChangedListener listener = (IUpdateModelChangedListener)iter.next();

-			listener.objectChanged(object, property);

-		}

-	}

-	public Object getAdapter(Class key) {

-		return null;

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/AbstractOverlayIcon.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/AbstractOverlayIcon.java
deleted file mode 100644
index 80cbdf3..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/AbstractOverlayIcon.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.internal.ui.parts;
-
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * An OverlayIcon consists of a main icon and several adornments.
- */
-public abstract class AbstractOverlayIcon extends CompositeImageDescriptor {
-
-	static final int DEFAULT_WIDTH = 16;
-	static final int DEFAULT_HEIGHT = 16;
-
-	private Point fSize = null;
-
-	private ImageDescriptor fOverlays[][];
-
-	public AbstractOverlayIcon(ImageDescriptor[][] overlays) {
-		this(overlays, null);
-	}
-
-	public AbstractOverlayIcon(ImageDescriptor[][] overlays, Point size) {
-		fOverlays = overlays;
-		if (size != null)
-			fSize = size;
-		else
-			fSize = new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	}
-	protected void drawBottomLeft(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = 0;
-		for (int i = 0; i < 3; i++) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				drawImage(id, x, getSize().y - id.height);
-				x += id.width;
-			}
-		}
-	}
-	protected void drawBottomRight(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = getSize().x;
-		for (int i = 2; i >= 0; i--) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				x -= id.width;
-				drawImage(id, x, getSize().y - id.height);
-			}
-		}
-	}
-
-	protected abstract ImageData getBaseImageData();
-
-	protected void drawCompositeImage(int width, int height) {
-		ImageData base = getBaseImageData();
-		drawImage(base, 0, 0);
-		if (fOverlays != null) {
-			if (fOverlays.length > 0)
-				drawTopRight(fOverlays[0]);
-
-			if (fOverlays.length > 1)
-				drawBottomRight(fOverlays[1]);
-
-			if (fOverlays.length > 2)
-				drawBottomLeft(fOverlays[2]);
-
-			if (fOverlays.length > 3)
-				drawTopLeft(fOverlays[3]);
-		}
-	}
-	protected void drawTopLeft(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = 0;
-		for (int i = 0; i < 3; i++) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				drawImage(id, x, 0);
-				x += id.width;
-			}
-		}
-	}
-	protected void drawTopRight(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = getSize().x;
-		for (int i = 2; i >= 0; i--) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				x -= id.width;
-				drawImage(id, x, 0);
-			}
-		}
-	}
-
-	protected Point getSize() {
-		return fSize;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/DefaultContentProvider.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/DefaultContentProvider.java
deleted file mode 100644
index 5a67a7b..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/DefaultContentProvider.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.update.internal.ui.parts;

-

-import org.eclipse.jface.viewers.*;

-

-public class DefaultContentProvider implements IContentProvider {

-

-public DefaultContentProvider() {

-	super();

-}

-public void dispose() {}

-public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/ImageOverlayIcon.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/ImageOverlayIcon.java
deleted file mode 100644
index 794b977..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/ImageOverlayIcon.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.internal.ui.parts;
-
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.graphics.*;
-
-/**
- * An OverlayIcon consists of a main icon and several adornments.
- */
-public class ImageOverlayIcon extends AbstractOverlayIcon {
-	private Image base;
-
-	public ImageOverlayIcon(Image base, ImageDescriptor[][] overlays) {
-		this(base, overlays, null);
-	}
-	
-	public ImageOverlayIcon(Image base, ImageDescriptor[][] overlays, Point size) {
-		super(overlays, size);
-		this.base = base;
-	}
-	
-	protected ImageData getBaseImageData() {
-		return base.getImageData();
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/OverlayIcon.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/OverlayIcon.java
deleted file mode 100644
index 8ff4e72..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/OverlayIcon.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************

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

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

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

- * which accompanies 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.parts;

-

-import org.eclipse.jface.resource.*;

-import org.eclipse.swt.graphics.*;

-

-/**

- * An OverlayIcon consists of a main icon and several adornments.

- */

-public class OverlayIcon extends CompositeImageDescriptor {

-	

-	static final int DEFAULT_WIDTH= 16;

-	static final int DEFAULT_HEIGHT= 16;

-	

-	private Point fSize= null;

-		

-	private ImageDescriptor fBase;

-	private ImageDescriptor fOverlays[][];

-

-	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays) {

-		fBase= base;

-		if (fBase == null)

-			fBase= ImageDescriptor.getMissingImageDescriptor();

-		fOverlays= overlays;

-		fSize= new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);

-	}

-	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays, Point size) {

-		fBase= base;

-		if (fBase == null)

-			fBase= ImageDescriptor.getMissingImageDescriptor();

-		fOverlays= overlays;

-		fSize= size;

-	}

-	protected void drawBottomLeft(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= 0;

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

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				drawImage(id, x, getSize().y-id.height);

-				x+= id.width;

-			}

-		}

-	}

-	protected void drawBottomRight(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= getSize().x;

-		for (int i= 2; i >= 0; i--) {

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				x-= id.width;

-				drawImage(id, x, getSize().y-id.height);

-			}

-		}

-	}

-	protected void drawCompositeImage(int width, int height) {

-		ImageData bg= fBase.getImageData();

-		drawImage(bg, 0, 0);

-		

-		if (fOverlays != null) {

-			if (fOverlays.length > 0)

-				drawTopRight( fOverlays[0]);

-				

-			if (fOverlays.length > 1)

-				drawBottomRight(fOverlays[1]);

-				

-			if (fOverlays.length > 2)

-				drawBottomLeft(fOverlays[2]);

-				

-			if (fOverlays.length > 3)

-				drawTopLeft(fOverlays[3]);

-		}	

-	}

-	protected void drawTopLeft(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= 0;

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

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				drawImage(id, x, 0);

-				x+= id.width;

-			}

-		}

-	}

-	protected void drawTopRight(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= getSize().x;

-		for (int i= 2; i >= 0; i--) {

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				x-= id.width;

-				drawImage(id, x, 0);

-			}

-		}

-	}

-

-	protected Point getSize() {

-		return fSize;

-	}

-}


diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/PixelConverter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/PixelConverter.java
deleted file mode 100644
index 487c6d9..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/PixelConverter.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.parts;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-public class PixelConverter {
-	
-	private FontMetrics fFontMetrics;
-	
-	public PixelConverter(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		fFontMetrics= gc.getFontMetrics();
-		gc.dispose();
-	}
-	
-	public int convertHeightInCharsToPixels(int chars) {
-		return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
-	}
-
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
-	}
-
-	public int convertVerticalDLUsToPixels(int dlus) {
-		return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
-	}
-	
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
-	}	
-
-}
-

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SWTUtil.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SWTUtil.java
deleted file mode 100644
index 5efee0d..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SWTUtil.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.parts;
-/**
- * @version 	1.0
- * @author
- */
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * Utility class to simplify access to some SWT resources. 
- */
-public class SWTUtil {
-
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	/**
-	 * Returns the shell for the given widget. If the widget doesn't represent
-	 * a SWT object that manage a shell, <code>null</code> is returned.
-	 * 
-	 * @return the shell for the given widget
-	 */
-	public static Shell getShell(Widget widget) {
-		if (widget instanceof Control)
-			return ((Control) widget).getShell();
-		if (widget instanceof Caret)
-			return ((Caret) widget).getParent().getShell();
-		if (widget instanceof DragSource)
-			return ((DragSource) widget).getControl().getShell();
-		if (widget instanceof DropTarget)
-			return ((DropTarget) widget).getControl().getShell();
-		if (widget instanceof Menu)
-			return ((Menu) widget).getParent().getShell();
-		if (widget instanceof ScrollBar)
-			return ((ScrollBar) widget).getParent().getShell();
-
-		return null;
-	}
-
-	/**
-	 * Returns a width hint for a button control.
-	 */
-	public static int getButtonWidthHint(Button button) {
-		if (button.getFont().equals(JFaceResources.getDefaultFont()))
-			button.setFont(JFaceResources.getDialogFont());
-		PixelConverter converter= new PixelConverter(button);
-		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-	}
-
-	/**
-	 * Returns a height hint for a button control.
-	 */
-	public static int getButtonHeigthHint(Button button) {
-		if (button.getFont().equals(JFaceResources.getDefaultFont()))
-			button.setFont(JFaceResources.getDialogFont());
-		PixelConverter converter= new PixelConverter(button);
-		return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-	}
-
-	/**
-	 * Sets width and height hint for the button control.
-	 * <b>Note:</b> This is a NOP if the button's layout data is not
-	 * an instance of <code>GridData</code>.
-	 * 
-	 * @param button	the button for which to set the dimension hint
-	 */
-	public static void setButtonDimensionHint(Button button) {
-		Assert.isNotNull(button);
-		Object gd = button.getLayoutData();
-		if (gd instanceof GridData) {
-			((GridData) gd).heightHint = getButtonHeigthHint(button);
-			((GridData) gd).widthHint = getButtonWidthHint(button);
-		}
-	}
-
-	public static void setDialogSize(Dialog dialog, int width, int height) {
-		Point computedSize =
-			dialog.getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		width = Math.max(computedSize.x, width);
-		height = Math.max(computedSize.y, height);
-		dialog.getShell().setSize(width, height);
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SharedLabelProvider.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SharedLabelProvider.java
deleted file mode 100644
index 2e12d90..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/parts/SharedLabelProvider.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.internal.ui.parts;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.update.internal.ui.*;
-
-/**
- * @version 	1.0
- * @author
- */
-public class SharedLabelProvider
-	extends LabelProvider
-	implements ITableLabelProvider {
-	public static final int F_ERROR = 1;
-	public static final int F_WARNING = 2;
-	public static final int F_CURRENT = 4;
-	public static final int F_INSTALLABLE = 8;
-	public static final int F_LINKED = 16;
-	public static final int F_MOD = 32;
-	public static final int F_UPDATED = 64;
-	public static final int F_UNCONFIGURED = 128;
-	public static final int F_ADD = 256;
-	public static final int F_DEL = 512;
-
-	Hashtable images = new Hashtable();
-	ArrayList consumers = new ArrayList();
-
-	public SharedLabelProvider() {
-	}
-
-	public void connect(Object consumer) {
-		if (!consumers.contains(consumer))
-			consumers.add(consumer);
-	}
-
-	public void disconnect(Object consumer) {
-		consumers.remove(consumer);
-		if (consumers.size() == 0) {
-			reset();
-		}
-	}
-	
-	public void dispose() {
-		reset();
-		super.dispose();
-	}
-
-	private void reset() {
-		for (Enumeration enum = images.elements(); enum.hasMoreElements();) {
-			Image image = (Image) enum.nextElement();
-			image.dispose();
-		}
-		images.clear();
-	}
-
-	public Image get(ImageDescriptor desc) {
-		return get(desc, 0);
-	}
-
-	public Image get(ImageDescriptor desc, int flags) {
-		Object key = desc;
-
-		if (flags != 0) {
-			key = getKey(desc.hashCode(), flags);
-		}
-		Image image = (Image) images.get(key);
-		if (image == null) {
-			image = createImage(desc, flags);
-			images.put(key, image);
-		}
-		return image;
-	}
-	
-	public Image get(Image image, int flags) {
-		if (flags==0) return image;
-		String key = getKey(image.hashCode(), flags);
-		Image resultImage = (Image)images.get(key);
-		if (resultImage == null) {
-			resultImage = createImage(image, flags);
-			images.put(key, resultImage);
-		}
-		return resultImage;
-	}
-
-	private String getKey(long hashCode, int flags) {
-		return (""+hashCode) + ":"+flags; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private Image createImage(ImageDescriptor baseDesc, int flags) {
-		if (flags == 0) {
-			return baseDesc.createImage();
-		}
-		ImageDescriptor[] lowerLeft = getLowerLeftOverlays(flags);
-		ImageDescriptor[] upperRight = getUpperRightOverlays(flags);
-		ImageDescriptor[] lowerRight = getLowerRightOverlays(flags);
-		ImageDescriptor[] upperLeft = getUpperLeftOverlays(flags);
-		OverlayIcon compDesc =
-			new OverlayIcon(
-				baseDesc,
-				new ImageDescriptor[][] { upperRight, lowerRight, lowerLeft, upperLeft });
-		return compDesc.createImage();
-	}
-	
-	private Image createImage(Image baseImage, int flags) {
-		if (flags == 0) {
-			return baseImage;
-		}
-		ImageDescriptor[] lowerLeft = getLowerLeftOverlays(flags);
-		ImageDescriptor[] upperRight = getUpperRightOverlays(flags);
-		ImageDescriptor[] lowerRight = getLowerRightOverlays(flags);
-		ImageDescriptor[] upperLeft = getUpperLeftOverlays(flags);
-		ImageOverlayIcon compDesc =
-			new ImageOverlayIcon(
-				baseImage,
-				new ImageDescriptor[][] { upperRight, lowerRight, lowerLeft, upperLeft });
-		return compDesc.createImage();
-	}
-
-	private ImageDescriptor[] getLowerLeftOverlays(int flags) {
-		if ((flags & F_ERROR) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_ERROR_CO };
-		if ((flags & F_WARNING) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_WARNING_CO };
-		return null;
-	}
-
-	private ImageDescriptor[] getUpperRightOverlays(int flags) {
-		if ((flags & F_ADD) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_ADD_CO };
-		if ((flags & F_DEL) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_DEL_CO };
-		if ((flags & F_UNCONFIGURED) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_UNCONF_CO };
-		if ((flags & F_LINKED) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_LINKED_CO };
-		return null;
-	}
-	
-	private ImageDescriptor[] getLowerRightOverlays(int flags) {
-		if ((flags & F_CURRENT) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_CURRENT_CO };
-		if ((flags & F_MOD) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_MOD_CO };
-		/*
-		if ((flags & F_ADD) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_ADD_CO };
-		if ((flags & F_DEL) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_DEL_CO };
-		if ((flags & F_UNCONFIGURED) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_UNCONF_CO };
-		*/
-		return null;
-	}
-	
-	private ImageDescriptor[] getUpperLeftOverlays(int flags) {
-		if ((flags & F_UPDATED) != 0)
-			return new ImageDescriptor[] { UpdateUIImages.DESC_UPDATED_CO };
-		return null;
-	}
-
-	public String getColumnText(Object obj, int index) {
-		return getText(obj);
-	}
-	public Image getColumnImage(Object obj, int index) {
-		return getImage(obj);
-	}
-
-	public Image getImageFromURL(
-		URL installURL,
-		String subdirectoryAndFilename) {
-		Image image = null;
-		try {
-			URL newURL = new URL(installURL, subdirectoryAndFilename);
-			String key = newURL.toString();
-			image = (Image)images.get(key);
-			if (image == null) {
-				ImageDescriptor desc = ImageDescriptor.createFromURL(newURL);
-				image = desc.createImage();
-				images.put(key, image);
-			}
-		} catch (MalformedURLException e) {
-		} catch (SWTException e) {
-		}
-		return image;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/MainPreferencePage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/MainPreferencePage.java
deleted file mode 100644
index d95c8dd..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/MainPreferencePage.java
+++ /dev/null

@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.preferences;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateCore;
-import org.eclipse.update.internal.operations.UpdateUtils;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * Insert the type's description here.
- * @see PreferencePage
- */
-public class MainPreferencePage
-	extends PreferencePage
-	implements IWorkbenchPreferencePage {
-
-	//private Label historySizeLabel;
-	private Text historySizeText;
-	private Button checkSignatureCheckbox;
-	private Button equivalentButton;
-	private Button compatibleButton;
-	private Text updatePolicyText;
-	private Label httpProxyHostLabel;
-	private Label httpProxyPortLabel;
-	private Text httpProxyHostText;
-	private Text httpProxyPortText;
-	private Button enableHttpProxy;
-
-	// these two values are for compatibility with old code
-	public static final String EQUIVALENT_VALUE = "equivalent"; //$NON-NLS-1$
-	public static final String COMPATIBLE_VALUE = "compatible"; //$NON-NLS-1$
-
-	/**
-	 * The constructor.
-	 */
-	public MainPreferencePage() {
-		super();
-	}
-
-	/**
-	 * Insert the method's description here.
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on PreferencePage.
-	 */
-	protected Control createContents(Composite parent) {
-		WorkbenchHelp.setHelp(parent, "org.eclipse.update.ui.MainPreferencePage"); //$NON-NLS-1$
-
-		Composite mainComposite = new Composite(parent, SWT.NULL);
-		mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 2;
-		mainComposite.setLayout(layout);
-
-		Label historySizeLabel = new Label(mainComposite, SWT.NONE);
-		historySizeLabel.setText(UpdateUI.getString("MainPreferencePage.historySize")); //$NON-NLS-1$
-		historySizeText = new Text(mainComposite, SWT.SINGLE | SWT.BORDER);
-		historySizeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		checkSignatureCheckbox =
-			new Button(mainComposite, SWT.CHECK | SWT.LEFT);
-		checkSignatureCheckbox.setText(UpdateUI.getString("MainPreferencePage.checkSignature")); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		checkSignatureCheckbox.setLayoutData(gd);
-		checkSignatureCheckbox.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (checkSignatureCheckbox.getSelection() == false) {
-					warnSignatureCheck(getShell());
-				}
-			}
-		});
-
-		createSpacer(mainComposite, 2);
-
-		Group group = new Group(mainComposite, SWT.NONE);
-		group.setText(UpdateUI.getString("MainPreferencePage.updateVersions")); //$NON-NLS-1$
-		group.setLayout(new GridLayout());
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		group.setLayoutData(gd);
-
-		equivalentButton = new Button(group, SWT.RADIO);
-		equivalentButton.setText(UpdateUI.getString("MainPreferencePage.updateVersions.equivalent")); //$NON-NLS-1$
-
-		compatibleButton = new Button(group, SWT.RADIO);
-		compatibleButton.setText(UpdateUI.getString("MainPreferencePage.updateVersions.compatible")); //$NON-NLS-1$
-
-		createSpacer(mainComposite, 2);
-
-		group = new Group(mainComposite, SWT.NONE);
-		group.setText(UpdateUI.getString("MainPreferencePage.updatePolicy")); //$NON-NLS-1$
-		layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		group.setLayoutData(gd);
-
-		Label label = new Label(group, SWT.NULL);
-		label.setText(UpdateUI.getString("MainPreferencePage.updatePolicyURL")); //$NON-NLS-1$
-		updatePolicyText = new Text(group, SWT.SINGLE | SWT.BORDER);
-
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		updatePolicyText.setLayoutData(gd);
-
-		createSpacer(mainComposite, 2);
-		createHttpProxy(mainComposite, 2);
-		initialize();
-		updatePolicyText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				textChanged();
-			}
-		});
-		return mainComposite;
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(getControl());
-	}
-
-	protected void createSpacer(Composite composite, int columnSpan) {
-		Label label = new Label(composite, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = columnSpan;
-		label.setLayoutData(gd);
-	}
-
-	protected void createHttpProxy(Composite composite, int columnSpan) {
-		Group group = new Group(composite, SWT.NONE);
-		group.setText(UpdateUI.getString("MainPreferencePage.proxyGroup")); //$NON-NLS-1$
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = columnSpan;
-		group.setLayoutData(gd);
-
-		enableHttpProxy = new Button(group, SWT.CHECK);
-		enableHttpProxy.setText(UpdateUI.getString("MainPreferencePage.enableHttpProxy")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		enableHttpProxy.setLayoutData(gd);
-
-		httpProxyHostLabel = new Label(group, SWT.NONE);
-		httpProxyHostLabel.setText(UpdateUI.getString("MainPreferencePage.httpProxyHost")); //$NON-NLS-1$
-
-		httpProxyHostText = new Text(group, SWT.SINGLE | SWT.BORDER);
-		httpProxyHostText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		httpProxyPortLabel = new Label(group, SWT.NONE);
-		httpProxyPortLabel.setText(UpdateUI.getString("MainPreferencePage.httpProxyPort")); //$NON-NLS-1$
-
-		httpProxyPortText = new Text(group, SWT.SINGLE | SWT.BORDER);
-		httpProxyPortText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		enableHttpProxy.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean enable = enableHttpProxy.getSelection();
-				httpProxyPortLabel.setEnabled(enable);
-				httpProxyHostLabel.setEnabled(enable);
-				httpProxyPortText.setEnabled(enable);
-				httpProxyHostText.setEnabled(enable);
-			}
-		});
-
-	}
-
-	private int getHistoryCount() {
-		try {
-			Integer count = new Integer(historySizeText.getText());
-			return count.intValue();
-		} catch (NumberFormatException e) {
-		}
-		return UpdateCore.getPlugin().getPluginPreferences().getDefaultInt(
-			UpdateCore.P_HISTORY_SIZE);
-	}
-
-	public boolean performOk() {
-		BusyIndicator.showWhile(getControl().getDisplay(), new Runnable() {
-			public void run() {
-				try {
-					SiteManager.getLocalSite().setMaximumHistoryCount(
-						getHistoryCount());
-					SiteManager.setHttpProxyInfo(
-						enableHttpProxy.getSelection(),
-						httpProxyHostText.getText(),
-						httpProxyPortText.getText());
-				} catch (CoreException e) {
-					UpdateUI.logException(e);
-				}
-			}
-		});
-
-		Preferences prefs = UpdateCore.getPlugin().getPluginPreferences();
-		prefs.setValue(
-			UpdateCore.P_CHECK_SIGNATURE,
-			checkSignatureCheckbox.getSelection());
-		prefs.setValue(UpdateCore.P_HISTORY_SIZE, historySizeText.getText());
-		prefs.setValue(
-			UpdateCore.P_UPDATE_VERSIONS,
-			equivalentButton.getSelection()
-				? EQUIVALENT_VALUE
-				: COMPATIBLE_VALUE);
-		prefs.setValue(
-			UpdateUtils.P_UPDATE_POLICY_URL,
-			updatePolicyText.getText());
-
-		UpdateCore.getPlugin().savePluginPreferences();
-		return super.performOk();
-	}
-
-	public void performApply() {
-		super.performApply();
-		BusyIndicator.showWhile(getControl().getDisplay(), new Runnable() {
-			public void run() {
-				SiteManager.setHttpProxyInfo(
-					enableHttpProxy.getSelection(),
-					httpProxyHostText.getText(),
-					httpProxyPortText.getText());
-			}
-		});
-
-		Preferences prefs = UpdateCore.getPlugin().getPluginPreferences();
-		prefs.setValue(
-			UpdateCore.P_CHECK_SIGNATURE,
-			checkSignatureCheckbox.getSelection());
-		prefs.setValue(UpdateCore.P_HISTORY_SIZE, historySizeText.getText());
-		prefs.setValue(
-			UpdateCore.P_UPDATE_VERSIONS,
-			equivalentButton.getSelection()
-				? EQUIVALENT_VALUE
-				: COMPATIBLE_VALUE);
-		prefs.setValue(
-			UpdateUtils.P_UPDATE_POLICY_URL,
-			updatePolicyText.getText());
-
-		UpdateCore.getPlugin().savePluginPreferences();
-	}
-
-	private void initialize() {
-		enableHttpProxy.setSelection(SiteManager.isHttpProxyEnable());
-		String serverValue = SiteManager.getHttpProxyServer();
-		if (serverValue != null)
-			httpProxyHostText.setText(serverValue);
-		String portValue = SiteManager.getHttpProxyPort();
-		if (portValue != null)
-			httpProxyPortText.setText(portValue);
-
-		httpProxyPortLabel.setEnabled(enableHttpProxy.getSelection());
-		httpProxyHostLabel.setEnabled(enableHttpProxy.getSelection());
-		httpProxyPortText.setEnabled(enableHttpProxy.getSelection());
-		httpProxyHostText.setEnabled(enableHttpProxy.getSelection());
-
-		Preferences prefs = UpdateCore.getPlugin().getPluginPreferences();
-		checkSignatureCheckbox.setSelection(
-			prefs.getBoolean(UpdateCore.P_CHECK_SIGNATURE));
-
-		historySizeText.setText(prefs.getString(UpdateCore.P_HISTORY_SIZE));
-
-		boolean isCompatible =
-			UpdateCore.COMPATIBLE_VALUE.equals(
-				prefs.getString(UpdateCore.P_UPDATE_VERSIONS));
-		equivalentButton.setSelection(!isCompatible);
-		compatibleButton.setSelection(isCompatible);
-
-		String text = prefs.getString(UpdateUtils.P_UPDATE_POLICY_URL);
-		updatePolicyText.setText(text);
-	}
-
-	private void textChanged() {
-		String text = updatePolicyText.getText();
-		if (text.length() > 0) {
-			try {
-				new URL(text);
-			} catch (MalformedURLException e) {
-				setValid(false);
-				setErrorMessage(UpdateUI.getString("UpdateSettingsPreferencePage.invalid")); //$NON-NLS-1$
-				return;
-			}
-		}
-		setValid(true);
-		setErrorMessage(null);
-	}
-
-	public void performDefaults() {
-		super.performDefaults();
-		Preferences prefs = UpdateCore.getPlugin().getPluginPreferences();
-
-		enableHttpProxy.setSelection(false);
-		httpProxyHostText.setText(""); //$NON-NLS-1$
-		httpProxyPortText.setText(""); //$NON-NLS-1$
-		httpProxyPortLabel.setEnabled(false);
-		httpProxyHostLabel.setEnabled(false);
-		httpProxyPortText.setEnabled(false);
-		httpProxyHostText.setEnabled(false);
-
-		updatePolicyText.setText(""); //$NON-NLS-1$
-
-		checkSignatureCheckbox.setSelection(true);
-		historySizeText.setText(
-			prefs.getDefaultString(UpdateCore.P_HISTORY_SIZE));
-		equivalentButton.setSelection(true);
-		compatibleButton.setSelection(false);
-	}
-
-	private void warnSignatureCheck(Shell shell) {
-		MessageDialog.openWarning(shell, UpdateUI.getString("MainPreferencePage.digitalSignature.title"), //$NON-NLS-1$
-		UpdateUI.getString("MainPreferencePage.digitalSignature.message")); //$NON-NLS-1$
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/UpdateSettingsPreferencePage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/UpdateSettingsPreferencePage.java
deleted file mode 100644
index 1040f09..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/preferences/UpdateSettingsPreferencePage.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.preferences;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * Insert the type's description here.
- * @see PreferencePage
- */
-public class UpdateSettingsPreferencePage
-	extends PreferencePage
-	implements IWorkbenchPreferencePage {
-	private Text mappingsFile;
-
-	/**
-	 * The constructor.
-	 */
-	public UpdateSettingsPreferencePage() {
-		setDescription(UpdateUI.getString("UpdateSettingsPreferencePage.description")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Insert the method's description here.
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	public Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.marginWidth = layout.marginHeight = 0;
-		layout.numColumns = 2;
-		Label label = new Label(container, SWT.NULL);
-		label.setText(UpdateUI.getString("UpdateSettingsPreferencePage.label")); //$NON-NLS-1$
-		mappingsFile = new Text(container, SWT.SINGLE | SWT.BORDER);
-
-		initialize();
-		mappingsFile.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				textChanged();
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		mappingsFile.setLayoutData(gd);
-		return container;
-	}
-
-	private void initialize() {
-		Preferences pref = UpdateCore.getPlugin().getPluginPreferences();
-		String text = pref.getString(UpdateUtils.P_UPDATE_POLICY_URL);
-		mappingsFile.setText(text);
-		textChanged();
-	}
-
-	private void textChanged() {
-		String text = mappingsFile.getText();
-		if (text.length() > 0) {
-			try {
-				new URL(text);
-			} catch (MalformedURLException e) {
-				setValid(false);
-				setErrorMessage(UpdateUI.getString("UpdateSettingsPreferencePage.invalid")); //$NON-NLS-1$
-				return;
-			}
-		}
-		setValid(true);
-		setErrorMessage(null);
-	}
-
-	public boolean performOk() {
-		Preferences pref = UpdateCore.getPlugin().getPluginPreferences();
-		String text = mappingsFile.getText();
-		if (text.length() > 0)
-			pref.setValue(UpdateUtils.P_UPDATE_POLICY_URL, text);
-		else
-			pref.setToDefault(UpdateUtils.P_UPDATE_POLICY_URL);
-		UpdateCore.getPlugin().savePluginPreferences();
-		return true;
-	}
-
-	protected void performDefaults() {
-		mappingsFile.setText(""); //$NON-NLS-1$
-		super.performDefaults();
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(getControl());
-		/*
-		WorkbenchHelp.setHelp(
-			parent,"org.eclipse.update.ui.AppServerPreferencePage");
-		*/
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/ConfiguredSitePropertyPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/ConfiguredSitePropertyPage.java
deleted file mode 100644
index becbf9b..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/ConfiguredSitePropertyPage.java
+++ /dev/null

@@ -1,53 +0,0 @@
-package org.eclipse.update.internal.ui.properties;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * @see PropertyPage
- */
-public class ConfiguredSitePropertyPage extends PropertyPage implements IWorkbenchPropertyPage {
-	/**
-	 *
-	 */
-	public ConfiguredSitePropertyPage() {
-		noDefaultAndApplyButton();
-	}
-
-	protected Control createContents(Composite parent)  {
-		IConfiguredSiteAdapter adapter = (IConfiguredSiteAdapter)getElement();
-		IConfiguredSite csite = adapter.getConfiguredSite();
-		Composite composite = new Composite(parent,SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		addProperty(composite, UpdateUI.getString("ConfiguredSitePropertyPage.path"), csite.getSite().getURL().toString()); //$NON-NLS-1$
-		addProperty(composite, UpdateUI.getString("ConfiguredSitePropertyPage.type"), getLocationType(csite)); //$NON-NLS-1$
-		addProperty(composite, UpdateUI.getString("ConfiguredSitePropertyPage.enabled"), csite.isEnabled()?UpdateUI.getString("ConfiguredSitePropertyPage.yes"):UpdateUI.getString("ConfiguredSitePropertyPage.no")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return composite;
-	}
-	
-	private String getLocationType(IConfiguredSite csite) {
-		if (csite.isExtensionSite())
-			return UpdateUI.getString("ConfiguredSitePropertyPage.extension"); //$NON-NLS-1$
-		if (csite.isProductSite())
-			return UpdateUI.getString("ConfiguredSitePropertyPage.product"); //$NON-NLS-1$
-		return UpdateUI.getString("ConfiguredSitePropertyPage.unknown"); //$NON-NLS-1$
-	}
-	
-	private void addProperty(Composite parent, String key, String value) {
-		Label label = new Label(parent, SWT.NULL);
-		label.setText(key);
-		
-		label = new Label(parent, SWT.NULL);
-		label.setText(value);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		label.setLayoutData(gd);
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureCopyrightPropertyPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureCopyrightPropertyPage.java
deleted file mode 100644
index 94def4f..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureCopyrightPropertyPage.java
+++ /dev/null

@@ -1,82 +0,0 @@
-package org.eclipse.update.internal.ui.properties;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * @see PropertyPage
- */
-public class FeatureCopyrightPropertyPage extends PropertyPage implements IWorkbenchPropertyPage {
-	/**
-	 *
-	 */
-	public FeatureCopyrightPropertyPage() {
-		noDefaultAndApplyButton();
-	}
-
-	protected Control createContents(Composite parent) {
-		try {
-			IFeatureAdapter adapter = (IFeatureAdapter) getElement();
-			IFeature feature = adapter.getFeature(null);
-
-			Composite composite = new Composite(parent, SWT.NULL);
-			composite.setLayout(new GridLayout());
-
-			Label label = new Label(composite, SWT.WRAP);
-			GridData gd =
-				new GridData(
-					GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-			gd.widthHint = computeWidthLimit(label, 80);
-			label.setLayoutData(gd);
-
-			IURLEntry copyright = feature.getCopyright();
-			String annotation = (copyright != null) ? copyright.getAnnotation() : null;
-
-			if (annotation != null && annotation.length() > 0) {
-				label.setText(annotation);
-				final URL url = copyright.getURL();
-				String filename = (url != null) ? url.getFile() : null;
-				if (filename != null
-					&& (filename.endsWith(".htm") || filename.endsWith(".html"))) { //$NON-NLS-1$ //$NON-NLS-2$
-					Button button = new Button(composite, SWT.PUSH);
-					button.setText(UpdateUI.getString("FeatureCopyrightPropertyPage.showInBrowser")); //$NON-NLS-1$
-					button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-					SWTUtil.setButtonDimensionHint(button);
-					button.addSelectionListener(new SelectionAdapter() {
-						public void widgetSelected(SelectionEvent e) {
-							String urlName = url.getProtocol() + ":" + url.getFile(); //$NON-NLS-1$
-							UpdateUI.showURL(urlName);
-						}
-					});
-				}
-			} else {
-				label.setText(UpdateUI.getString("FeatureCopyrightPropertyPage.noCopyright")); //$NON-NLS-1$
-			}
-			Dialog.applyDialogFont(parent);
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-	
-	private int computeWidthLimit(Label label, int nchars) {
-		GC gc = new GC(label);
-		gc.setFont(label.getFont());
-		FontMetrics fontMetrics= gc.getFontMetrics();
-		gc.dispose();
-		return Dialog.convertWidthInCharsToPixels(fontMetrics, nchars);
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureGeneralPropertyPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureGeneralPropertyPage.java
deleted file mode 100644
index 19524af..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureGeneralPropertyPage.java
+++ /dev/null

@@ -1,131 +0,0 @@
-package org.eclipse.update.internal.ui.properties;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-public class FeatureGeneralPropertyPage
-	extends PropertyPage
-	implements IWorkbenchPropertyPage {
-		
-	public FeatureGeneralPropertyPage() {
-		noDefaultAndApplyButton();
-	}
-
-	protected Control createContents(Composite parent) {
-		try {
-			IFeatureAdapter adapter = (IFeatureAdapter) getElement();
-			IFeature feature = adapter.getFeature(null);
-
-			Composite composite = new Composite(parent, SWT.NONE);
-			GridLayout layout = new GridLayout();
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			layout.verticalSpacing = 15;
-			composite.setLayout(layout);
-			
-			addGeneralSection(feature, composite);	
-			addSupportedPlatformsSection(feature, composite);
-			addDescription(feature, composite);
-			
-			Dialog.applyDialogFont(parent);
-			
-			return composite;
-
-		} catch (CoreException e) {
-		}
-
-		return null;
-	}
-
-	private void addGeneralSection(IFeature feature, Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-
-		addField(composite, UpdateUI.getString("FeatureGeneralPropertyPage.name"), feature.getLabel()); //$NON-NLS-1$
-		addField(
-			composite,
-			UpdateUI.getString("FeatureGeneralPropertyPage.id"), //$NON-NLS-1$
-			feature.getVersionedIdentifier().getIdentifier());
-		addField(
-			composite,
-			UpdateUI.getString("FeatureGeneralPropertyPage.version"), //$NON-NLS-1$
-			feature.getVersionedIdentifier().getVersion().toString());
-		addField(composite, UpdateUI.getString("FeatureGeneralPropertyPage.provider"), feature.getProvider()); //$NON-NLS-1$
-		long size = feature.getInstallSize();
-		if (size != ContentEntryModel.UNKNOWN_SIZE)
-			addField(composite, UpdateUI.getString("FeatureGeneralPropertyPage.size"), new Long(size).toString() + " KB"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-	
-	private void addSupportedPlatformsSection(IFeature feature, Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(UpdateUI.getString("FeatureGeneralPropertyPage.platforms")); //$NON-NLS-1$
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label label = new Label(group, SWT.NONE);
-		label.setText(UpdateUI.getString("FeatureGeneralPropertyPage.os") + extractValue(feature.getOS())); //$NON-NLS-1$
-
-		label = new Label(group, SWT.NONE);
-		label.setText(UpdateUI.getString("FeatureGeneralPropertyPage.ws") + extractValue(feature.getWS())); //$NON-NLS-1$
-
-		label = new Label(group, SWT.NONE);
-		label.setText(UpdateUI.getString("FeatureGeneralPropertyPage.arch") + extractValue(feature.getOSArch())); //$NON-NLS-1$
-
-		label = new Label(group, SWT.NONE);
-		label.setText(UpdateUI.getString("FeatureGeneralPropertyPage.nl") + extractValue(feature.getNL())); //$NON-NLS-1$
-	}
-
-	private void addField(Composite parent, String property, String value) {
-
-		if (value != null && value.length() > 0) {
-			Label label = new Label(parent, SWT.NONE);
-			label.setText(property);
-
-			label = new Label(parent, SWT.NONE);
-			label.setText(value);
-		}
-
-	}
-	private String extractValue(String value) {
-		if (value == null || value.equals("*")) //$NON-NLS-1$
-			return UpdateUI.getString("FeatureGeneralPropertyPage.all"); //$NON-NLS-1$
-		return value;
-	}
-
-	private void addDescription(IFeature feature, Composite parent) {
-		IURLEntry description = feature.getDescription();
-		if (description != null) {
-			String annotation = description.getAnnotation();
-			if (annotation != null && annotation.length() > 0) {
-				Group group = new Group(parent, SWT.NONE);
-				group.setText(UpdateUI.getString("FeatureGeneralPropertyPage.desc")); //$NON-NLS-1$
-				group.setLayout(new GridLayout());
-				group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-				Text text = new Text(group, SWT.MULTI | SWT.WRAP);
-				GridData gd = new GridData(GridData.FILL_BOTH);
-				gd.heightHint = 200;
-				gd.widthHint = 350;
-				text.setEditable(false);
-				text.setText(annotation);
-				text.setLayoutData(gd);
-			}
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureLicensePropertyPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureLicensePropertyPage.java
deleted file mode 100644
index 5fe2a43..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureLicensePropertyPage.java
+++ /dev/null

@@ -1,69 +0,0 @@
-package org.eclipse.update.internal.ui.properties;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-
-public class FeatureLicensePropertyPage extends PropertyPage implements IWorkbenchPropertyPage {
-	public FeatureLicensePropertyPage() {
-		noDefaultAndApplyButton();
-	}
-
-	protected Control createContents(Composite parent)  {
-		try {
-			Composite composite = new Composite(parent, SWT.NULL);
-			composite.setLayout(new GridLayout());
-
-			IFeatureAdapter adapter = (IFeatureAdapter)getElement();
-			IFeature feature = adapter.getFeature(null);			
-			IURLEntry license = feature.getLicense();
-			String annotation = (license != null) ? license.getAnnotation() : null;
-			
-			if (annotation != null && annotation.length() > 0) {
-				Text text = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.WRAP);
-				GridData gd = new GridData(GridData.FILL_BOTH);
-				gd.heightHint = 200;
-				gd.widthHint = 350;
-				text.setLayoutData(gd);
-				text.setText(annotation);
-				text.setEditable(false);
-				final URL url = license.getURL();
-				String filename = (url != null) ? url.getFile() : null;
-				if (filename != null && (filename.endsWith(".htm") || url.getFile().endsWith(".html"))) { //$NON-NLS-1$ //$NON-NLS-2$
-					Button button = new Button(composite, SWT.PUSH);
-					button.setText(UpdateUI.getString("FeatureLicensePropertyPage.showInBrowser")); //$NON-NLS-1$
-					button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-					SWTUtil.setButtonDimensionHint(button);
-					button.addSelectionListener(new SelectionAdapter() {
-						public void widgetSelected(SelectionEvent e) {
-							String urlName = url.getProtocol() + ":" + url.getFile(); //$NON-NLS-1$
-							UpdateUI.showURL(urlName);
-						}
-					});
-				}
-			} else {
-				Label label = new Label(composite, SWT.NULL);
-				label.setText(UpdateUI.getString("FeatureLicensePropertyPage.noLicense")); //$NON-NLS-1$
-			}
-			
-			Dialog.applyDialogFont(parent);
-			
-			return composite;
-			
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureStatusPropertyPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureStatusPropertyPage.java
deleted file mode 100644
index c777f28..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/properties/FeatureStatusPropertyPage.java
+++ /dev/null

@@ -1,149 +0,0 @@
-package org.eclipse.update.internal.ui.properties;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.operations.*;
-
-/**
- * @see PropertyPage
- */
-public class FeatureStatusPropertyPage
-	extends PropertyPage
-	implements IWorkbenchPropertyPage {
-	/**
-	 *
-	 */
-	public FeatureStatusPropertyPage() {
-		noDefaultAndApplyButton();
-	}
-
-	protected Control createContents(Composite parent) {
-		try {
-
-			Composite composite = new Composite(parent, SWT.NONE);
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 1;
-			layout.verticalSpacing = 20;
-			composite.setLayout(layout);
-
-			Text message = new Text(composite, SWT.MULTI | SWT.WRAP);
-			message.setEditable(false);
-			GridData gd = new GridData();
-			gd.widthHint = 350;
-			message.setLayoutData(gd);
-			
-			ConfiguredFeatureAdapter adapter = (ConfiguredFeatureAdapter) getElement();
-			IFeature feature = adapter.getFeature(null);
-			
-			if (OperationsManager.findPendingOperation(feature) != null) {
-				message.setText(UpdateUI.getString("FeatureStatusPropertyPage.pendingChanges")); //$NON-NLS-1$
-				return composite;
-			}
-			
-			IStatus status = getStatus(feature);
-			int severity = status.getSeverity();
-			if (severity == IStatus.ERROR
-				&& getStatusCode(feature, status) == IFeature.STATUS_HAPPY) {
-				severity = IStatus.OK;
-				message.setText(UpdateUI.getString("FeatureStatusPropertyPage.goodConfiguration")); //$NON-NLS-1$
-			} else {
-				message.setText(status.getMessage());
-			}
-			if (severity != IStatus.OK && status.isMultiStatus()) {
-				String reason = getReason(status);
-				if (reason.length() > 0) {
-					Composite comp = new Composite(composite, SWT.NONE);
-					comp.setLayout(new GridLayout());
-					gd = new GridData(GridData.FILL_BOTH);
-					comp.setLayoutData(gd);
-
-					Label label = new Label(comp, SWT.NONE);
-					label.setText(UpdateUI.getString("FeatureStatusPropertyPage.reason")); //$NON-NLS-1$
-
-					Text text =
-						new Text(comp, SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
-					text.setEditable(false);
-					text.setText(reason);
-					gd.widthHint = 350;
-					text.setLayoutData(gd);
-				}
-
-			}
-			
-			Dialog.applyDialogFont(parent);
-			
-			return composite;
-
-		} catch (CoreException e) {
-		}
-
-		return null;
-	}
-
-	private String getReason(IStatus status) {
-		IStatus[] children = status.getChildren();
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < children.length; i++) {
-			String message = children[i].getMessage();
-			if (message != null && message.length() > 0) {
-				buffer.append(
-					message
-						+ System.getProperty("line.separator") //$NON-NLS-1$
-						+ System.getProperty("line.separator")); //$NON-NLS-1$
-			}
-		}
-		return buffer.toString();
-	}
-
-	private IStatus getStatus(IFeature feature) throws CoreException {
-		if (feature instanceof MissingFeature) {
-			int severity;
-			String message = ""; //$NON-NLS-1$
-			if (((MissingFeature) feature).isOptional()) {
-				severity = IStatus.OK;
-				message = UpdateUI.getString("FeatureStatusPropertyPage.missingOptional"); //$NON-NLS-1$
-			} else {
-				severity = IStatus.ERROR;
-				message = UpdateUI.getString("FeatureStatusPropertyPage.missing"); //$NON-NLS-1$
-			}
-			return new Status(severity, UpdateUI.PLUGIN_ID, IStatus.OK, message, null);
-		}
-		return SiteManager.getLocalSite().getFeatureStatus(feature);
-	}
-
-	private int getStatusCode(IFeature feature, IStatus status) {
-		int code = status.getCode();
-		if (code == IFeature.STATUS_UNHAPPY) {
-			if (status.isMultiStatus()) {
-				IStatus[] children = status.getChildren();
-				for (int i = 0; i < children.length; i++) {
-					IStatus child = children[i];
-					if (child.isMultiStatus()
-						|| child.getCode() != IFeature.STATUS_DISABLED)
-						return code;
-				}
-				// If we are here, global status is unhappy
-				// because one or more included features
-				// is disabled.
-				if (UpdateUtils.hasObsoletePatches(feature)) {
-					// The disabled included features
-					// are old patches that are now
-					// subsumed by better versions of
-					// the features they were designed to
-					// patch.
-					return IFeature.STATUS_HAPPY;
-				}
-			}
-		}
-		return code;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/Authentication.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/Authentication.java
deleted file mode 100644
index 95d93c3..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/Authentication.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.update.internal.ui.security;
-
-/**
- * Keeps user and password strings.
- */
-public class Authentication {
-	protected String user;
-	protected String password;
-	public Authentication(String user, String password){
-		this.user = user;
-		this.password = password;
-	}
-
-	/**
-	 * @return Returns the password.
-	 */
-	public String getPassword() {
-		return password;
-	}
-	/**
-	 * @return Returns the user.
-	 */
-	public String getUser() {
-		return user;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationDialog.java
deleted file mode 100644
index f1d5759..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationDialog.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.security;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.*;
-
-/**
- * 
- */
-public class JarVerificationDialog extends TitleAreaDialog {
-
-	private IVerificationResult _VerificationResult = null;
-	private IDialogPage _DialogPage;
-	private Composite pageContainer;
-	private Image defaultImage = null;
-	private ImageDescriptor defaultImageDescriptor =
-		UpdateUIImages.DESC_UPDATE_WIZ;
-	
-	/**
-	 * Constructor for JarVerificationDialog.
-	 * @param parentShell
-	 */
-	public JarVerificationDialog(Shell parentShell,IDialogPage dialogPage, IVerificationResult verificationResult) {
-		super(parentShell);
-		setShellStyle(SWT.TITLE | SWT.BORDER | SWT.APPLICATION_MODAL);		
-		_VerificationResult = verificationResult;
-		_DialogPage = dialogPage;
-		if (dialogPage instanceof JarVerificationPage){
-			((JarVerificationPage)_DialogPage).setTitleAreaDialog(this);
-		}
-	}
-
-	/**
-	 * Add buttons to the dialog's button bar.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		if (_VerificationResult.getVerificationCode()
-			!= IVerificationResult.TYPE_ENTRY_CORRUPTED) {
-
-			if (_VerificationResult.isFeatureVerification()) {
-				createButton(
-					parent,
-					IDialogConstants.OK_ID,
-					UpdateUI.getString("JarVerificationDialog.Install"), //$NON-NLS-1$
-					false);
-			} else {
-				createButton(
-					parent,
-					IDialogConstants.OK_ID,
-					UpdateUI.getString("JarVerificationDialog.Continue"), //$NON-NLS-1$
-					false);				
-			}
-
-			// Radio button: Cancel installation
-			//----------------------------------
-			createButton(
-				parent,
-				IDialogConstants.CANCEL_ID,
-				UpdateUI.getString("JarVerificationDialog.Cancel"), //$NON-NLS-1$
-				true);							
-		} else {
-			createButton(
-				parent,
-				IDialogConstants.CANCEL_ID,
-				UpdateUI.getString("JarVerificationDialog.Cancel"), //$NON-NLS-1$
-				true);
-		}
-		getButton(IDialogConstants.CANCEL_ID).setFocus();
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite compositeParent = (Composite)super.createDialogArea(parent);
-		setTitleImage(this.getImage());
-		setTitle(UpdateUI.getString("JarVerificationDialog.Title")); //$NON-NLS-1$
-		
-		_DialogPage.createControl(compositeParent);
-		pageContainer=(Composite)_DialogPage.getControl();
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		pageContainer.setLayoutData(gd);
-		pageContainer.setFont(parent.getFont());		
-		
-		// Build the separator line
-		Label separator= new Label(compositeParent, SWT.HORIZONTAL | SWT.SEPARATOR);
-		separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		return compositeParent;
-	}
-	
-		/**
-	 * @see IDialogPage#getImage()
-	 */
-	public Image getImage() {
-		if (defaultImage == null)
-			defaultImage = defaultImageDescriptor.createImage();
-
-		return defaultImage;
-	}
-
-	public boolean close() {
-		// dispose of image
-		if (defaultImage != null) {
-			defaultImage.dispose();
-			defaultImage = null;
-		}
-		return super.close();		
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationPage.java
deleted file mode 100644
index 54140e7..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationPage.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.security;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.help.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.jface.dialogs.Dialog;
-
-/**
- * 
- */
-public class JarVerificationPage extends BannerPage {
-
-	private IVerificationResult _VerificationResult = null;
-	private String _fileName = null;
-	private String _strFeatureName = null;
-	private String _strId = null;
-	private String _strProviderName = null;
-	private TitleAreaDialog _Dialog;
-	private String componentVerified;
-
-	/*
-	 * Constructor for JarVerificationPage.
-	 */
-	public JarVerificationPage(IVerificationResult verificationResult) {
-		super(UpdateUI.getString("JarVerificationDialog.Verification")); //$NON-NLS-1$
-		_fileName = verificationResult.getContentReference().getIdentifier();
-		_VerificationResult = verificationResult;
-		_strId = verificationResult.getFeature().getVersionedIdentifier().toString();
-		_strFeatureName = verificationResult.getFeature().getLabel();
-		_strProviderName = verificationResult.getFeature().getProvider();
-		componentVerified =	(verificationResult.isFeatureVerification()) ? ".Feature" : ".File"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected Control createContents(Composite compositeParent) {
-		WorkbenchHelp.setHelp(compositeParent, "org.eclipse.update.ui.JarVerificationPage"); //$NON-NLS-1$
-		// Composite: Client
-		//------------------
-		Composite compositeClient = new Composite(compositeParent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		compositeClient.setLayout(layout);
-		compositeClient.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Text Information
-		//------------------		
-		createTextArea(compositeClient);
-
-		// Certificate Area
-		//------------------
-		createCertificateArea(compositeClient);
-
-		// File and Feature Information
-		//-----------------------------		
-		createInformationArea(compositeClient);
-
-		// Choice Area
-		//------------		
-		//createChoiceArea(compositeClient);
-
-		Dialog.applyDialogFont(compositeParent);
-		return compositeClient;
-
-	}
-
-	/*
-	 * Creates the Information text
-	 */
-	private void createTextArea(Composite compositeClient) {
-
-		// Label: Information
-		//------------------
-		Label labelInformation =
-			new Label(compositeClient, SWT.WRAP);
-		labelInformation.setLayoutData(
-			new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL));
-
-		StringBuffer strb = new StringBuffer();
-		switch (_VerificationResult.getVerificationCode()) {
-
-			case IVerificationResult.TYPE_ENTRY_NOT_SIGNED :
-				String msg =
-					UpdateUI.getString(
-						"JarVerificationDialog.AboutToInstall"+ //$NON-NLS-1$
-						componentVerified);
-				setMessage(msg, WARNING);
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.NotDigitallySigned"+ //$NON-NLS-1$
-						componentVerified));
-				strb.append("\r\n"); //$NON-NLS-1$
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.CannotVerifyProvider"+ //$NON-NLS-1$
-						componentVerified));
-/*				strb.append("\r\n"); //$NON-NLS-1$
-				if (_VerificationResult.isFeatureVerification()) {
-					strb.append(
-						UpdateUI.getResourceString("JarVerificationDialog.InstallMayCorrupt"));//$NON-NLS-1$
-				} else {
-					strb.append(
-						UpdateUI.getResourceString("JarVerificationDialog.ContinueMayCorrupt"));//$NON-NLS-1$ 					
-				}
-				*/
-				labelInformation.setText(strb.toString());
-				break;
-
-			case IVerificationResult.TYPE_ENTRY_CORRUPTED :
-				msg =
-					UpdateUI.getString(
-						"JarVerificationDialog.CorruptedContent"+ //$NON-NLS-1$
-						componentVerified);
-				setMessage(msg, ERROR);
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.ComponentNotInstalled")); //$NON-NLS-1$
-				labelInformation.setText(strb.toString());
-				break;
-
-			case IVerificationResult.TYPE_ENTRY_SIGNED_UNRECOGNIZED :
-				msg =
-					UpdateUI.getString(
-						"JarVerificationDialog.SignedComponent"+ //$NON-NLS-1$
-						componentVerified);
-				setMessage(msg, WARNING);
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.UnknownCertificate"+ //$NON-NLS-1$
-						componentVerified));
-				strb.append("\r\n"); //$NON-NLS-1$
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.UnableToVerifyProvider"+ //$NON-NLS-1$
-						componentVerified));
-/*				strb.append("\r\n"); //$NON-NLS-1$
-				if (_VerificationResult.isFeatureVerification()) {
-					strb.append(
-						UpdateUI.getResourceString("JarVerificationDialog.InstallMayCorrupt")); //$NON-NLS-1$
-				} else {
-					strb.append(
-						UpdateUI.getResourceString("JarVerificationDialog.ContinueMayCorrupt"));//$NON-NLS-1$ 					
-				}
-				*/
-				labelInformation.setText(strb.toString());
-				break;
-
-			case IVerificationResult.TYPE_ENTRY_SIGNED_RECOGNIZED :
-				msg =
-					UpdateUI.getString(
-						"JarVerificationDialog.SignedComponent"+ //$NON-NLS-1$
-						componentVerified);
-				setMessage(msg, WARNING);
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.KnownCertificate"+ //$NON-NLS-1$
-						componentVerified));
-				strb.append("\r\n"); //$NON-NLS-1$
-				strb.append(
-					UpdateUI.getString(
-						"JarVerificationDialog.ProviderKnown"+ //$NON-NLS-1$
-						componentVerified));
-				strb.append("\r\n"); //$NON-NLS-1$
-
-				labelInformation.setText(strb.toString());
-
-//				createCautionArea(compositeClient);
-				break;
-		}
-	}
-	
-
-	/*
-	 * Presents File & Feature information
-	 */
-	private void createInformationArea(Composite compositeClient) {
-
-		// Composite: Information labels
-		//------------------------------
-		Composite compositeInformation = new Composite(compositeClient, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 0;
-		compositeInformation.setLayout(layout);
-		compositeInformation.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// Feature name
-		//---------------
-		Label keyLabel = null;
-		CLabel valueLabel = null;
-		if (_strFeatureName != null && _strFeatureName.length() > 0) {
-			keyLabel = new Label(compositeInformation, SWT.NULL);
-			keyLabel.setText(
-				UpdateUI.getString("JarVerificationDialog.FeatureName")); //$NON-NLS-1$
-
-			valueLabel = new CLabel(compositeInformation, SWT.NULL);
-			valueLabel.setFont(JFaceResources.getBannerFont());
-			valueLabel.setText(_strFeatureName);
-			valueLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		}
-		// Feature identifier
-		//---------------------
-		if (_strId != null && _strId.length() > 0) {
-			keyLabel = new Label(compositeInformation, SWT.NULL);
-			keyLabel.setText(
-				UpdateUI.getString("JarVerificationDialog.FeatureIdentifier")); //$NON-NLS-1$
-
-			valueLabel = new CLabel(compositeInformation, SWT.NULL);
-			valueLabel.setFont(JFaceResources.getBannerFont());
-			valueLabel.setText(_strId);
-			valueLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		}
-		// Provider name
-		//--------------
-		if (_strProviderName != null && _strProviderName.length() > 0) {
-			keyLabel = new Label(compositeInformation, SWT.NULL);
-			keyLabel.setText(
-				UpdateUI.getString("JarVerificationDialog.Provider")); //$NON-NLS-1$
-
-			valueLabel = new CLabel(compositeInformation, SWT.NULL);
-			valueLabel.setFont(JFaceResources.getBannerFont());
-			valueLabel.setText(_strProviderName);
-			valueLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		}
-		// Label: File name
-		//-----------------
-		keyLabel = new Label(compositeInformation, SWT.NULL);
-		keyLabel.setText(
-			UpdateUI.getString("JarVerificationDialog.FileName")); //$NON-NLS-1$
-
-		valueLabel = new CLabel(compositeInformation, SWT.NULL);
-		valueLabel.setFont(JFaceResources.getBannerFont());
-		valueLabel.setText(_fileName);
-		valueLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-
-	/*
-	 * Show certificate information
-	 */
-	private void createCertificateArea(Composite compositeClient) {
-
-		if (_VerificationResult.getVerificationCode()
-			== IVerificationResult.TYPE_ENTRY_SIGNED_UNRECOGNIZED
-			|| _VerificationResult.getVerificationCode()
-				== IVerificationResult.TYPE_ENTRY_SIGNED_RECOGNIZED) {
-			// Group box
-			//----------
-			Group group = new Group(compositeClient, SWT.SHADOW_ETCHED_IN);
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginWidth = layout.marginHeight = 0;
-			group.setLayout(layout);
-			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			group.setText(UpdateUI.getString("JarVerificationDialog.CertificateInfo")); //$NON-NLS-1$
-
-			// Signer
-			//-------------------
-			Label keyLabel = null;
-			Text valueText = null;
-			//data = new GridData(GridData.FILL_HORIZONTAL);
-			//data.horizontalIndent = 0;
-			//textInformation.setLayoutData(data);			
-			if (_VerificationResult.getSignerInfo() != null) {
-				keyLabel = new Label(group, SWT.NULL);
-				keyLabel.setText(UpdateUI.getString("JarVerificationDialog.SubjectCA")); //$NON-NLS-1$
-				keyLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-				valueText = new Text(group, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
-				valueText.setText(_VerificationResult.getSignerInfo());
-				valueText.setEditable(false);
-				valueText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			}
-			
-			// Authenticator
-			//---------------------
-			if (_VerificationResult.getVerifierInfo() != null) {
-				keyLabel = new Label(group, SWT.NULL);
-				keyLabel.setText(UpdateUI.getString("JarVerificationDialog.RootCA")); //$NON-NLS-1$
-				keyLabel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));				
-
-				valueText = new Text(group, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
-				valueText.setText(_VerificationResult.getVerifierInfo());
-				valueText.setEditable(false);
-				valueText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			}
-		}
-	}
-
-	/*
-	 * Sets the Dialog
-	 */
-	public void setTitleAreaDialog(TitleAreaDialog dialog) {
-		_Dialog = dialog;
-	}
-
-	/*
-	 * 
-	 */
-	public void setMessage(String newMessage, int newType) {
-		super.setMessage(newMessage, newType);
-		if (_Dialog != null) {
-			_Dialog.setMessage(newMessage, newType);
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationService.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationService.java
deleted file mode 100644
index f88fdf0..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/JarVerificationService.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.internal.ui.security;
-
-import java.util.*;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.ui.*;
-/**
- *
- */
-public class JarVerificationService implements IVerificationListener {
-
-	/*
-	 * The JarVerifier is a instance variable
-	 * bacause we want to reuse it upon multiple calls
-	 */
-
-	/*
-	 * the Shell
-	 */
-	private Shell shell;
-	
-	/**
-	 * Processed ContentRefernces.  They will be skipped if prompted
-	 * to verify the same reference again.
-	 */
-	private Map processed=new HashMap();
-
-	/*
-	 * If no shell, create a new shell 
-	 */
-	public JarVerificationService() {
-		this(null);
-	}
-	
-	/*
-	 * 
-	 */
-	public JarVerificationService(Shell aShell) {
-		shell = aShell;
-
-		// find the default display and get the active shell
-		if (shell == null) {
-			final Display disp = Display.getDefault();
-			if (disp == null) {
-				shell = new Shell(new Display());
-			} else {
-				disp.syncExec(new Runnable() {
-					public void run() {
-						shell = disp.getActiveShell();
-					}
-				});
-			}
-		}
-	}
-
-	/*
-	 * 
-	 */
-	private int openWizard(IVerificationResult result) {
-		int code;
-		IDialogPage page = new JarVerificationPage(result);
-		JarVerificationDialog dialog =
-				new JarVerificationDialog(shell,page,result);
-		dialog.create();
-		dialog.getShell().setSize(600, 500);
-		dialog.getShell().setText(UpdateUI.getString("JarVerificationDialog.wtitle")); //$NON-NLS-1$
-		dialog.open();
-		if (dialog.getReturnCode() == JarVerificationDialog.OK)
-			code = CHOICE_INSTALL_TRUST_ALWAYS;
-		else
-			code = CHOICE_ABORT;
-
-		return code;
-
-	}
-
-	/*
-	 * 
-	 */
-	public int prompt(final IVerificationResult verificationResult){
-		if (!UpdateCore.getPlugin().getPluginPreferences().getBoolean(UpdateCore.P_CHECK_SIGNATURE)) 
-			return CHOICE_INSTALL_TRUST_ALWAYS;
-
-		if (verificationResult.alreadySeen()) return CHOICE_INSTALL_TRUST_ALWAYS;
-		
-		if(see(verificationResult)) return CHOICE_INSTALL_TRUST_ALWAYS;
-
-		switch (verificationResult.getVerificationCode()) {
-			case IVerificationResult.UNKNOWN_ERROR :
-					return CHOICE_ERROR;
-
-			case IVerificationResult.VERIFICATION_CANCELLED:
-					return CHOICE_ABORT;
-
-			// cannot verify it: do not prompt user.
-			case IVerificationResult.TYPE_ENTRY_UNRECOGNIZED: 
-				return CHOICE_INSTALL_TRUST_ALWAYS;				
-			
-			default :
-				{
-					final int[] wizardResult = new int[1];					
-					shell.getDisplay().syncExec(new Runnable() {
-						public void run() {
-							wizardResult[0] = openWizard(verificationResult);
-						}
-					});
-					return wizardResult[0];
-				}
-		}
-	}
-
-	/**
-	 * Checks whether feature archive has been seen already.
-	 * Remembers the fact that archive is being seen now.
-	 * @param verificationResult
-	 * @return true if the archive has been seen before, false if first time
-	 */
-	private boolean see(final IVerificationResult verificationResult) {
-		String key = verificationResult.getFeature().getVersionedIdentifier().toString()
-			+"/"+verificationResult.getContentReference().getIdentifier(); //$NON-NLS-1$
-		Long value = new Long(verificationResult.getContentReference().getLastModified());
-		Long cachedValue = (Long)processed.get(key);
-		if(value.equals(cachedValue)){
-			return true;
-		}else{
-			processed.put(key, value);
-			return false;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.java
deleted file mode 100644
index 8b8e5ce..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.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.internal.ui.security;
-
-import java.net.*;
-
-/**
- * Update Manager Authenticator Sadly there can only be one registered per VM
- */
-public class UpdateManagerAuthenticator extends Authenticator {
-	private Authentication savedPasswordAuthentication;
-
-	/*
-	 * @see Authenticator#getPasswordAuthentication()
-	 */
-	protected PasswordAuthentication getPasswordAuthentication() {
-		// String protocol = getRequestingProtocol();
-		String host = getRequestingHost(); // can be null;
-		InetAddress address = getRequestingSite(); // can be null;
-		// int port = getRequestingPort();
-		String prompt = getRequestingPrompt(); // realm or message, not documented that can be null
-		// String scheme = getRequestingScheme(); // not documented that can be null
-
-		String hostString = host;
-		if (hostString == null && address != null) {
-			address.getHostName();
-		}
-		if (hostString == null) {
-			hostString = ""; //$NON-NLS-1$
-		}
-		String promptString = prompt;
-		if (prompt == null) {
-			promptString = ""; //$NON-NLS-1$
-		}
-
-		Authentication auth = UserValidationDialog.getAuthentication(
-				hostString, promptString);
-		if (auth != null)
-			return new PasswordAuthentication(auth.getUser(), auth
-					.getPassword().toCharArray());
-		else
-			return null;
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UserValidationDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UserValidationDialog.java
deleted file mode 100644
index 5255c4a..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UserValidationDialog.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.security;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.help.*;
-import org.eclipse.update.internal.ui.*;
-
-/**
- * User authentication dialog
- */
-public class UserValidationDialog extends Dialog {
-	protected Text usernameField;
-	protected Text passwordField;
-
-	protected String host;
-	protected String message;
-	protected Authentication userAuthentication = null;
-	/**
-	 * Gets user and password from a user. May be called from any thread
-	 * 
-	 * @return UserAuthentication that contains the userid and the password or
-	 *         <code>null</code> if the dialog has been cancelled
-	 */
-	public static Authentication getAuthentication(final String host,
-			final String message) {
-		class UIOperation implements Runnable {
-			public Authentication authentication;
-			public void run() {
-				authentication = UserValidationDialog.askForAuthentication(
-						host, message);
-			}
-		}
-
-		UIOperation uio = new UIOperation();
-		if (Display.getCurrent() != null) {
-			uio.run();
-		} else {
-			Display.getDefault().syncExec(uio);
-		}
-		return uio.authentication;
-	}
-	/**
-	 * Gets user and password from a user Must be called from UI thread
-	 * 
-	 * @return UserAuthentication that contains the userid and the password or
-	 *         <code>null</code> if the dialog has been cancelled
-	 */
-	protected static Authentication askForAuthentication(String host,
-			String message) {
-		UserValidationDialog ui = new UserValidationDialog(null, host, message); //$NON-NLS-1$
-		ui.open();
-		return ui.getAuthentication();
-	}
-	/**
-	 * Creates a new UserValidationDialog.
-	 * 
-	 * @param parentShell
-	 *            parent Shell or null
-	 */
-	protected UserValidationDialog(Shell parentShell, String host,
-			String message) {
-		super(parentShell);
-		this.host = host;
-		this.message = message;
-		setBlockOnOpen(true);
-	}
-	/**
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(UpdateUI
-				.getString("UserVerificationDialog.PasswordRequired")); //$NON-NLS-1$
-	}
-	/**
-	 */
-	public void create() {
-		super.create();
-		//give focus to username field
-		usernameField.selectAll();
-		usernameField.setFocus();
-	}
-	/**
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite main = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		main.setLayout(layout);
-		main.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label label = new Label(main, SWT.WRAP);
-		String text = UpdateUI.getString("UserVerificationDialog.ConnectTo") + host; //$NON-NLS-1$
-		text += "\n\n" + message; //$NON-NLS-1$ //$NON-NLS-2$
-		label.setText(text);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		label.setLayoutData(data);
-
-		createUsernameFields(main);
-		createPasswordFields(main);
-		WorkbenchHelp.setHelp(main,
-				"org.eclipse.update.ui.UserValidationDialog"); //$NON-NLS-1$
-		return main;
-	}
-	/**
-	 * Creates the three widgets that represent the user name entry area.
-	 */
-	protected void createPasswordFields(Composite parent) {
-		new Label(parent, SWT.NONE).setText(UpdateUI
-				.getString("UserVerificationDialog.Password")); //$NON-NLS-1$
-
-		passwordField = new Text(parent, SWT.BORDER | SWT.PASSWORD);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
-		passwordField.setLayoutData(data);
-
-		new Label(parent, SWT.NONE); //spacer
-	}
-	/**
-	 * Creates the three widgets that represent the user name entry area.
-	 */
-	protected void createUsernameFields(Composite parent) {
-		new Label(parent, SWT.NONE).setText(UpdateUI
-				.getString("UserVerificationDialog.UserName")); //$NON-NLS-1$
-
-		usernameField = new Text(parent, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.ENTRY_FIELD_WIDTH);
-		usernameField.setLayoutData(data);
-
-		new Label(parent, SWT.NONE); //spacer
-	}
-	/**
-	 * Returns the UserAuthentication entered by the user, or null if the user
-	 * canceled.
-	 */
-	public Authentication getAuthentication() {
-		return userAuthentication;
-	}
-	/**
-	 * Notifies that the ok button of this dialog has been pressed.
-	 */
-	protected void okPressed() {
-		userAuthentication = new Authentication(usernameField.getText(),
-				passwordField.getText());
-		super.okPressed();
-	}
-
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationPreview.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationPreview.java
deleted file mode 100644
index c592085..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationPreview.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.views;
-import java.net.URL;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.update.configuration.ILocalSite;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.operations.*;
-
-public class ConfigurationPreview implements IUpdateModelChangedListener {
-	private ScrolledForm form;
-	private ConfigurationView view;
-	private FormToolkit toolkit;
-	private FormText desc;
-	private FormText taskList;
-	private IPreviewTask[] tasks;
-	
-	public ConfigurationPreview(ConfigurationView view) {
-		this.view = view;
-		UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-		model.addUpdateModelChangedListener(this);
-	}
-	public void dispose() {
-		UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-		model.removeUpdateModelChangedListener(this);
-		toolkit.dispose();
-	}
-
-	public void objectsAdded(Object parent, Object[] children) {
-	}
-	public void objectsRemoved(Object parent, Object[] children) {
-	}
-	public void objectChanged(Object object, String property) {
-	}
-
-	public Control getControl() {
-		return form;
-	}
-
-	public void createControl(Composite parent) {
-		toolkit = new FormToolkit(parent.getDisplay());
-		form = toolkit.createScrolledForm(parent);
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-		layout.leftMargin = 10;
-		layout.rightMargin = 5;
-		layout.topMargin = 10;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 20;
-		IHyperlinkListener urlAction = new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				String url = (String) e.getHref();
-				if (url != null)
-					UpdateUI.showURL(url);
-			}
-		};
-		IHyperlinkListener taskAction = new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				String indexArg = (String) e.getHref();
-				try {
-					int index = Integer.parseInt(indexArg);
-					if (tasks != null)
-						tasks[index].run();
-				} catch (NumberFormatException ex) {
-				}
-			}
-		};
-		//taskAction.setStatusLineManager(view.getConfigurationWindow().getStatusLineManager());
-		desc = toolkit.createFormText(form.getBody(), true);
-		desc.setHyperlinkSettings(toolkit.getHyperlinkGroup());
-		desc.addHyperlinkListener(urlAction);
-		desc.setText("", false, false); //$NON-NLS-1$
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		desc.setLayoutData(td);
-		taskList = toolkit.createFormText(form.getBody(), true);
-		taskList.setHyperlinkSettings(toolkit.getHyperlinkGroup());
-		taskList.addHyperlinkListener(taskAction); //$NON-NLS-1$
-		taskList.setText("", false, false); //$NON-NLS-1$
-		//factory.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ROLLOVER);
-		td = new TableWrapData(TableWrapData.FILL_GRAB);
-		taskList.setLayoutData(td);
-		WorkbenchHelp.setHelp(parent, "org.eclipse.update.ui.SiteForm"); //$NON-NLS-1$
-	}
-	public void setSelection(IStructuredSelection selection) {
-		Object object = selection.getFirstElement();
-		tasks = view.getPreviewTasks(object);
-		String title = getObjectLabel(object);
-		form.setText(title);
-		String description = getObjectDescription(object);
-		boolean tags = description.startsWith("<form>"); //$NON-NLS-1$
-		desc.setText(description, tags, !tags);
-		String taskText = getTasksText();
-		taskList.setText(taskText, true, false);
-		form.reflow(true);
-	}
-	private String getObjectLabel(Object object) {
-		if (object == null)
-			return ""; //$NON-NLS-1$
-		TreeViewer viewer = view.getTreeViewer();
-		LabelProvider provider = (LabelProvider) viewer.getLabelProvider();
-		return provider.getText(object);
-	}
-	private String getObjectDescription(Object object) {
-		if (object instanceof IFeatureAdapter) {
-			return getFeatureDescription((IFeatureAdapter) object);
-		}
-		if (object instanceof IConfiguredSiteAdapter) {
-			return UpdateUI.getString("ConfigurationPreviewForm.install"); //$NON-NLS-1$
-		}
-		if (object instanceof ILocalSite) {
-			return UpdateUI
-					.getString("ConfigurationPreviewForm.configDescription"); //$NON-NLS-1$
-		}
-		return ""; //$NON-NLS-1$
-	}
-	private String getFeatureDescription(IFeatureAdapter adapter) {
-		try {
-			IFeature feature = adapter.getFeature(null);
-			IURLEntry entry = feature.getDescription();
-			if (entry != null) {
-				String text = entry.getAnnotation();
-				if (text != null) {
-					URL url = entry.getURL();
-					if (url == null)
-						return text;
-					else {
-						String link = " <a href=\"urlHandler\" arg=\"" + url //$NON-NLS-1$
-								+ "\">More info...</a>"; //$NON-NLS-1$ //$NON-NLS-2$
-						String fullText = "<form><p>" + text + link //$NON-NLS-1$
-								+ "</p></form>"; //$NON-NLS-1$ //$NON-NLS-2$
-						return fullText;
-					}
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return ""; //$NON-NLS-1$
-	}
-	private String getTasksText() {
-		if (tasks == null || tasks.length == 0)
-			return "<form/>"; //$NON-NLS-1$
-		boolean hasEnabledTasks = false;
-		for (int i = 0; i < tasks.length; i++) {
-			if (tasks[i].isEnabled()) {
-				hasEnabledTasks = true;
-				break;
-			}
-		}
-		if (!hasEnabledTasks)
-			return "<form/>"; //$NON-NLS-1$
-		StringBuffer buf = new StringBuffer();
-		buf.append("<form><p><b>Available Tasks</b></p>"); //$NON-NLS-1$
-		for (int i = 0; i < tasks.length; i++) {
-			IPreviewTask task = tasks[i];
-			if (task.isEnabled() == false)
-				continue;
-			buf.append("<li style=\"text\" indent=\"0\"><a href=\"" + i + "\">" //$NON-NLS-1$ //$NON-NLS-2$
-					+ task.getName() + "</a></li>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			buf.append("<li style=\"text\" indent=\"10\" vspace=\"false\">" //$NON-NLS-1$
-					+ task.getDescription() + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		buf.append("</form>"); //$NON-NLS-1$
-		return buf.toString();
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java
deleted file mode 100644
index 9061359..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java
+++ /dev/null

@@ -1,1107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.views;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.branding.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.help.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Insert the type's description here.
- * @see ViewPart
- */
-public class ConfigurationView
-	implements
-		IInstallConfigurationChangedListener,
-		IConfiguredSiteChangedListener,
-		ILocalSiteChangedListener {
-	private TreeViewer treeViewer;
-	private DrillDownAdapter drillDownAdapter;
-	private Action collapseAllAction;
-	private static final String STATE_SHOW_UNCONF = "ConfigurationView.showUnconf"; //$NON-NLS-1$
-	private static final String STATE_SHOW_SITES = "ConfigurationView.showSites"; //$NON-NLS-1$
-	private static final String STATE_SHOW_NESTED_FEATURES =
-		"ConfigurationView.showNestedFeatures"; //$NON-NLS-1$
-
-	private Action showSitesAction;
-	private Action showNestedFeaturesAction;
-	private ReplaceVersionAction swapVersionAction;
-	private FeatureStateAction featureStateAction;
-	private UninstallFeatureAction uninstallFeatureAction;
-	private InstallOptionalFeatureAction installOptFeatureAction;
-	private Action showUnconfFeaturesAction;
-	private RevertConfigurationAction revertAction;
-	private ShowActivitiesAction showActivitiesAction;
-	private Action propertiesAction;
-	private SiteStateAction siteStateAction;
-	private Action installationHistoryAction;
-	private Action newExtensionLocationAction;
-	private FindUpdatesAction findUpdatesAction;
-	private SashForm splitter;
-	private ConfigurationPreview preview;
-	private Hashtable previewTasks;
-
-	private IUpdateModelChangedListener modelListener;
-	private boolean refreshLock = false;
-	private Image eclipseImage;
-	private boolean initialized;
-	private ConfigurationManagerWindow configurationWindow;
-
-	class ConfigurationSorter extends ViewerSorter {
-		public int category(Object obj) {
-			// sites
-			if (obj instanceof IConfiguredSiteAdapter) {
-				IConfiguredSite csite =
-					((IConfiguredSiteAdapter) obj).getConfiguredSite();
-				if (csite.isProductSite())
-					return 1;
-				if (csite.isExtensionSite())
-					return 2;
-				return 3;
-			}
-			return super.category(obj);
-		}
-	}
-
-	class LocalSiteProvider
-		extends DefaultContentProvider
-		implements ITreeContentProvider {
-		public void inputChanged(
-			Viewer viewer,
-			Object oldInput,
-			Object newInput) {
-			if (newInput == null)
-				return;
-		}
-
-		/**
-		 * @see ITreeContentProvider#getChildren(Object)
-		 */
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof UpdateModel) {
-				ILocalSite localSite = getLocalSite();
-				return (localSite != null) ? new Object[] { localSite }
-				: new Object[0];
-			}
-
-			if (parent instanceof ILocalSite) {
-				Object[] csites = openLocalSite();
-				if (showSitesAction.isChecked())
-					return csites;
-				ArrayList result = new ArrayList();
-				boolean showUnconf = showUnconfFeaturesAction.isChecked();
-				for (int i = 0; i < csites.length; i++) {
-					IConfiguredSiteAdapter adapter =
-						(IConfiguredSiteAdapter) csites[i];
-					Object[] roots = getFeatures(adapter, !showUnconf);
-					for (int j = 0; j < roots.length; j++) {
-						result.add(roots[j]);
-					}
-				}
-				return result.toArray();
-			}
-
-			if (parent instanceof IConfiguredSiteAdapter) {
-				return getFeatures(
-					(IConfiguredSiteAdapter) parent,
-					!showUnconfFeaturesAction.isChecked());
-			}
-			if (parent instanceof ConfiguredFeatureAdapter
-				&& showNestedFeaturesAction.isChecked()) {
-				IFeatureAdapter[] nested =
-					((ConfiguredFeatureAdapter) parent).getIncludedFeatures(
-						null);
-				if (showUnconfFeaturesAction.isChecked())
-					return nested;
-				ArrayList result = new ArrayList();
-				for (int i = 0; i < nested.length; i++) {
-					if (((ConfiguredFeatureAdapter) nested[i]).isConfigured())
-						result.add(nested[i]);
-				}
-				return (IFeatureAdapter[]) result.toArray(
-					new IFeatureAdapter[result.size()]);
-			}
-			return new Object[0];
-		}
-
-		public Object getParent(Object child) {
-			return null;
-		}
-		public boolean hasChildren(Object parent) {
-			if (parent instanceof ConfiguredFeatureAdapter) {
-				if (!showNestedFeaturesAction.isChecked())
-					return false;
-				IFeatureAdapter[] features =
-					((ConfiguredFeatureAdapter) parent).getIncludedFeatures(
-						null);
-
-				if (showUnconfFeaturesAction.isChecked())
-					return features.length > 0;
-
-				for (int i = 0; i < features.length; i++) {
-					if (((ConfiguredFeatureAdapter) features[i])
-						.isConfigured())
-						return true;
-				}
-				return false;
-			}
-			if (parent instanceof ConfiguredSiteAdapter) {
-				IConfiguredSite site =
-					((ConfiguredSiteAdapter) parent).getConfiguredSite();
-				if (site.isEnabled()) {
-					if (!showUnconfFeaturesAction.isChecked())
-						return site.getConfiguredFeatures().length > 0;
-					return site.getFeatureReferences().length > 0;
-				}
-				return (showUnconfFeaturesAction.isChecked());
-			}
-			return true;
-		}
-
-		public Object[] getElements(Object input) {
-			return getChildren(input);
-		}
-	}
-
-	class LocalSiteLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			if (obj instanceof ILocalSite) {
-				IProduct product = Platform.getProduct();
-				if (product != null)
-					return product.getName();
-				return UpdateUI.getString("ConfigurationView.current"); //$NON-NLS-1$
-			}
-
-			if (obj instanceof IConfiguredSiteAdapter) {
-				IConfiguredSite csite =
-					((IConfiguredSiteAdapter) obj).getConfiguredSite();
-				ISite site = csite.getSite();
-				return site.getURL().toString();
-			}
-			if (obj instanceof IFeatureAdapter) {
-				try {
-					IFeature feature = ((IFeatureAdapter) obj).getFeature(null);
-					if (feature instanceof MissingFeature) {
-						return UpdateUI.getFormattedMessage(
-							"ConfigurationView.missingFeature", //$NON-NLS-1$
-							feature.getLabel());
-					}
-					String version =
-						feature
-							.getVersionedIdentifier()
-							.getVersion()
-							.toString();
-					String pending = ""; //$NON-NLS-1$
-					if (OperationsManager.findPendingOperation(feature)
-						!= null)
-						pending = UpdateUI.getString("ConfigurationView.pending"); //$NON-NLS-1$
-					return feature.getLabel() + " " + version + pending; //$NON-NLS-1$
-				} catch (CoreException e) {
-					return UpdateUI.getString("ConfigurationView.error"); //$NON-NLS-1$
-				}
-			}
-			return super.getText(obj);
-		}
-
-		public Image getImage(Object obj) {
-			UpdateLabelProvider provider =
-				UpdateUI.getDefault().getLabelProvider();
-			if (obj instanceof ILocalSite)
-				return eclipseImage;
-
-			if (obj instanceof ConfiguredFeatureAdapter)
-				return getFeatureImage(
-					provider,
-					(ConfiguredFeatureAdapter) obj);
-
-			if (obj instanceof IConfiguredSiteAdapter) {
-				IConfiguredSite csite =
-					((IConfiguredSiteAdapter) obj).getConfiguredSite();
-				int flags =
-					csite.isUpdatable() ? 0 : UpdateLabelProvider.F_LINKED;
-				if (!csite.isEnabled())
-					flags |= UpdateLabelProvider.F_UNCONFIGURED;
-				return provider.get(
-					provider.getLocalSiteDescriptor(csite),
-					flags);
-			}
-			return null;
-		}
-
-		private Image getFeatureImage(
-			UpdateLabelProvider provider,
-			ConfiguredFeatureAdapter adapter) {
-			try {
-				IFeature feature = adapter.getFeature(null);
-				if (feature instanceof MissingFeature) {
-					if (((MissingFeature) feature).isOptional())
-						return provider.get(
-							UpdateUIImages.DESC_NOTINST_FEATURE_OBJ);
-					return provider.get(
-						UpdateUIImages.DESC_FEATURE_OBJ,
-						UpdateLabelProvider.F_ERROR);
-				}
-
-				boolean efix = feature.isPatch();
-				ImageDescriptor baseDesc =
-					efix
-						? UpdateUIImages.DESC_EFIX_OBJ
-						: (adapter.isConfigured()
-							? UpdateUIImages.DESC_FEATURE_OBJ
-							: UpdateUIImages.DESC_UNCONF_FEATURE_OBJ);
-
-				int flags = 0;
-				if (efix && !adapter.isConfigured())
-					flags |= UpdateLabelProvider.F_UNCONFIGURED;
-				if (OperationsManager.findPendingOperation(feature) == null) {
-					ILocalSite localSite = getLocalSite();
-					if (localSite != null) {
-						int code =
-							getStatusCode(
-								feature,
-								localSite.getFeatureStatus(feature));
-						switch (code) {
-							case IFeature.STATUS_UNHAPPY :
-								flags |= UpdateLabelProvider.F_ERROR;
-								break;
-							case IFeature.STATUS_AMBIGUOUS :
-								flags |= UpdateLabelProvider.F_WARNING;
-								break;
-							default :
-								if (adapter.isConfigured()
-									&& adapter.isUpdated())
-									flags |= UpdateLabelProvider.F_UPDATED;
-								break;
-						}
-					}
-				}
-				return provider.get(baseDesc, flags);
-			} catch (CoreException e) {
-				return provider.get(
-					UpdateUIImages.DESC_FEATURE_OBJ,
-					UpdateLabelProvider.F_ERROR);
-			}
-		}
-	}
-
-	class PreviewTask implements IPreviewTask {
-		private String name;
-		private String desc;
-		private IAction action;
-		public PreviewTask(String name, String desc, IAction action) {
-			this.name = name;
-			this.desc = desc;
-			this.action = action;
-		}
-
-		public String getName() {
-			if (name != null)
-				return name;
-			return action.getText();
-		}
-		public String getDescription() {
-			return desc;
-		}
-		public void run() {
-			action.run();
-		}
-		public boolean isEnabled() {
-			return action.isEnabled();
-		}
-	}
-
-	public ConfigurationView(ConfigurationManagerWindow window) {
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-		initializeImages();
-		configurationWindow=window;
-	}
-
-	private void initializeImages() {
-		ImageDescriptor edesc = UpdateUIImages.DESC_APP_OBJ;
-		IProduct product = Platform.getProduct();
-		if (product != null) {
-			String windowImageURL = product.getProperty(IProductConstants.WINDOW_IMAGE);
-			if (windowImageURL == null) {
-				String windowImagesUrls = product.getProperty(IProductConstants.WINDOW_IMAGES);
-				if (windowImagesUrls != null ) {
-					StringTokenizer st = new StringTokenizer(windowImagesUrls, ","); //$NON-NLS-1$
-					if (st.hasMoreTokens())
-						windowImageURL = st.nextToken();
-				}
-			}
-			if (windowImageURL != null)
-				try {
-					edesc = ImageDescriptor.createFromURL(new URL(windowImageURL));
-				} catch (MalformedURLException e) {
-					UpdateUI.logException(e, false);
-				}
-		}
-		eclipseImage = UpdateUI.getDefault().getLabelProvider().get(edesc);
-	}
-
-	public void initProviders() {
-		treeViewer.setContentProvider(new LocalSiteProvider());
-		treeViewer.setLabelProvider(new LocalSiteLabelProvider());
-		treeViewer.setInput(UpdateUI.getDefault().getUpdateModel());
-		treeViewer.setSorter(new ConfigurationSorter());
-		ILocalSite localSite = getLocalSite();
-		if (localSite != null)
-			localSite.addLocalSiteChangedListener(this);
-
-		modelListener = new IUpdateModelChangedListener() {
-			public void objectsAdded(Object parent, Object[] children) {
-			}
-			public void objectsRemoved(Object parent, Object[] children) {
-			}
-			public void objectChanged(final Object obj, String property) {
-				if (refreshLock)
-					return;
-				Control control = getControl();
-				if (!control.isDisposed()) {
-					control.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							treeViewer.refresh();
-							handleSelectionChanged(
-								(IStructuredSelection) treeViewer
-									.getSelection());
-						}
-					});
-				}
-			}
-		};
-		OperationsManager.addUpdateModelChangedListener(modelListener);
-		WorkbenchHelp.setHelp(
-			getControl(),
-			"org.eclipse.update.ui.ConfigurationView"); //$NON-NLS-1$
-	}
-
-	private ILocalSite getLocalSite() {
-		try {
-			return SiteManager.getLocalSite();
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-			return null;
-		}
-	}
-
-	private Object[] openLocalSite() {
-		final Object[][] bag = new Object[1][];
-		BusyIndicator.showWhile(getControl().getDisplay(), new Runnable() {
-			public void run() {
-				ILocalSite localSite = getLocalSite();
-				if (localSite == null)
-					return;
-				IInstallConfiguration config =
-					getLocalSite().getCurrentConfiguration();
-				IConfiguredSite[] sites = config.getConfiguredSites();
-				Object[] result = new Object[sites.length];
-				for (int i = 0; i < sites.length; i++) {
-					result[i] = new ConfiguredSiteAdapter(config, sites[i]);
-				}
-				if (!initialized) {
-					config.addInstallConfigurationChangedListener(
-						ConfigurationView.this);
-					initialized = true;
-				}
-				bag[0] = result;
-			}
-		});
-		return bag[0];
-	}
-
-	public void dispose() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		if (initialized) {
-			ILocalSite localSite = getLocalSite();
-			if (localSite != null) {
-				localSite.removeLocalSiteChangedListener(this);
-				IInstallConfiguration config =
-					localSite.getCurrentConfiguration();
-				config.removeInstallConfigurationChangedListener(this);
-			}
-			initialized = false;
-		}
-		OperationsManager.removeUpdateModelChangedListener(modelListener);
-		if (preview != null)
-			preview.dispose();
-		//super.dispose();
-	}
-
-	protected void makeActions() {
-		collapseAllAction = new Action() {
-			public void run() {
-				treeViewer.getControl().setRedraw(false);
-				treeViewer.collapseToLevel(
-					treeViewer.getInput(),
-					TreeViewer.ALL_LEVELS);
-				treeViewer.getControl().setRedraw(true);
-			}
-		};
-		collapseAllAction.setText(UpdateUI.getString("ConfigurationView.collapseLabel")); //$NON-NLS-1$
-		collapseAllAction.setToolTipText(UpdateUI.getString("ConfigurationView.collapseTooltip")); //$NON-NLS-1$
-		collapseAllAction.setImageDescriptor(UpdateUIImages.DESC_COLLAPSE_ALL);
-
-		drillDownAdapter = new DrillDownAdapter(treeViewer);
-
-		featureStateAction = new FeatureStateAction();
-
-		siteStateAction = new SiteStateAction();
-
-		revertAction = new RevertConfigurationAction(UpdateUI.getString("ConfigurationView.revertLabel")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(
-			revertAction,
-			"org.eclipse.update.ui.CofigurationView_revertAction"); //$NON-NLS-1$
-
-		installationHistoryAction =
-			new InstallationHistoryAction(
-				UpdateUI.getString("ConfigurationView.installHistory"), //$NON-NLS-1$
-				UpdateUIImages.DESC_HISTORY_OBJ);
-		installationHistoryAction.setToolTipText(installationHistoryAction.getText());
-		
-		newExtensionLocationAction =
-			new NewExtensionLocationAction(
-				UpdateUI.getString("ConfigurationView.extLocation"), //$NON-NLS-1$
-				UpdateUIImages.DESC_ESITE_OBJ);
-		
-		propertiesAction =
-			new PropertyDialogAction(
-				UpdateUI.getActiveWorkbenchShell(),
-				treeViewer);
-		WorkbenchHelp.setHelp(
-			propertiesAction,
-			"org.eclipse.update.ui.CofigurationView_propertiesAction"); //$NON-NLS-1$
-
-		uninstallFeatureAction = new UninstallFeatureAction(UpdateUI.getString("ConfigurationView.uninstall")); //$NON-NLS-1$
-
-		installOptFeatureAction =
-			new InstallOptionalFeatureAction(
-				getControl().getShell(),
-				UpdateUI.getString("ConfigurationView.install")); //$NON-NLS-1$
-
-		swapVersionAction = new ReplaceVersionAction(UpdateUI.getString("ConfigurationView.anotherVersion")); //$NON-NLS-1$
-
-		findUpdatesAction =
-			new FindUpdatesAction(getControl().getShell(), UpdateUI.getString("ConfigurationView.findUpdates")); //$NON-NLS-1$
-
-		showActivitiesAction = new ShowActivitiesAction(getControl().getShell(), UpdateUI.getString("ConfigurationView.showActivitiesLabel")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(
-			showActivitiesAction,
-			"org.eclipse.update.ui.CofigurationView_showActivitiesAction"); //$NON-NLS-1$
-
-		makeShowUnconfiguredFeaturesAction();
-		makeShowSitesAction();
-		makeShowNestedFeaturesAction();
-		makePreviewTasks();
-		configurationWindow.setPropertiesActionHandler(propertiesAction);
-	}
-
-	private void makeShowNestedFeaturesAction() {
-		final Preferences pref = UpdateUI.getDefault().getPluginPreferences();
-		pref.setDefault(STATE_SHOW_NESTED_FEATURES, true);
-		showNestedFeaturesAction = new Action() {
-			public void run() {
-				treeViewer.refresh();
-				pref.setValue(
-					STATE_SHOW_NESTED_FEATURES,
-					showNestedFeaturesAction.isChecked());
-			}
-		};
-		showNestedFeaturesAction.setText(UpdateUI.getString("ConfigurationView.showNestedFeatures")); //$NON-NLS-1$
-		showNestedFeaturesAction.setImageDescriptor(
-			UpdateUIImages.DESC_SHOW_HIERARCHY);
-		showNestedFeaturesAction.setDisabledImageDescriptor(
-			UpdateUIImages.DESC_SHOW_HIERARCHY_D);
-
-		showNestedFeaturesAction.setChecked(
-			pref.getBoolean(STATE_SHOW_NESTED_FEATURES));
-		showNestedFeaturesAction.setToolTipText(UpdateUI.getString("ConfigurationView.showNestedTooltip")); //$NON-NLS-1$
-	}
-
-	private void makeShowSitesAction() {
-		final Preferences pref = UpdateUI.getDefault().getPluginPreferences();
-		pref.setDefault(STATE_SHOW_SITES, true);
-		showSitesAction = new Action() {
-			public void run() {
-				treeViewer.refresh();
-				pref.setValue(STATE_SHOW_SITES, showSitesAction.isChecked());
-				UpdateUI.getDefault().savePluginPreferences();
-			}
-		};
-		showSitesAction.setText(UpdateUI.getString("ConfigurationView.showInstall")); //$NON-NLS-1$
-		showSitesAction.setImageDescriptor(UpdateUIImages.DESC_LSITE_OBJ);
-		showSitesAction.setChecked(pref.getBoolean(STATE_SHOW_SITES));
-		showSitesAction.setToolTipText(UpdateUI.getString("ConfigurationView.showInstallTooltip")); //$NON-NLS-1$
-	}
-
-	private void makeShowUnconfiguredFeaturesAction() {
-		final Preferences pref = UpdateUI.getDefault().getPluginPreferences();
-		pref.setDefault(STATE_SHOW_UNCONF, false);
-		showUnconfFeaturesAction = new Action() {
-			public void run() {
-				pref.setValue(
-					STATE_SHOW_UNCONF,
-					showUnconfFeaturesAction.isChecked());
-				UpdateUI.getDefault().savePluginPreferences();
-				treeViewer.refresh();
-			}
-		};
-		WorkbenchHelp.setHelp(
-			showUnconfFeaturesAction,
-			"org.eclipse.update.ui.CofigurationView_showUnconfFeaturesAction"); //$NON-NLS-1$
-		showUnconfFeaturesAction.setText(UpdateUI.getString("ConfigurationView.showDisabled")); //$NON-NLS-1$
-		showUnconfFeaturesAction.setImageDescriptor(
-			UpdateUIImages.DESC_UNCONF_FEATURE_OBJ);
-		showUnconfFeaturesAction.setChecked(pref.getBoolean(STATE_SHOW_UNCONF));
-		showUnconfFeaturesAction.setToolTipText(UpdateUI.getString("ConfigurationView.showDisabledTooltip")); //$NON-NLS-1$
-	}
-
-	protected void fillActionBars(ToolBarManager tbm) {
-		tbm.add(showSitesAction);
-		tbm.add(showNestedFeaturesAction);
-		tbm.add(showUnconfFeaturesAction);
-		tbm.add(new Separator());
-		drillDownAdapter.addNavigationActions(tbm);
-		tbm.add(new Separator());
-		tbm.add(collapseAllAction);
-		tbm.add(new Separator());
-		tbm.add(installationHistoryAction);
-	}
-
-	protected Object getSelectedObject() {
-		ISelection selection = treeViewer.getSelection();
-		if (selection instanceof IStructuredSelection
-			&& !selection.isEmpty()) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			if (ssel.size() == 1)
-				return ssel.getFirstElement();
-		}
-		return null;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		Object obj = getSelectedObject();
-
-		if (obj instanceof ILocalSite) {
-			manager.add(revertAction);
-			manager.add(findUpdatesAction);
-		} else if (obj instanceof IConfiguredSiteAdapter) {
-			manager.add(siteStateAction);
-		}
-
-		if (obj instanceof ILocalSite
-			|| obj instanceof IConfiguredSiteAdapter) {
-			manager.add(new Separator());
-			MenuManager mgr = new MenuManager(UpdateUI.getString("ConfigurationView.new")); //$NON-NLS-1$
-			mgr.add(newExtensionLocationAction);
-			manager.add(mgr);
-			manager.add(new Separator());
-		} else if (obj instanceof ConfiguredFeatureAdapter) {
-			try {
-				MenuManager mgr = new MenuManager(UpdateUI.getString("ConfigurationView.replaceWith")); //$NON-NLS-1$
-				mgr.add(swapVersionAction);
-				manager.add(mgr);
-
-				manager.add(featureStateAction);
-
-				IFeature feature =
-					((ConfiguredFeatureAdapter) obj).getFeature(null);
-				if (feature instanceof MissingFeature) {
-					manager.add(installOptFeatureAction);
-				} else {
-					manager.add(uninstallFeatureAction);
-				}
-				manager.add(new Separator());
-				manager.add(findUpdatesAction);
-				manager.add(new Separator());
-			} catch (CoreException e) {
-			}
-		}
-
-		drillDownAdapter.addNavigationActions(manager);
-
-		if (obj instanceof ILocalSite) {
-			manager.add(new Separator());
-			manager.add(installationHistoryAction);
-		}
-
-		if (obj instanceof IFeatureAdapter
-			|| obj instanceof ILocalSite
-			|| obj instanceof IConfiguredSiteAdapter) {
-			manager.add(new Separator());
-			manager.add(propertiesAction);
-		}
-	}
-
-	public void installSiteAdded(IConfiguredSite csite) {
-		asyncRefresh();
-	}
-	public void installSiteRemoved(IConfiguredSite site) {
-		asyncRefresh();
-	}
-	public void featureInstalled(IFeature feature) {
-		asyncRefresh();
-	}
-	public void featureRemoved(IFeature feature) {
-		asyncRefresh();
-	}
-	public void featureConfigured(IFeature feature) {
-	}
-
-	public void featureUnconfigured(IFeature feature) {
-	}
-
-	public void currentInstallConfigurationChanged(IInstallConfiguration configuration) {
-		asyncRefresh();
-	}
-
-	public void installConfigurationRemoved(IInstallConfiguration configuration) {
-		asyncRefresh();
-	}
-
-	private void asyncRefresh() {
-		Display display = SWTUtil.getStandardDisplay();
-		if (display == null)
-			return;
-		if (getControl().isDisposed())
-			return;
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (!getControl().isDisposed())
-					treeViewer.refresh();
-			}
-		});
-	}
-
-	private Object[] getFeatures(
-		final IConfiguredSiteAdapter siteAdapter,
-		final boolean configuredOnly) {
-		final IConfiguredSite csite = siteAdapter.getConfiguredSite();
-		final Object[][] bag = new Object[1][];
-		refreshLock = true;
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				ArrayList result = new ArrayList();
-				IFeatureReference[] refs;
-
-				if (configuredOnly)
-					refs = csite.getConfiguredFeatures();
-				else {
-					ISite site = csite.getSite();
-					refs = site.getFeatureReferences();
-				}
-				monitor.beginTask(
-					UpdateUI.getString("ConfigurationView.loading"), //$NON-NLS-1$
-					refs.length);
-
-				for (int i = 0; i < refs.length; i++) {
-					IFeatureReference ref = refs[i];
-					IFeature feature;
-					try {
-						monitor.subTask(ref.getURL().toString());
-						feature = ref.getFeature(null);
-					} catch (CoreException e) {
-						feature =
-							new MissingFeature(ref.getSite(), ref.getURL());
-					}
-					monitor.worked(1);
-					result.add(
-						new ConfiguredFeatureAdapter(
-							siteAdapter,
-							feature,
-							csite.isConfigured(feature),
-							false,
-							false));
-				}
-				monitor.done();
-				bag[0] = getRootFeatures(result);
-			}
-		};
-
-		try {
-			if (configurationWindow.getShell().isVisible())
-				configurationWindow.run(true, false, op);
-			else
-				op.run(new NullProgressMonitor());
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {
-		} finally {
-			refreshLock = false;
-		}
-		return bag[0];
-	}
-
-	private Object[] getRootFeatures(ArrayList list) {
-		ArrayList children = new ArrayList();
-		ArrayList result = new ArrayList();
-		try {
-			for (int i = 0; i < list.size(); i++) {
-				ConfiguredFeatureAdapter cf =
-					(ConfiguredFeatureAdapter) list.get(i);
-				IFeature feature = cf.getFeature(null);
-				if (feature != null)
-					addChildFeatures(
-						feature,
-						children,
-						cf.isConfigured());
-			}
-			for (int i = 0; i < list.size(); i++) {
-				ConfiguredFeatureAdapter cf =
-					(ConfiguredFeatureAdapter) list.get(i);
-				IFeature feature = cf.getFeature(null);
-				if (feature != null
-					&& isChildFeature(feature, children) == false)
-					result.add(cf);
-			}
-		} catch (CoreException e) {
-			return list.toArray();
-		}
-		return result.toArray();
-	}
-
-	private void addChildFeatures(
-		IFeature feature,
-		ArrayList children,
-		boolean configured) {
-		try {
-			IIncludedFeatureReference[] included =
-				feature.getIncludedFeatureReferences();
-			for (int i = 0; i < included.length; i++) {
-				IFeature childFeature;
-				try {
-					childFeature =
-						included[i].getFeature(null);
-				} catch (CoreException e) {
-					childFeature = new MissingFeature(included[i]);
-				}
-				children.add(childFeature);
-			}
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-		}
-	}
-
-	private boolean isChildFeature(IFeature feature, ArrayList children) {
-		for (int i = 0; i < children.size(); i++) {
-			IFeature child = (IFeature) children.get(i);
-			if (feature
-				.getVersionedIdentifier()
-				.equals(child.getVersionedIdentifier()))
-				return true;
-		}
-		return false;
-	}
-
-	protected void handleDoubleClick(DoubleClickEvent e) {
-		if (e.getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) e.getSelection();
-			Object obj = ssel.getFirstElement();
-			if (obj!=null)
-				propertiesAction.run();
-		}
-	}
-
-	public void createPartControl(Composite parent) {
-		splitter = new SashForm(parent, SWT.HORIZONTAL);
-		splitter.setLayoutData(new GridData(GridData.FILL_BOTH));
-		Composite leftContainer = createLineContainer(splitter);
-		Composite rightContainer = createLineContainer(splitter);
-		createTreeViewer(leftContainer);
-		makeActions();
-		createVerticalLine(leftContainer);
-		createVerticalLine(rightContainer);
-		preview = new ConfigurationPreview(this);
-		preview.createControl(rightContainer);
-		preview.getControl().setLayoutData(
-			new GridData(GridData.FILL_BOTH));
-		splitter.setWeights(new int[] { 2, 3 });
-		fillActionBars(getConfigurationWindow().getToolBarManager());
-
-		treeViewer.expandToLevel(2);
-	}
-
-	private void createTreeViewer(Composite parent) {
-		treeViewer =
-			new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		treeViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		treeViewer.setUseHashlookup(true);
-		initProviders();
-
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				manager.add(new GroupMarker("additions")); //$NON-NLS-1$
-				fillContextMenu(manager);
-			}
-		});
-
-		treeViewer.getControl().setMenu(
-			menuMgr.createContextMenu(treeViewer.getControl()));
-
-		treeViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSelectionChanged(event);
-			}
-		});
-
-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleDoubleClick(event);
-			}
-		});
-
-	}
-
-	public TreeViewer getTreeViewer() {
-		return treeViewer;
-	}
-
-	private Composite createLineContainer(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 0;
-		layout.horizontalSpacing = 0;
-		container.setLayout(layout);
-		return container;
-	}
-
-	private void createVerticalLine(Composite parent) {
-		Label line = new Label(parent, SWT.SEPARATOR | SWT.VERTICAL);
-		GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL);
-		gd.widthHint = 1;
-		line.setLayoutData(gd);
-	}
-
-	public Control getControl() {
-		return splitter;
-	}
-
-	private int getStatusCode(IFeature feature, IStatus status) {
-		int code = status.getCode();
-		if (code == IFeature.STATUS_UNHAPPY) {
-			if (status.isMultiStatus()) {
-				IStatus[] children = status.getChildren();
-				for (int i = 0; i < children.length; i++) {
-					IStatus child = children[i];
-					if (child.isMultiStatus()
-						|| child.getCode() != IFeature.STATUS_DISABLED)
-						return code;
-				}
-				// If we are here, global status is unhappy
-				// because one or more included features
-				// is disabled.
-				if (UpdateUtils.hasObsoletePatches(feature)) {
-					// The disabled included features
-					// are old patches that are now
-					// subsumed by better versions of
-					// the features they were designed to
-					// patch.
-					return IFeature.STATUS_HAPPY;
-				}
-			}
-		}
-		return code;
-	}
-
-	protected void handleSelectionChanged(IStructuredSelection ssel) {
-		Object obj = ssel.getFirstElement();
-		if (obj instanceof IFeatureAdapter) {
-			try {
-				ConfiguredFeatureAdapter adapter =
-					(ConfiguredFeatureAdapter) obj;
-				IFeature feature = adapter.getFeature(null);
-				boolean enable =
-					(adapter.isOptional() || !adapter.isIncluded());
-				boolean missing = feature instanceof MissingFeature;
-
-				featureStateAction.setFeature(adapter);
-				featureStateAction.setEnabled(enable && !missing);
-
-				if (enable && !missing && adapter.isConfigured()) {
-					IFeature[] features = UpdateUtils.getInstalledFeatures(feature, false);
-					swapVersionAction.setEnabled(features.length > 1);
-					if (features.length > 1) {
-						swapVersionAction.setCurrentFeature(feature);
-						swapVersionAction.setFeatures(features);
-					}
-					findUpdatesAction.setEnabled(true);
-					findUpdatesAction.setFeature(feature);
-				} else {
-					swapVersionAction.setEnabled(false);
-					findUpdatesAction.setEnabled(false);
-				}
-
-				if (missing) {
-					MissingFeature mf = (MissingFeature) feature;
-					installOptFeatureAction.setEnabled(
-						mf.isOptional() && mf.getOriginatingSiteURL() != null);
-					installOptFeatureAction.setFeature(mf);
-					uninstallFeatureAction.setEnabled(false);
-				} else {
-					installOptFeatureAction.setEnabled(false);
-					uninstallFeatureAction.setFeature(adapter);
-					uninstallFeatureAction.setEnabled(
-						enable && uninstallFeatureAction.canUninstall());
-				}
-			} catch (CoreException ex) {
-				UpdateUI.logException(ex);
-			}
-		}
-		if (obj instanceof ILocalSite) {
-			propertiesAction.setEnabled(true);
-			findUpdatesAction.setEnabled(true);
-			findUpdatesAction.setFeature(null);
-			ILocalSite site = getLocalSite();
-			revertAction.setEnabled(site != null && site.getConfigurationHistory().length > 1);
-		} else if (obj instanceof IConfiguredSiteAdapter) {
-			siteStateAction.setSite(
-				((IConfiguredSiteAdapter) obj).getConfiguredSite());
-			siteStateAction.setEnabled(true);
-		}
-		preview.setSelection(ssel);
-	}
-
-	protected void handleSelectionChanged(SelectionChangedEvent e) {
-		handleSelectionChanged(((IStructuredSelection) e.getSelection()));
-	}
-
-	private void makePreviewTasks() {
-		previewTasks = new Hashtable();
-		Class key;
-		ArrayList array = new ArrayList();
-		// local site tasks
-		key = ILocalSite.class;
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.revertPreviousLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.revertPreviousDesc"), //$NON-NLS-1$
-				revertAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.updateLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.updateDesc"), //$NON-NLS-1$
-				findUpdatesAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.extLocLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.extLocDesc"), //$NON-NLS-1$
-				newExtensionLocationAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.installHistLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.installHistDesc"), //$NON-NLS-1$
-				installationHistoryAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.activitiesLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.activitiesDesc"), //$NON-NLS-1$
-				showActivitiesAction));
-
-		previewTasks.put(key, array.toArray(new IPreviewTask[array.size()]));
-
-		// configured site tasks
-		array.clear();
-		key = IConfiguredSiteAdapter.class;
-		array.add(
-			new PreviewTask(
-				null,
-				UpdateUI.getString("ConfigurationView.enableLocDesc"), //$NON-NLS-1$
-				siteStateAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.extLocLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.extLocDesc"), //$NON-NLS-1$
-				newExtensionLocationAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.propertiesLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.installPropDesc"), //$NON-NLS-1$
-				propertiesAction));
-		previewTasks.put(key, array.toArray(new IPreviewTask[array.size()]));
-
-		// feature adapter tasks
-		array.clear();
-		key = IFeatureAdapter.class;
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.replaceVersionLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.replaceVersionDesc"), //$NON-NLS-1$
-				swapVersionAction));
-		array.add(
-			new PreviewTask(
-				null,
-				UpdateUI.getString("ConfigurationView.enableFeatureDesc"), //$NON-NLS-1$
-				featureStateAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.installOptionalLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.installOptionalDesc"), //$NON-NLS-1$
-				installOptFeatureAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.uninstallLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.uninstallDesc"), //$NON-NLS-1$
-				uninstallFeatureAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.scanLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.scanDesc"), //$NON-NLS-1$
-				findUpdatesAction));
-		array.add(
-			new PreviewTask(
-				UpdateUI.getString("ConfigurationView.featurePropLabel"), //$NON-NLS-1$
-				UpdateUI.getString("ConfigurationView.featurePropDesc"), //$NON-NLS-1$
-				propertiesAction));
-		previewTasks.put(key, array.toArray(new IPreviewTask[array.size()]));
-	}
-
-	public IPreviewTask[] getPreviewTasks(Object object) {
-		IPreviewTask[] tasks = null;
-
-		if (object instanceof IFeatureAdapter)
-			tasks = (IPreviewTask[]) previewTasks.get(IFeatureAdapter.class);
-		if (object instanceof ILocalSite)
-			tasks = (IPreviewTask[]) previewTasks.get(ILocalSite.class);
-		if (object instanceof IConfiguredSiteAdapter)
-			tasks =
-				(IPreviewTask[]) previewTasks.get(IConfiguredSiteAdapter.class);
-		return (tasks != null) ? tasks : new IPreviewTask[0];
-	}
-
-	ConfigurationManagerWindow getConfigurationWindow(){
-		return configurationWindow;
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FeatureStateAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FeatureStateAction.java
deleted file mode 100644
index 50e5ba2..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FeatureStateAction.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.views;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.operations.*;
-
-public class FeatureStateAction extends Action {
-	private ConfiguredFeatureAdapter adapter;
-
-	public void setFeature(ConfiguredFeatureAdapter adapter) {
-		this.adapter = adapter;
-		if (adapter.isConfigured()) {
-			setText(UpdateUI.getString("FeatureStateAction.disable")); //$NON-NLS-1$
-		} else {
-			setText(UpdateUI.getString("FeatureStateAction.enable")); //$NON-NLS-1$
-		}
-	}
-
-	public void run() {
-		try {
-			if (adapter == null)
-				return;
-			
-			IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-			if (status != null)
-				throw new CoreException(status);
-			
-			boolean isConfigured = adapter.isConfigured();
-			// Ask user to confirm the operation
-			String message =
-				isConfigured
-					? UpdateUI.getString("FeatureStateAction.disableQuestion") //$NON-NLS-1$
-					: UpdateUI.getString("FeatureStateAction.EnableQuestion"); //$NON-NLS-1$
-
-			if (!confirm(message))
-				return;
-
-			// If current config is broken, confirm with the user to continue
-			if (OperationsManager.getValidator().validateCurrentState() != null &&
-					!confirm(UpdateUI.getString("Actions.brokenConfigQuestion"))) //$NON-NLS-1$
-				return;
-			
-			IOperation toggleOperation =
-				isConfigured
-					? (IOperation)OperationsManager
-						.getOperationFactory()
-						.createUnconfigOperation(
-						adapter.getConfiguredSite(),
-						adapter.getFeature(null))
-					: OperationsManager
-						.getOperationFactory()
-						.createConfigOperation(
-						adapter.getConfiguredSite(),
-						adapter.getFeature(null));
-
-			boolean restartNeeded = toggleOperation.execute(null, null);
-			UpdateUI.requestRestart(restartNeeded);
-
-		} catch (CoreException e) {
-			ErrorDialog.openError(
-				UpdateUI.getActiveWorkbenchShell(),
-				null,
-				null,
-				e.getStatus());
-		} catch (InvocationTargetException e) {
-			// This should not happen
-			UpdateUtils.logException(e.getTargetException());
-		}
-	}
-
-	private boolean confirm(String message) {
-		return MessageDialog.openConfirm(
-			UpdateUI.getActiveWorkbenchShell(),
-			UpdateUI.getString("FeatureStateAction.dialogTitle"), //$NON-NLS-1$
-			message);
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java
deleted file mode 100644
index 598ae8e..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.views;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-public class FindUpdatesAction extends Action {
-
-	private IFeature feature;
-	private Shell shell;
-
-	public FindUpdatesAction(Shell shell, String text) {
-		super(text);
-		this.shell = shell;
-	}
-	
-	public void setFeature(IFeature feature) {
-		this.feature = feature;
-	}
-
-	public void run() {
-		
-		IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-		if (status != null) {
-			ErrorDialog.openError(
-					UpdateUI.getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			return;
-		}
-		
-		// If current config is broken, confirm with the user to continue
-		if (OperationsManager.getValidator().validateCurrentState() != null &&
-				!confirm(UpdateUI.getString("Actions.brokenConfigQuestion"))) //$NON-NLS-1$
-			return;
-			
-		
-		IFeature [] features=null;
-		if (feature!=null)
-			features = new IFeature[] { feature };
-		final UpdateSearchRequest searchRequest = UpdateUtils.createNewUpdatesRequest(features);
-
-		BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
-			public void run() {
-				InstallWizard wizard = new InstallWizard(searchRequest);
-				WizardDialog dialog = new ResizableWizardDialog(shell, wizard);
-				dialog.create();
-				dialog.getShell().setText(UpdateUI.getString("FindUpdatesAction.updates")); //$NON-NLS-1$
-				SWTUtil.setDialogSize(dialog, 600, 500);
-				if (dialog.open() == IDialogConstants.OK_ID)
-					UpdateUI.requestRestart(wizard.isRestartNeeded());				
-			}
-		});
-	}
-	
-	private boolean confirm(String message) {
-		return MessageDialog.openConfirm(
-			UpdateUI.getActiveWorkbenchShell(),
-			UpdateUI.getString("FeatureStateAction.dialogTitle"), //$NON-NLS-1$
-			message);
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/IPreviewTask.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/IPreviewTask.java
deleted file mode 100644
index c5a04aa..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/IPreviewTask.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.update.internal.ui.views;
-
-public interface IPreviewTask {
-	String getName();
-	String getDescription();
-	void run();
-	boolean isEnabled();
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallOptionalFeatureAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallOptionalFeatureAction.java
deleted file mode 100644
index 3fd3293..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallOptionalFeatureAction.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.internal.ui.views;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.search.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-
-public class InstallOptionalFeatureAction extends Action {
-	private static final String KEY_OPTIONAL_INSTALL_TITLE = "FeaturePage.optionalInstall.title"; //$NON-NLS-1$
-
-	private MissingFeature missingFeature;
-	private Shell shell;
-
-	public InstallOptionalFeatureAction(Shell shell, String text) {
-		super(text);
-		this.shell = shell;
-	}
-
-	public void setFeature(MissingFeature feature) {
-		this.missingFeature = feature;
-	}
-
-	public void run() {
-		if (missingFeature == null)
-			return;
-		
-		IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-		if (status != null) {
-			ErrorDialog.openError(
-					UpdateUI.getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			return;
-		}
-		
-		// If current config is broken, confirm with the user to continue
-		if (OperationsManager.getValidator().validateCurrentState() != null &&
-				!confirm(UpdateUI.getString("Actions.brokenConfigQuestion"))) //$NON-NLS-1$
-			return;
-			
-		
-		VersionedIdentifier vid = missingFeature.getVersionedIdentifier();
-		URL originatingURL = missingFeature.getOriginatingSiteURL();
-
-		UpdateSearchScope scope = new UpdateSearchScope();
-		scope.addSearchSite(originatingURL.toString(), originatingURL, null);
-
-		OptionalFeatureSearchCategory category = new OptionalFeatureSearchCategory();
-		category.addVersionedIdentifier(vid);
-		final UpdateSearchRequest searchRequest =
-			new UpdateSearchRequest(category, scope);
-
-		BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
-			public void run() {
-				openWizard(searchRequest);
-			}
-		});
-	}
-	private void openWizard(UpdateSearchRequest searchRequest) {
-		InstallWizard wizard = new InstallWizard(searchRequest);
-		WizardDialog dialog = new ResizableWizardDialog(shell, wizard);
-		dialog.create();
-		dialog.getShell().setText(
-			UpdateUI.getString(KEY_OPTIONAL_INSTALL_TITLE));
-		SWTUtil.setDialogSize(dialog, 600, 500);
-		if (dialog.open() == IDialogConstants.OK_ID)
-			UpdateUI.requestRestart(wizard.isRestartNeeded());
-	}
-	
-	private boolean confirm(String message) {
-		return MessageDialog.openConfirm(
-			UpdateUI.getActiveWorkbenchShell(),
-			UpdateUI.getString("FeatureStateAction.dialogTitle"), //$NON-NLS-1$
-			message);
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallationHistoryAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallationHistoryAction.java
deleted file mode 100644
index 6f57fc5..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/InstallationHistoryAction.java
+++ /dev/null

@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.views;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.internal.ui.*;
-
-public class InstallationHistoryAction extends Action {
-
-	private BufferedReader buffRead;
-	private PrintWriter htmlLog;
-	private File tempFile;
-	private String rowType;
-	private IPath path;
-	private static final String lightBlue = "#EEEEFF"; //$NON-NLS-1$
-	private static final String white = "#FFFFFF"; //$NON-NLS-1$
-	private static final String darkBlue = "#99AADD"; //$NON-NLS-1$
-
-	public InstallationHistoryAction(String text, ImageDescriptor desc) {
-		super(text, desc);
-		String location =
-			ConfiguratorUtils
-				.getCurrentPlatformConfiguration()
-				.getConfigurationLocation()
-				.getFile();
-		path = new Path(location).removeLastSegments(1).append("install.log"); //$NON-NLS-1$
-		rowType = "light-row"; //$NON-NLS-1$
-	}
-
-	public void run() {
-		try {
-			openLog();
-			parseLog();
-			UpdateUI.showURL("file:" + getTempFile().getPath().toString()); //$NON-NLS-1$
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-		} finally {
-			closeLog();
-		}
-	}
-
-	private void openLog() throws CoreException {
-		try {
-			buffRead = new BufferedReader(new FileReader(path.toOSString()));
-			htmlLog = new PrintWriter(new FileOutputStream(getTempFile()));
-		} catch (FileNotFoundException e) {
-			throwCoreException(e);
-		}
-
-	}
-
-	private File getTempFile() throws CoreException {
-		if (tempFile == null) {
-			try {
-				tempFile = File.createTempFile("install-log", ".html"); //$NON-NLS-1$ //$NON-NLS-2$
-				tempFile.deleteOnExit();
-			} catch (IOException e) {
-				throwCoreException(e);
-			}
-		}
-		return tempFile;
-	}
-
-	private void parseLog() throws CoreException {
-		//		!CONFIGURATION <configuration-date>
-		//		!ACTIVITY <date> <target> <action> <status>
-
-		try {
-			String type, date, status, target, action;
-			StringTokenizer htmlCode;
-
-			htmlLog.println("<html>"); //$NON-NLS-1$
-			htmlLog.println("<head>"); //$NON-NLS-1$
-			htmlLog.println("<title>Install-Log</title>"); //$NON-NLS-1$
-			addCSS();
-			htmlLog.println("</head>"); //$NON-NLS-1$
-			htmlLog.println("<body>"); //$NON-NLS-1$
-			String title = UpdateUI.getString("InstallationHistoryAction.title"); //$NON-NLS-1$
-			String desc = UpdateUI.getString("InstallationHistoryAction.desc"); //$NON-NLS-1$
-			htmlLog.println("<h1 class=title>"+title+"</h1>"); //$NON-NLS-1$ //$NON-NLS-2$
-			htmlLog.println("<p class=bodyText>"+desc+"</p>"); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			htmlLog.println("<center>"); //$NON-NLS-1$
-
-			htmlLog.println("<table width =100% border=0 cellspacing=1 cellpadding=2>"); //$NON-NLS-1$
-
-			while (buffRead.ready()) {
-
-				htmlCode = new StringTokenizer(buffRead.readLine());
-				while (!(htmlCode.hasMoreElements())) {
-					if (!buffRead.ready())
-						return;
-					htmlCode = new StringTokenizer(buffRead.readLine());
-				}
-
-				type = htmlCode.nextToken();
-				type = type.substring(type.indexOf("!") + 1, type.length()); //$NON-NLS-1$
-
-				if (type.equals(UpdateUI.getString("InstallationHistoryAction.activity"))) { //$NON-NLS-1$
-					target = ""; //$NON-NLS-1$
-					date = new Date(new Long(htmlCode.nextToken()).longValue()).toString();
-					// ignore string date
-					htmlCode.nextToken("."); //$NON-NLS-1$
-					htmlCode.nextToken(" "); //$NON-NLS-1$
-					while (htmlCode.countTokens() > 2)
-						target = target + " " + htmlCode.nextToken(); //$NON-NLS-1$
-
-					action = htmlCode.nextToken();
-					status = htmlCode.nextToken();
-
-					addActivity(action, date, status, target);
-
-				} else {
-					htmlLog.println();
-					htmlLog.println(
-						"<tr id=separator><td colspan=4></td></tr>"); //$NON-NLS-1$
-					htmlLog.println();
-					date = new Date(new Long(htmlCode.nextToken()).longValue()).toString();
-//					date = ""; //$NON-NLS-1$
-//					while (htmlCode.countTokens() > 0)
-//						date = date + " " + htmlCode.nextToken(); //$NON-NLS-1$
-					addConfigurationHeader(date);
-					addActivityHeader();
-				}
-
-			}
-			htmlLog.println("</table>"); //$NON-NLS-1$
-			htmlLog.println("</body>"); //$NON-NLS-1$
-			htmlLog.println("</html>"); //$NON-NLS-1$
-
-		} catch (Exception e) {
-			throwCoreException(e);
-		}
-
-	}
-
-	private void addActivity(
-		String type,
-		String date,
-		String status,
-		String target) {
-		htmlLog.print("<tr class=" + rowType + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-		htmlLog.print("<td class=log-text width=30%>"); //$NON-NLS-1$
-		htmlLog.print(date);
-		htmlLog.println("</td>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-text width=40%>"); //$NON-NLS-1$
-		htmlLog.print(target);
-		htmlLog.println("</td>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-text width=20%>"); //$NON-NLS-1$
-		htmlLog.print(type);
-		htmlLog.println("</td>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-text width=10%>"); //$NON-NLS-1$
-		htmlLog.print(status);
-		htmlLog.println("</td></tr>"); //$NON-NLS-1$
-		toggleRowColor();
-	}
-
-	private void addCSS() {
-		htmlLog.println("<STYLE type=\"text/css\">"); //$NON-NLS-1$
-		htmlLog.println("H1.title { font-family: sans-serif; color: #99AACC }"); //$NON-NLS-1$
-		htmlLog.println("P.bodyText { font-family: sans-serif; font-size: 9pt; }"); //$NON-NLS-1$
-		htmlLog.println(
-			"TD.log-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white}"); //$NON-NLS-1$
-		htmlLog.println(
-			"TD.log-text { font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black}"); //$NON-NLS-1$
-		htmlLog.println(
-		//	"TD.config-log-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; ;text-align: right; border-top:10px solid white}");
-		"TD.config-log-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white}"); //$NON-NLS-1$
-		htmlLog.println("TR.light-row {background:" + white + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-		htmlLog.println("TR.dark-row {background:" + lightBlue + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-		htmlLog.println("TR.header {background:" + darkBlue + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-		htmlLog.println("</STYLE>"); //$NON-NLS-1$
-	}
-
-	private void addActivityHeader() {
-		htmlLog.print("<tr class=header>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-header>"); //$NON-NLS-1$
-		htmlLog.print(UpdateUI.getString("InstallationHistoryAction.dateTime")); //$NON-NLS-1$
-		htmlLog.print("</td>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-header>"); //$NON-NLS-1$
-		htmlLog.print(UpdateUI.getString("InstallationHistoryAction.target")); //$NON-NLS-1$
-		htmlLog.print("</td>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-header>"); //$NON-NLS-1$
-		htmlLog.print(UpdateUI.getString("InstallationHistoryAction.action")); //$NON-NLS-1$
-		htmlLog.print("</td>"); //$NON-NLS-1$
-		htmlLog.print("<td class=log-header>"); //$NON-NLS-1$
-		htmlLog.print(UpdateUI.getString("InstallationHistoryAction.status")); //$NON-NLS-1$
-		htmlLog.println("</td></tr>"); //$NON-NLS-1$
-	}
-
-	private void addConfigurationHeader(String date) {
-		if (date == null)
-			return;
-
-		htmlLog.print("<tr class=header>"); //$NON-NLS-1$
-		htmlLog.print("<td class=config-log-header colspan=4>"); //$NON-NLS-1$
-		htmlLog.print(date);
-		htmlLog.println("</td></tr>"); //$NON-NLS-1$
-	}
-
-	private void toggleRowColor() {
-		if (rowType.equals("light-row")) //$NON-NLS-1$
-			rowType = "dark-row"; //$NON-NLS-1$
-		else
-			rowType = "light-row"; //$NON-NLS-1$
-	}
-
-	private void throwCoreException(Throwable e) throws CoreException {
-		throw new CoreException(
-			new Status(
-				IStatus.ERROR,
-				UpdateUI.getPluginId(),
-				IStatus.ERROR,
-				UpdateUI.getString("InstallationHistoryAction.errors"), //$NON-NLS-1$
-				e));
-	}
-
-	private void closeLog() {
-		try {
-			if (buffRead != null)
-				buffRead.close();
-			if (htmlLog != null)
-				htmlLog.close();
-		} catch (IOException e) {
-		} finally {
-			buffRead = null;
-			htmlLog = null;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/NewExtensionLocationAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/NewExtensionLocationAction.java
deleted file mode 100644
index abf6c16..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/NewExtensionLocationAction.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.internal.ui.views;
-
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.operations.*;
-
-public class NewExtensionLocationAction extends Action {
-
-	public NewExtensionLocationAction(String text, ImageDescriptor desc) {
-		super(text, desc);
-	}
-
-	public void run() {
-		
-		IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-		if (status != null) {
-			ErrorDialog.openError(
-					UpdateUI.getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			return;
-		}
-		
-		DirectoryDialog dialog =
-			new DirectoryDialog(UpdateUI.getActiveWorkbenchShell());
-		dialog.setMessage(UpdateUI.getString("NewExtensionLocationAction.selectExtLocation")); //$NON-NLS-1$
-
-		String dir = dialog.open();
-		while (dir != null) {
-			File dirFile = getExtensionSite(new File(dir));
-			if (dirFile != null) {
-				if (addExtensionLocation(dirFile))
-					return;
-				else {
-					// re-open the directory dialog
-					dialog.setFilterPath(dir);
-					dir = dialog.open();
-				}	
-			} else {
-				MessageDialog.openInformation(
-					UpdateUI.getActiveWorkbenchShell(),
-					UpdateUI.getString(
-						"NewExtensionLocationAction.extInfoTitle"), //$NON-NLS-1$
-					UpdateUI.getString(
-						"NewExtensionLocationAction.extInfoMessage")); //$NON-NLS-1$
-				// re-open the directory dialog
-				dialog.setFilterPath(dir);
-				dir = dialog.open();
-			}
-		}
-	}
-
-	/**
-	 * @param directory
-	 * @return the site file (including "eclipse" path) when directory is an eclipse exstension, null otherwise
-	 */
-	static File getExtensionSite(File directory) {
-		// Check the eclipse folder
-		if (directory.getName().equals("eclipse")) { //$NON-NLS-1$
-			// if we picked up the eclipse directory, check if its parent is a site
-			File site = getExtensionSite(directory.getParentFile());
-			if (site != null)
-				return directory;
-			// otherwise, fall through
-		}
-		
-		File eclipse = new File(directory, "eclipse"); //$NON-NLS-1$
-		if (!eclipse.exists() || !eclipse.isDirectory())
-			return null;
-
-		// check the marker
-		File marker = new File(eclipse, ".eclipseextension"); //$NON-NLS-1$
-		if (!marker.exists() || marker.isDirectory())
-			return null;
-		return eclipse;
-	}
-
-	private boolean addExtensionLocation(File dir) {
-		try {
-			IInstallConfiguration config = SiteManager.getLocalSite().getCurrentConfiguration();
-			IConfiguredSite csite = config.createLinkedConfiguredSite(dir);
-			config.addConfiguredSite(csite);
-			boolean restartNeeded = SiteManager.getLocalSite().save();
-			UpdateUI.requestRestart(restartNeeded);
-			return true;
-		} catch (CoreException e) {
-			String title = UpdateUI.getString("InstallWizard.TargetPage.location.error.title"); //$NON-NLS-1$
-			ErrorDialog.openError(UpdateUI.getActiveWorkbenchShell(), title, null, e.getStatus());
-			UpdateUI.logException(e,false);
-			return false;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ReplaceVersionAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ReplaceVersionAction.java
deleted file mode 100644
index 92b4658..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ReplaceVersionAction.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.internal.ui.views;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.internal.ui.wizards.ReplaceFeatureVersionWizard;
-import org.eclipse.update.operations.*;
-
-public class ReplaceVersionAction extends Action {
-	
-	private IFeature currentFeature;
-	private IFeature[] features;
-	
-	public ReplaceVersionAction(String text) {
-		super(text);
-	}
-	
-	public void setCurrentFeature(IFeature feature) {
-		currentFeature = feature;
-	}
-	
-	public void setFeatures(IFeature[] features) {
-		this.features = features;
-	}
-		
-	public void run() {
-		if (currentFeature == null || features == null || features.length < 2)
-			return;
-			
-		IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-		if (status != null) {
-			ErrorDialog.openError(
-					UpdateUI.getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			return;
-		}
-		
-		ReplaceFeatureVersionWizard wizard = new ReplaceFeatureVersionWizard(currentFeature, features);
-		WizardDialog dialog = new WizardDialog(UpdateUI.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getActiveWorkbenchShell().getText());
-		dialog.getShell().setSize(400,400);
-		dialog.open();
-	}
-
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/RevertConfigurationAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/RevertConfigurationAction.java
deleted file mode 100644
index 2cf327a..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/RevertConfigurationAction.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.internal.ui.views;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.operations.*;
-
-public class RevertConfigurationAction extends Action {
-	public RevertConfigurationAction(String text) {
-		super(text);
-	}
-	
-	public void run() {
-		IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-		if (status != null) {
-			ErrorDialog.openError(
-					UpdateUI.getActiveWorkbenchShell(),
-					null,
-					null,
-					status);
-			return;
-		}
-		
-		RevertConfigurationWizard wizard = new RevertConfigurationWizard();
-		WizardDialog dialog = new WizardDialog(UpdateUI.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getActiveWorkbenchShell().getText());
-		dialog.getShell().setSize(600,500);
-		dialog.open();
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ShowActivitiesAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ShowActivitiesAction.java
deleted file mode 100644
index 12583a3..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ShowActivitiesAction.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.internal.ui.views;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.internal.ui.wizards.ShowActivitiesDialog;
-
-public class ShowActivitiesAction extends Action {
-	Shell shell;
-	
-	public ShowActivitiesAction(Shell parentShell, String text) {
-		super(text);
-		this.shell = parentShell;
-	}
-	
-	public void run() {
-		ShowActivitiesDialog dialog = new ShowActivitiesDialog(shell);
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getString("ShowActivitiesDialog.title")); //$NON-NLS-1$
-		dialog.open();
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/SiteStateAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/SiteStateAction.java
deleted file mode 100644
index d88afb2..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/SiteStateAction.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.internal.ui.views;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.operations.*;
-
-/**
- * Toggles a site's enabled state
- */
-
-public class SiteStateAction extends Action {
-	private IConfiguredSite site;
-
-	public SiteStateAction() {
-	}
-
-	public void setSite(IConfiguredSite site) {
-		this.site = site;
-		boolean state = site.isEnabled();
-		setText(state ? UpdateUI.getString("SiteStateAction.disableLabel") : UpdateUI.getString("SiteStateAction.enableLabel")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void run() {
-		try {
-			if (site == null)
-				return;
-			
-			IStatus status = OperationsManager.getValidator().validatePlatformConfigValid();
-			if (status != null) {
-				ErrorDialog.openError(
-						UpdateUI.getActiveWorkbenchShell(),
-						null,
-						null,
-						status);
-				return;
-			}
-			
-			boolean oldValue = site.isEnabled();
-			if (!confirm(!oldValue))
-				return;
-			
-			IOperation toggleSiteOperation = OperationsManager.getOperationFactory().createToggleSiteOperation(site);
-			boolean restartNeeded = toggleSiteOperation.execute(null, null);
-					
-			UpdateUI.requestRestart(restartNeeded);
-
-		} catch (CoreException e) {
-			ErrorDialog.openError(
-				UpdateUI.getActiveWorkbenchShell(),
-				null,
-				null,
-				e.getStatus());
-		} catch (InvocationTargetException e) {
-			UpdateUI.logException(e);
-		}
-	}
-
-	private boolean confirm(boolean newState) {
-		String name = site.getSite().getURL().toString();
-		String enableMessage = UpdateUI.getFormattedMessage("SiteStateAction.enableMessage", name); //$NON-NLS-1$ //$NON-NLS-2$
-		String disableMessage = UpdateUI.getFormattedMessage("SiteStateAction.disableMessage", name); //$NON-NLS-1$ //$NON-NLS-2$
-
-		String message = newState ? enableMessage : disableMessage;
-		return MessageDialog.openConfirm(UpdateUI.getActiveWorkbenchShell(), UpdateUI.getString("SiteStateAction.dialogTitle"), message); //$NON-NLS-1$
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UninstallFeatureAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UninstallFeatureAction.java
deleted file mode 100644
index 0c582fb..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UninstallFeatureAction.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.update.internal.ui.views;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.operations.*;
-
-public class UninstallFeatureAction extends Action {
-	private ConfiguredFeatureAdapter adapter;
-
-	public UninstallFeatureAction(String text) {
-		super(text);
-	}
-
-	public void run() {
-		try {
-			if (adapter == null || !confirm())
-				return;
-
-			IOperation uninstallOperation =
-				(IOperation) OperationsManager
-					.getOperationFactory()
-					.createUninstallOperation(
-					adapter.getConfiguredSite(),
-					adapter.getFeature(null));
-
-			boolean restartNeeded = uninstallOperation.execute(null, null);
-			UpdateUI.requestRestart(restartNeeded);
-
-		} catch (CoreException e) {
-			ErrorDialog.openError(
-				UpdateUI.getActiveWorkbenchShell(),
-				null,
-				null,
-				e.getStatus());
-		} catch (InvocationTargetException e) {
-			// This should not happen
-			UpdateUtils.logException(e.getTargetException());
-		}
-	}
-
-	private boolean confirm() {
-		return MessageDialog.openConfirm(UpdateUI.getActiveWorkbenchShell(), UpdateUI.getString("FeatureUninstallAction.dialogTitle"), //$NON-NLS-1$
-		UpdateUI.getString("FeatureUninstallAction.uninstallQuestion")); //$NON-NLS-1$
-	}
-
-	public void setFeature(ConfiguredFeatureAdapter adapter) {
-		this.adapter = adapter;
-		setText(UpdateUI.getString("FeatureUninstallAction.uninstall")); //$NON-NLS-1$
-	}
-
-	public boolean canUninstall() {
-		if (adapter == null)
-			return false;
-		
-		if (adapter.isConfigured())
-			return false;
-			
-		try {
-			if (InstallRegistry.getInstance().get("feature_"+adapter.getFeature(null).getVersionedIdentifier()) == null) //$NON-NLS-1$
-				return false;
-		} catch (CoreException e) {
-			return false;
-		}
-				
-		return true;	
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ActivitiesTableViewer.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ActivitiesTableViewer.java
deleted file mode 100644
index 232e69b..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ActivitiesTableViewer.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import java.util.*;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-
-
-/**
- * Viewer for configuration activities
- */
-public class ActivitiesTableViewer{
-
-	private static InstallLogParser parser; 
-	
-	static class ActivitiesContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		
-		private boolean showCurrentOnly;
-		
-		public ActivitiesContentProvider(boolean showCurrentOnly){
-			this.showCurrentOnly = showCurrentOnly;
-		}
-		public ActivitiesContentProvider(){
-			this.showCurrentOnly = false;
-		}
-		
-		public Object[] getElements(Object element) {
-			InstallConfiguration currentConfig = (InstallConfiguration)element;
-			InstallConfiguration[] configs = parser.getConfigurations();
-			boolean hitCurrentConfig = false;
-			ArrayList activitiesList = new ArrayList();
-			for (int i = 0; i<configs.length; i++){
-				if (configs[i].equals(currentConfig) && !hitCurrentConfig)
-					hitCurrentConfig = true;
-				if (hitCurrentConfig && showCurrentOnly)
-					return configs[i].getActivities();
-				else if (hitCurrentConfig){
-					IActivity[] activities = configs[i].getActivities();
-					for (int j = 0; j<activities.length; j++)
-						activitiesList.add(activities[j]);	
-				}
-				
-			}
-			return (IActivity[])activitiesList.toArray(new IActivity[activitiesList.size()]);
-		}
-		
-	}
-
-	static class ActivitiesLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-		public Image getColumnImage(Object element, int columnIndex) {
-			if (columnIndex == 0) {
-				UpdateLabelProvider provider =
-					UpdateUI.getDefault().getLabelProvider();
-				switch (((IActivity) element).getStatus()) {
-					case IActivity.STATUS_OK :
-						return provider.get(UpdateUIImages.DESC_OK_ST_OBJ, 0);
-					case IActivity.STATUS_NOK :
-						return provider.get(UpdateUIImages.DESC_ERR_ST_OBJ, 0);
-				}
-			}
-			return null;
-		}
-
-		public String getColumnText(Object element, int columnIndex) {
-			IActivity activity = (IActivity) element;
-			switch (columnIndex) {
-				case 1 :
-					return Utilities.format(activity.getDate());
-				case 2 :
-					return activity.getLabel();
-				case 3 :
-					return getActionLabel(activity);
-			}
-			return ""; //$NON-NLS-1$
-		}
-
-		private String getActionLabel(IActivity activity) {
-			int action = activity.getAction();
-			switch (action) {
-				case IActivity.ACTION_CONFIGURE :
-					return UpdateUI.getString("ActivitiesTableViewer.enabled"); //$NON-NLS-1$
-				case IActivity.ACTION_FEATURE_INSTALL :
-					return UpdateUI.getString("ActivitiesTableViewer.featureInstalled"); //$NON-NLS-1$
-				case IActivity.ACTION_FEATURE_REMOVE :
-					return UpdateUI.getString("ActivitiesTableViewer.featureRemoved"); //$NON-NLS-1$
-				case IActivity.ACTION_SITE_INSTALL :
-					return UpdateUI.getString("ActivitiesTableViewer.siteInstalled"); //$NON-NLS-1$
-				case IActivity.ACTION_SITE_REMOVE :
-					return UpdateUI.getString("ActivitiesTableViewer.siteRemoved"); //$NON-NLS-1$
-				case IActivity.ACTION_UNCONFIGURE :
-					return UpdateUI.getString("ActivitiesTableViewer.disabled"); //$NON-NLS-1$
-				case IActivity.ACTION_REVERT :
-					return UpdateUI.getString("ActivitiesTableViewer.revert"); //$NON-NLS-1$
-				case IActivity.ACTION_RECONCILIATION :
-					return UpdateUI.getString("ActivitiesTableViewer.reconcile"); //$NON-NLS-1$
-				default :
-					return UpdateUI.getString("ActivitiesTableViewer.unknown"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public static TableViewer createViewer(Composite parent, boolean showCurrentOnly) {
-		parser = new InstallLogParser();
-		parser.parseInstallationLog();
-		Table table = new Table(parent, SWT.BORDER);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-		table.setHeaderVisible(true);
-
-		TableColumn column = new TableColumn(table, SWT.NONE);
-
-		column = new TableColumn(table, SWT.NONE);
-		column.setText(UpdateUI.getString("ActivitiesTableViewer.date")); //$NON-NLS-1$
-
-		column = new TableColumn(table, SWT.NONE);
-		column.setText(UpdateUI.getString("ActivitiesTableViewer.target")); //$NON-NLS-1$
-
-		column = new TableColumn(table, SWT.NONE);
-		column.setText(UpdateUI.getString("ActivitiesTableViewer.action")); //$NON-NLS-1$
-
-		TableViewer activitiesViewer = new TableViewer(table);
-		activitiesViewer.setLabelProvider(new ActivitiesLabelProvider());
-		activitiesViewer.setContentProvider(new ActivitiesContentProvider(showCurrentOnly));
-		return activitiesViewer;
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/BannerPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/BannerPage.java
deleted file mode 100644
index a478c83..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/BannerPage.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.update.internal.ui.wizards;
-import java.net.*;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.ui.*;
-
-public abstract class BannerPage extends WizardPage {
-	private Image bannerImage;
-	private boolean bannerVisible = false;
-	public BannerPage(String name) {
-		super(name);
-	}
-
-	public void createControl(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.horizontalSpacing = 10;
-		client.setLayout(layout);
-
-		if (bannerVisible) {
-			Label label = new Label(client, SWT.NULL);
-			label.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-			label.setImage(getBannerImage());
-		}
-
-		Control contents = createContents(client);
-		contents.setLayoutData(new GridData(GridData.FILL_BOTH));
-		setControl(client);
-	}
-
-	public void setBannerVisible(boolean visible) {
-		this.bannerVisible = visible;
-	}
-	public boolean isBannedVisible() {
-		return bannerVisible;
-	}
-
-	protected URL getBannerImageURL() {
-		return null;
-	}
-	private Image getBannerImage() {
-		URL imageURL = getBannerImageURL();
-		Image image = null;
-		if (imageURL == null) {
-			// use default
-			bannerImage =
-				UpdateUIImages.DESC_INSTALL_BANNER.createImage();
-			image = bannerImage;
-		}
-		return image;
-	}
-
-	public void dispose() {
-		if (bannerImage != null) {
-			bannerImage.dispose();
-		}
-		super.dispose();
-	}
-
-	protected abstract Control createContents(Composite parent);
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/DuplicateConflictsDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/DuplicateConflictsDialog.java
deleted file mode 100644
index dc71012..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/DuplicateConflictsDialog.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.update.internal.ui.wizards;
-
-import java.util.*;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-
-/**
- * 
- */
-public class DuplicateConflictsDialog extends MessageDialog {
-
-	private TreeViewer treeViewer;
-	private ArrayList conflicts;
-
-	class ConflictContentProvider
-		extends DefaultContentProvider
-		implements ITreeContentProvider, IStructuredContentProvider {
-		public Object[] getElements(Object input) {
-			return getChildren(input);
-		}
-		public Object getParent(Object child) {
-			return null;
-		}
-		public boolean hasChildren(Object parent) {
-			if (parent instanceof ArrayList)
-				return true;
-			return false;
-		}
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof ArrayList)
-				return ((ArrayList) parent).toArray();
-			return new Object[0];
-		}
-	}
-
-	class ConflictLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			if (obj instanceof ArrayList) {
-				ArrayList list = (ArrayList) obj;
-				for (int i = 0; i < list.size(); i++) {
-					DuplicateConflictsValidator.IdEntry entry =
-						(DuplicateConflictsValidator.IdEntry) (list).get(i);
-					if (entry.isInstallCandidate())
-						return entry.getFeature().getLabel();
-				}
-			}
-			return super.getText(obj);
-		}
-		public Image getImage(Object obj) {
-			int flags = 0;
-			if (obj instanceof ArrayList)
-				flags = UpdateLabelProvider.F_WARNING;
-			if (obj instanceof DuplicateConflictsValidator.IdEntry
-				|| obj instanceof ArrayList)
-				return UpdateUI.getDefault().getLabelProvider().get(
-					UpdateUIImages.DESC_FEATURE_OBJ,
-					flags);
-			return null;
-		}
-	}
-
-	public DuplicateConflictsDialog(Shell shell, ArrayList conflicts) {
-		super(
-			shell,
-			UpdateUI.getString("DuplicateConflictsDialog.title"), //$NON-NLS-1$
-			null,
-			UpdateUI.getString("DuplicateConflictsDialog.message"), //$NON-NLS-1$
-			WARNING,
-			new String[] {
-				IDialogConstants.YES_LABEL,
-				IDialogConstants.NO_LABEL },
-			0);
-		this.conflicts = conflicts;
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-	}
-
-	public boolean close() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		return super.close();
-	}
-
-	protected Control createCustomArea(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		client.setLayoutData(new GridData(GridData.FILL_BOTH));
-		GridLayout layout = new GridLayout();
-		client.setLayout(layout);
-
-		Label label = new Label(client, SWT.NULL);
-		label.setText(UpdateUI.getString("DuplicateConflictsDialog.treeLabel")); //$NON-NLS-1$
-
-		treeViewer = new TreeViewer(client, SWT.SINGLE | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 200;
-		gd.widthHint = 300;
-		treeViewer.getTree().setLayoutData(gd);
-		treeViewer.setContentProvider(new ConflictContentProvider());
-		treeViewer.setLabelProvider(new ConflictLabelProvider());
-		treeViewer.setAutoExpandLevel(10);
-		treeViewer.setSorter(new ViewerSorter() {
-		});
-		treeViewer.setInput(conflicts);
-		return client;
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/EditSiteDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/EditSiteDialog.java
deleted file mode 100644
index 16e32f5..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/EditSiteDialog.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import java.net.*;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.operations.*;
-
-
-public class EditSiteDialog extends NewUpdateSiteDialog {
-	SiteBookmark bookmark;
-
-	public EditSiteDialog(Shell parentShell, SiteBookmark bookmark) {
-		super(parentShell);
-		this.bookmark = bookmark;
-	}
-
-	protected void initializeFields() {
-		name.setText(bookmark.getName());
-		url.setText(bookmark.getURL().toString());
-		url.setEditable(!bookmark.isLocal());
-	}
-
-	protected void update() {
-		try {
-			bookmark.setName(name.getText());
-			bookmark.setURL(new URL(url.getText()));
-			OperationsManager.fireObjectChanged(bookmark, null);
-		} catch (MalformedURLException e) {
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureSorter.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureSorter.java
deleted file mode 100644
index 732f0a7..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureSorter.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.update.internal.ui.wizards;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.operations.*;
-
-public class FeatureSorter extends ViewerSorter {
-	
-	public static final int FEATURE_VERSION = 1;
-	public static final int FEATURE_LABEL = 2;
-	public static final int FEATURE_PROVIDER = 3;
-	
-	public static final int ASCENDING = 1;
-	public static final int DESCENDING = -1;
-	
-	private int key = FEATURE_LABEL;
-	private int labelOrder;
-	private int versionOrder;
-	private int providerOrder;
-	
-	public FeatureSorter() {
-		this(FEATURE_LABEL, ASCENDING, ASCENDING, ASCENDING);
-	}
-	
-	public FeatureSorter(int key, int labelOrder, int versionOrder, int providerOrder) {
-		this.key = key;
-		this.labelOrder = labelOrder;
-		this.versionOrder = versionOrder;
-		this.providerOrder = providerOrder;
-	}
-
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		if (!(e1 instanceof IInstallFeatureOperation)
-			|| !(e2 instanceof IInstallFeatureOperation))
-			return super.compare(viewer, e1, e2);
-			
-		IFeature f1 = ((IInstallFeatureOperation)e1).getFeature();
-		IFeature f2 = ((IInstallFeatureOperation)e2).getFeature();
-		
-		PluginVersionIdentifier v1 = f1.getVersionedIdentifier().getVersion();
-		PluginVersionIdentifier v2 = f2.getVersionedIdentifier().getVersion();
-		
-		String label1 = f1.getLabel() == null ? "" : f1.getLabel(); //$NON-NLS-1$
-		String label2 = f2.getLabel() == null ? "" : f2.getLabel(); //$NON-NLS-1$
-		
-		String provider1 = f1.getProvider() == null ? "" : f1.getProvider(); //$NON-NLS-1$
-		String provider2 = f2.getProvider() == null ? "" : f2.getProvider(); //$NON-NLS-1$
-		
-		int result = 0;
-		if (key == FEATURE_VERSION) {
-			result = compareVersions(v1, v2) * versionOrder;
-			if (result == 0) {
-				result = collator.compare(label1, label2) * labelOrder;
-				if (result == 0)
-					result = collator.compare(provider1, provider2) * providerOrder;
-			}
-		} else if (key == FEATURE_LABEL) {
-			result = collator.compare(label1, label2) * labelOrder;
-			if (result == 0) {
-				result = compareVersions(v1, v2) * versionOrder;
-				if (result == 0)
-					result = collator.compare(provider1, provider2) * providerOrder;
-			}
-		} else if (key == FEATURE_PROVIDER) {
-			result = collator.compare(provider1, provider2) * providerOrder;
-			if (result == 0) {
-				result = collator.compare(label1, label2) * labelOrder;
-				if (result == 0)
-					result = compareVersions(v1, v2) * versionOrder;
-			}
-		}
-		return result;
-	}
-	
-	private int compareVersions(PluginVersionIdentifier v1, PluginVersionIdentifier v2) {
-		if (v1.equals(v2))
-			return 0;
-		return v2.isGreaterThan(v1) ? -1 : 1;
-	}
-	
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/IDynamicPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/IDynamicPage.java
deleted file mode 100644
index e16a922..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/IDynamicPage.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.update.internal.ui.wizards;
-
-
-import org.eclipse.update.operations.*;
-
-/**
- *  A dynamic page in the install wizard
- */
-public interface IDynamicPage {
-	public void setJobs(IInstallFeatureOperation [] jobs);
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ISearchProvider.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ISearchProvider.java
deleted file mode 100644
index 0045cef..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ISearchProvider.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import org.eclipse.update.search.*;
-
-/**
- * A search request provider
- */
-public interface ISearchProvider {
-	UpdateSearchRequest getSearchRequest();
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java
deleted file mode 100644
index 7bd5b8f..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java
+++ /dev/null

@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.security.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-public class InstallWizard
-	extends Wizard
-	implements IOperationListener, ISearchProvider {
-	private ModeSelectionPage modePage;
-	private SitePage sitePage;
-	private ReviewPage reviewPage;
-	private LicensePage licensePage;
-	private OptionalFeaturesPage optionalFeaturesPage;
-	private TargetPage targetPage;
-	private IInstallConfiguration config;
-	private int installCount = 0;
-	private SearchRunner searchRunner;
-	private UpdateSearchRequest searchRequest;
-	private ArrayList jobs;
-	private boolean needsRestart;
-	private static boolean isRunning;
-
-	public InstallWizard() {
-		this((UpdateSearchRequest) null);
-	}
-
-	public InstallWizard(UpdateSearchRequest searchRequest) {
-		isRunning = true;
-		this.searchRequest = searchRequest;
-		setDialogSettings(UpdateUI.getDefault().getDialogSettings());
-		setDefaultPageImageDescriptor(UpdateUIImages.DESC_UPDATE_WIZ);
-		setForcePreviousAndNextButtons(true);
-		setNeedsProgressMonitor(true);
-		setWindowTitle(UpdateUI.getString("InstallWizard.wtitle")); //$NON-NLS-1$
-	}
-
-	public InstallWizard(UpdateSearchRequest searchRequest, ArrayList jobs) {
-		this(searchRequest);
-		this.jobs = jobs;
-	}
-
-	public int getInstallCount() {
-		return installCount;
-	}
-	public boolean isRestartNeeded() {
-		return installCount > 0 && needsRestart; // or == selectedJobs.length
-	}
-
-	public boolean performCancel() {
-		isRunning = false;
-		if (targetPage != null)
-			targetPage.removeAddedSites();
-		return super.performCancel();
-	}
-	/**
-	 * @see Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			final IInstallFeatureOperation[] selectedJobs =
-				reviewPage.getSelectedJobs();
-			installCount = 0;
-
-			saveSettings();
-
-			// Check for duplication conflicts
-			ArrayList conflicts =
-				DuplicateConflictsValidator.computeDuplicateConflicts(
-					targetPage.getTargetSites(),
-					config);
-			if (conflicts != null) {
-				DuplicateConflictsDialog dialog =
-					new DuplicateConflictsDialog(getShell(), conflicts);
-				if (dialog.open() != 0)
-					return false;
-			}
-			
-			final IVerificationListener verificationListener =new JarVerificationService(
-					InstallWizard.this.getShell());
-			// ok to continue		
-			IRunnableWithProgress operation = new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-						// setup jobs with the correct environment
-					IInstallFeatureOperation[] operations =
-					new IInstallFeatureOperation[selectedJobs.length];
-					for (int i = 0; i < selectedJobs.length; i++) {
-						IInstallFeatureOperation job = selectedJobs[i];
-						IFeature[] unconfiguredOptionalFeatures = null;
-						IFeatureReference[] optionalFeatures = null;
-						if (UpdateUtils.hasOptionalFeatures(job.getFeature())) {
-							optionalFeatures =
-								optionalFeaturesPage
-									.getCheckedOptionalFeatures(
-									job);
-							unconfiguredOptionalFeatures =
-								optionalFeaturesPage
-									.getUnconfiguredOptionalFeatures(
-									job,
-									targetPage.getTargetSite(job));
-						}
-						IInstallFeatureOperation op =
-							OperationsManager
-								.getOperationFactory()
-								.createInstallOperation(
-								targetPage.getTargetSite(job),
-								job.getFeature(),
-								optionalFeatures,
-								unconfiguredOptionalFeatures,
-								verificationListener);
-						operations[i] = op;
-					}
-					IOperation installOperation =
-						OperationsManager
-							.getOperationFactory()
-							.createBatchInstallOperation(
-							operations);
-					try {
-						needsRestart = installOperation.execute(monitor, InstallWizard.this);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			
-			boolean retry;
-			do {
-				retry = false;
-				try {
-					getContainer().run(true, true, operation);
-				} catch (InvocationTargetException e) {
-					Throwable targetException = e.getTargetException();
-					if (targetException instanceof InstallAbortedException) {
-						return false;
-					}else if(targetException instanceof FeatureDownloadException){
-							FeatureDownloadException fde=(FeatureDownloadException)targetException;
-							retry =
-							MessageDialog.openQuestion(
-								getShell(),
-								UpdateUI.getString("InstallWizard.retryTitle"), //$NON-NLS-1$
-								fde.getMessage()+"\n" //$NON-NLS-1$
-									+ UpdateUI.getString("InstallWizard.retry")); //$NON-NLS-1$
-							if (retry)
-								continue;
-					}
-					UpdateUI.logException(e);
-					return false;
-				} catch (InterruptedException e) {
-					return false;
-				}
-			} while (retry);
-			return true;
-		} finally {
-			isRunning = false;
-		}
-	}
-
-	public void addPages() {
-		searchRunner = new SearchRunner(getShell(), getContainer());
-
-		if (searchRequest == null && jobs == null) {
-			modePage = new ModeSelectionPage(searchRunner);
-			addPage(modePage);
-			sitePage = new SitePage(searchRunner);
-			addPage(sitePage);
-		} else {
-			searchRunner.setSearchProvider(this);
-			if (jobs != null)
-				searchRunner.setNewSearchNeeded(false);
-		}
-		reviewPage = new ReviewPage(searchRunner, jobs);
-		searchRunner.setResultCollector(reviewPage);
-		addPage(reviewPage);
-
-		try {
-//			config = UpdateUtils.createInstallConfiguration();
-			config = SiteManager.getLocalSite().getCurrentConfiguration();
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-		}
-
-		licensePage = new LicensePage(true);
-		addPage(licensePage);
-		optionalFeaturesPage = new OptionalFeaturesPage(config);
-		addPage(optionalFeaturesPage);
-		targetPage = new TargetPage(config);
-		addPage(targetPage);
-	}
-
-	private void saveSettings() {
-		if (modePage != null)
-			modePage.saveSettings();
-	}
-
-	private boolean isPageRequired(IWizardPage page) {
-		if (page == null)
-			return false;
-			
-		if (page.equals(licensePage)) {
-			return OperationsManager.hasSelectedJobsWithLicenses(
-				reviewPage.getSelectedJobs());
-		}
-		if (page.equals(optionalFeaturesPage)) {
-			return OperationsManager.hasSelectedJobsWithOptionalFeatures(
-				reviewPage.getSelectedJobs());
-		}
-		if (page.equals(targetPage)) {
-			return reviewPage.getSelectedJobs().length > 0;
-		}
-		return true;
-	}
-
-	public IWizardPage getNextPage(IWizardPage page) {
-		IWizardPage[] pages = getPages();
-		boolean start = false;
-		IWizardPage nextPage = null;
-
-		if (modePage != null && page.equals(modePage)) {
-			boolean update = modePage.isUpdateMode();
-			if (update)
-				return reviewPage;
-			else
-				return sitePage;
-		}
-		if (sitePage != null && page.equals(sitePage))
-			return reviewPage;
-
-		if (page.equals(reviewPage)) {
-			updateDynamicPages();
-		}
-
-		for (int i = 0; i < pages.length; i++) {
-			if (pages[i].equals(page)) {
-				start = true;
-			} else if (start) {
-				if (isPageRequired(pages[i])) {
-					nextPage = pages[i];
-					break;
-				}
-			}
-		}
-		return nextPage;
-	}
-
-	private void updateDynamicPages() {
-		if (licensePage != null) {
-			IInstallFeatureOperation[] licenseJobs =
-				OperationsManager.getSelectedJobsWithLicenses(
-					reviewPage.getSelectedJobs());
-			licensePage.setJobs(licenseJobs);
-		}
-		if (optionalFeaturesPage != null) {
-			IInstallFeatureOperation[] optionalJobs =
-				OperationsManager.getSelectedJobsWithOptionalFeatures(
-					reviewPage.getSelectedJobs());
-			optionalFeaturesPage.setJobs(optionalJobs);
-		}
-		if (targetPage != null) {
-			IInstallFeatureOperation[] installJobs =
-				reviewPage.getSelectedJobs();
-			targetPage.setJobs(installJobs);
-		}
-	}
-
-	public boolean canFinish() {
-		IWizardPage page = getContainer().getCurrentPage();
-		return page.equals(targetPage) && page.isPageComplete();
-	}
-
-	private void preserveOriginatingURLs(
-		IFeature feature,
-		IFeatureReference[] optionalFeatures) {
-		// walk the hieararchy and preserve the originating URL
-		// for all the optional features that are not chosen to
-		// be installed.
-		URL url = feature.getSite().getURL();
-		try {
-			IIncludedFeatureReference[] irefs =
-				feature.getIncludedFeatureReferences();
-			for (int i = 0; i < irefs.length; i++) {
-				IIncludedFeatureReference iref = irefs[i];
-				boolean preserve = false;
-				if (iref.isOptional()) {
-					boolean onTheList = false;
-					for (int j = 0; j < optionalFeatures.length; j++) {
-						if (optionalFeatures[j].equals(iref)) {
-							//was on the list
-							onTheList = true;
-							break;
-						}
-					}
-					if (!onTheList)
-						preserve = true;
-				}
-				if (preserve) {
-					try {
-						String id =
-							iref.getVersionedIdentifier().getIdentifier();
-						UpdateUI.setOriginatingURL(id, url);
-					} catch (CoreException e) {
-						// Silently ignore
-					}
-				} else {
-					try {
-						IFeature ifeature = iref.getFeature(null);
-						preserveOriginatingURLs(ifeature, optionalFeatures);
-					} catch (CoreException e) {
-						// Silently ignore
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// Silently ignore
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperationListener#afterExecute(org.eclipse.update.operations.IOperation)
-	 */
-	public boolean afterExecute(IOperation operation, Object data) {
-		if (!(operation instanceof IInstallFeatureOperation))
-			return true;
-		IInstallFeatureOperation job = (IInstallFeatureOperation) operation;
-		IFeature oldFeature = job.getOldFeature();
-		if (oldFeature == null && job.getOptionalFeatures() != null)
-			preserveOriginatingURLs(
-				job.getFeature(),
-				job.getOptionalFeatures());
-
-		installCount++;
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.operations.IOperationListener#beforeExecute(org.eclipse.update.operations.IOperation)
-	 */
-	public boolean beforeExecute(IOperation operation, Object data) {
-		//		if (operation instanceof IBatchOperation
-		//			&& data != null
-		//			&& data instanceof ArrayList) {
-		//
-		//			DuplicateConflictsDialog2 dialog =
-		//				new DuplicateConflictsDialog2(getShell(), (ArrayList) data);
-		//			if (dialog.open() != 0)
-		//				return false;
-		//		}
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.internal.ui.wizards.ISearchProvider2#getSearchRequest()
-	 */
-	public UpdateSearchRequest getSearchRequest() {
-		return searchRequest;
-	}
-
-	public static synchronized boolean isRunning() {
-		return isRunning;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LicensePage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LicensePage.java
deleted file mode 100644
index f98c6ea..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LicensePage.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.help.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.operations.*;
-
-public class LicensePage extends WizardPage implements IDynamicPage {
-	private static final String KEY_TITLE = "InstallWizard.LicensePage.title"; //$NON-NLS-1$
-	private static final String KEY_DESC = "InstallWizard.LicensePage.desc"; //$NON-NLS-1$
-	private static final String KEY_DESC2 = "InstallWizard.LicensePage.desc2"; //$NON-NLS-1$
-	private static final String KEY_ACCEPT = "InstallWizard.LicensePage.accept"; //$NON-NLS-1$
-	private static final String KEY_DECLINE = "InstallWizard.LicensePage.decline"; //$NON-NLS-1$
-	private static final String KEY_ACCEPT2 = "InstallWizard.LicensePage.accept2"; //$NON-NLS-1$
-	private static final String KEY_DECLINE2 = "InstallWizard.LicensePage.decline2"; //$NON-NLS-1$
-	private boolean multiLicenseMode = false;
-	private IInstallFeatureOperation[] jobs;
-	private Text text;
-	private Table table;
-
-	/**
-	 * Constructor for LicensePage2
-	 */
-	public LicensePage(boolean multiLicenseMode) {
-		super("License"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString(KEY_TITLE));
-		setPageComplete(false);
-		this.multiLicenseMode = multiLicenseMode;
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-		setDescription(
-			UpdateUI.getString(
-				multiLicenseMode ? KEY_DESC2 : KEY_DESC));
-	}
-	public void dispose() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-
-	public LicensePage(IInstallFeatureOperation job) {
-		this(false);
-		setJobs(new IInstallFeatureOperation[] { job });
-	}
-
-	public void setJobs(IInstallFeatureOperation[] jobs) {
-		this.jobs = jobs;
-	}
-
-	public void createControl(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		client.setLayoutData(new GridData(GridData.FILL_BOTH));
-		GridLayout layout = new GridLayout();
-		client.setLayout(layout);
-		
-		WorkbenchHelp.setHelp(client, "org.eclipse.update.ui.LicensePage2"); //$NON-NLS-1$
-
-		if (multiLicenseMode) {
-			layout.numColumns = 3;
-			layout.makeColumnsEqualWidth = true;
-
-			table = new Table(client, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-
-			table.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (e.item != null) {
-						Object data = e.item.getData();
-						text.setText((data == null) ? "" : (String) data); //$NON-NLS-1$
-					}
-				}
-			});
-			table.setLayoutData(new GridData(GridData.FILL_BOTH));
-		}
-		text =
-			new Text(
-				client,
-				SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY);
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		if (multiLicenseMode)
-			gd.horizontalSpan = 2;
-		text.setLayoutData(gd);
-		text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-
-		Composite buttonContainer = new Composite(client, SWT.NULL);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		if (multiLicenseMode)
-			gd.horizontalSpan = 3;
-		buttonContainer.setLayout(new GridLayout());
-		buttonContainer.setLayoutData(gd);
-
-		final Button acceptButton = new Button(buttonContainer, SWT.RADIO);
-		acceptButton.setText(
-			UpdateUI.getString(multiLicenseMode ? KEY_ACCEPT2 : KEY_ACCEPT));
-		acceptButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setPageComplete(acceptButton.getSelection());
-			}
-		});
-		Button declineButton = new Button(buttonContainer, SWT.RADIO);
-		declineButton.setText(
-			UpdateUI.getString(multiLicenseMode ? KEY_DECLINE2 : KEY_DECLINE));
-		declineButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setPageComplete(acceptButton.getSelection());
-			}
-		});
-		setControl(client);
-		
-		Dialog.applyDialogFont(parent);
-	}
-
-	public void setVisible(boolean visible) { // TO DO: Optimize out the case where a feature does not have a license?
-		if (visible) {
-			if (multiLicenseMode) {
-				TableItem item;
-				for (int i = 0; i < jobs.length; i++) {
-					IFeature feature = jobs[i].getFeature();
-					item = new TableItem(table, SWT.NONE);
-					String label =
-						feature.getLabel()
-							+ " " //$NON-NLS-1$
-							+ feature.getVersionedIdentifier().getVersion().toString();
-					item.setText(label);
-					item.setImage(
-						UpdateUI.getDefault().getLabelProvider().get(
-							feature.isPatch()
-								? UpdateUIImages.DESC_EFIX_OBJ
-								: UpdateUIImages.DESC_FEATURE_OBJ));
-					String license = feature.getLicense().getAnnotation();
-					// Question: Can this ever be null? What is the runtime cost?
-					item.setData(license);
-				}
-
-				table.setSelection(0);
-			}
-			showLicenseText();
-		} else {
-			if (multiLicenseMode) {
-				TableItem items[] = table.getItems();
-				for (int i = items.length - 1; i >= 0; i--) {
-					table.getItem(i).dispose();
-				}
-			}
-		}
-		super.setVisible(visible);
-	}
-
-	private void showLicenseText() {
-		if (!multiLicenseMode) {
-			text.setText(jobs[0].getFeature().getLicense().getAnnotation());
-			return;
-		}
-		TableItem[] selectedItems = table.getSelection();
-		if (selectedItems.length == 0) {
-			text.setText(""); //$NON-NLS-1$
-		} else {
-			Object data = selectedItems[0].getData();
-			text.setText((data == null) ? "" : (String) data); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LocalSiteSelector.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LocalSiteSelector.java
deleted file mode 100644
index af9601d..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/LocalSiteSelector.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.internal.ui.wizards;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.zip.*;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-
-/**
- */
-public class LocalSiteSelector {
-
-	/**
-	 * 
-	 */
-	static String lastLocation = null;
-	public LocalSiteSelector() {
-		super();
-	}
-	public static SiteBookmark getLocaLSite(Shell parent) {
-		DirectoryDialog dialog = new DirectoryDialog(parent);
-		dialog.setMessage(
-			UpdateUI.getString("LocalSiteSelector.dialogMessage")); //$NON-NLS-1$
-		dialog.setFilterPath(lastLocation);
-		String dir = dialog.open();
-
-		SiteBookmark siteBookmark = null;
-		while (dir != null && siteBookmark == null) {
-			File dirFile = new File(dir);
-			if (isDirSite(dirFile)) {
-				siteBookmark = createDirSite(dirFile);
-				lastLocation = dir;
-			} else {
-				MessageDialog.openInformation(
-					parent,
-					UpdateUI.getString("LocalSiteSelector.dirInfoTitle"), //$NON-NLS-1$
-					UpdateUI.getString("LocalSiteSelector.dirInfoMessage")); //$NON-NLS-1$
-				dialog.setFilterPath(dir);
-				dir = dialog.open();
-			}
-		}
-		return siteBookmark;
-	}
-	public static SiteBookmark getLocaLZippedSite(Shell parent) {
-		FileDialog dialog = new FileDialog(parent);
-		dialog.setText(
-			UpdateUI.getString("LocalSiteSelector.dialogMessagezip")); //$NON-NLS-1$
-		//dialog.setFilterExtensions(new String[] { "*.zip", "*.jar" });
-		// //$NON-NLS-1$
-		dialog.setFilterExtensions(new String[] { "*.jar;*.zip" }); //$NON-NLS-1$
-
-		SiteBookmark siteBookmark = null;
-
-		String zip = dialog.open();
-		while (zip != null && siteBookmark == null) {
-			File zipF = new File(zip);
-			if (isZipSite(zipF)) {
-				siteBookmark = createZipSite(zipF);
-			} else {
-				MessageDialog.openInformation(
-					parent,
-					UpdateUI.getString("LocalSiteSelector.zipInfoTitle"), //$NON-NLS-1$
-					UpdateUI.getString("LocalSiteSelector.zipInfoMessage")); //$NON-NLS-1$
-				zip = dialog.open();
-			}
-		}
-		return siteBookmark;
-	}
-	/**
-	 * Returns true the zip file contains an update site
-	 * 
-	 * @param file
-	 * @return
-	 */
-	static boolean isZipSite(File file) {
-		if (!file.getName().toLowerCase().endsWith(".zip") //$NON-NLS-1$
-			&& !file.getName().toLowerCase().endsWith(".jar")) { //$NON-NLS-1$
-			return false;
-		}
-
-		ZippedSiteValidator validator = new ZippedSiteValidator(file);
-		BusyIndicator.showWhile(
-			UpdateUI.getActiveWorkbenchShell().getDisplay(),
-			validator);
-		return validator.isValid();
-	}
-
-	/**
-	 * Returns true if the specified dir contains an update site
-	 * 
-	 * @param dir
-	 * @return
-	 */
-	static boolean isDirSite(File dir) {
-		File siteXML = new File(dir, "site.xml"); //$NON-NLS-1$
-		File featuresDir = new File(dir, "features"); //$NON-NLS-1$
-		File pluginsDir = new File(dir, "plugins"); //$NON-NLS-1$
-		return siteXML.exists()
-			|| featuresDir.exists()
-			&& featuresDir.isDirectory()
-			&& pluginsDir.exists()
-			&& pluginsDir.isDirectory();
-	}
-
-	/**
-	 * Creates a bookmark to a zipped site
-	 * 
-	 * @param file
-	 * @return
-	 */
-	static SiteBookmark createZipSite(File file) {
-		try {
-			URL fileURL = new URL("file", null, file.getAbsolutePath()); //$NON-NLS-1$
-			URL url =
-				new URL(
-					"jar:" //$NON-NLS-1$
-						+ fileURL.toExternalForm().replace('\\', '/')
-						+ "!/"); //$NON-NLS-1$
-			SiteBookmark site = new SiteBookmark(file.getName(), url, false);
-			site.setLocal(true);
-			return site;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Creates a bookmark to a site on the file system
-	 * 
-	 * @param file
-	 * @return
-	 */
-	static SiteBookmark createDirSite(File file) {
-		try {
-			URL url = file.toURL();
-			String siteName = file.getAbsolutePath();
-			SiteBookmark site = new SiteBookmark(siteName, url, false);
-			site.setLocal(true);
-			return site;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	static class ZippedSiteValidator implements Runnable {
-		File file;
-		boolean valid = false;
-		public ZippedSiteValidator(File file) {
-			this.file = file;
-		}
-		public void run() {
-			ZipFile siteZip = null;
-			try {
-				// check if the zip file contains site.xml
-				siteZip = new ZipFile(file);
-				if (siteZip.getEntry("site.xml") != null) { //$NON-NLS-1$
-					valid = true;
-					return;
-				}
-
-				boolean hasFeatures = false;
-				boolean hasPlugins = false;
-				for (Enumeration enum = siteZip.entries();
-					enum.hasMoreElements();
-					) {
-					ZipEntry zEntry = (ZipEntry) enum.nextElement();
-					if (!hasFeatures
-						&& zEntry.getName().startsWith("features")) { //$NON-NLS-1$
-						hasFeatures = true;
-					}
-					if (!hasPlugins
-						&& zEntry.getName().startsWith("plugins")) { //$NON-NLS-1$
-						hasPlugins = true;
-					}
-					if (hasFeatures && hasPlugins) {
-						valid = true;
-						return;
-					}
-				}
-			} catch (Exception e) {
-			} finally {
-				try {
-					if (siteZip != null) {
-						siteZip.close();
-					}
-				} catch (IOException ioe) {
-				}
-			}
-
-		}
-		/**
-		 * @return Returns the valid. */
-		public boolean isValid() {
-			return valid;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
deleted file mode 100644
index 62bd216..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.operations.UpdateUtils;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.search.*;
-
-/**
- */
-public class ModeSelectionPage extends BannerPage implements ISearchProvider {
-	private boolean updateMode=true;
-	private Button updatesButton;
-	private Button newFeaturesButton;
-	private UpdateSearchRequest searchRequest;
-	private SearchRunner searchRunner;
-	private static final String SECTION_ID = "ModeSelectionPage"; //$NON-NLS-1$
-	private static final String P_NEW_FEATURES_MODE = "new-features-mode"; //$NON-NLS-1$
-	
-	public ModeSelectionPage(SearchRunner searchRunner) {
-		super("modeSelection"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString("ModeSelectionPage.title")); //$NON-NLS-1$
-		setDescription(UpdateUI.getString("ModeSelectionPage.desc")); //$NON-NLS-1$
-		this.searchRunner = searchRunner;
-	}
-	
-	public UpdateSearchRequest getSearchRequest() {
-		initializeSearch();
-		return searchRequest;
-	}
-	
-	private IDialogSettings getSettings() {
-		IDialogSettings master = UpdateUI.getDefault().getDialogSettings();
-		IDialogSettings section = master.getSection(SECTION_ID);
-		if (section==null)
-			section = master.addNewSection(SECTION_ID);
-		return section;
-	}
-
-	private void initializeSearch() {
-		if (searchRequest!=null) return;
-		searchRequest = UpdateUtils.createNewUpdatesRequest(null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.update.internal.ui.wizards.BannerPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		updatesButton = new Button(composite, SWT.RADIO);
-		updatesButton.setText(UpdateUI.getString("ModeSelectionPage.updates")); //$NON-NLS-1$
-		boolean newFeaturesMode = getSettings().getBoolean(P_NEW_FEATURES_MODE);
-		updatesButton.setSelection(!newFeaturesMode);
-		updatesButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				switchMode();
-			}
-		});
-		newFeaturesButton = new Button(composite, SWT.RADIO);
-		newFeaturesButton.setSelection(newFeaturesMode);
-		newFeaturesButton.setText(UpdateUI.getString("ModeSelectionPage.newFeatures")); //$NON-NLS-1$
-		newFeaturesButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				switchMode();
-			}
-		});		
-		switchMode();
-		
-		Dialog.applyDialogFont(parent);
-		
-		return composite;
-	}
-	
-	public void saveSettings() {
-		boolean updateMode = updatesButton.getSelection();
-		getSettings().put(P_NEW_FEATURES_MODE, !updateMode);
-	}
-	
-	private void switchMode() {
-		updateMode = updatesButton.getSelection();
-		if (updateMode)
-			searchRunner.setSearchProvider(this);
-	}
-	
-	public boolean isUpdateMode() {
-		return updateMode;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdateSiteDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdateSiteDialog.java
deleted file mode 100644
index e5e309e..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdateSiteDialog.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import java.net.*;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-
-
-public class NewUpdateSiteDialog extends Dialog {
-	
-	protected Text name;
-	protected Text url;
-	private Button okButton;
-	/**
-	 * @param parentShell
-	 */
-	public NewUpdateSiteDialog(Shell parentShell) {
-		super(parentShell);
-	}
-	
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(
-				parent,
-				IDialogConstants.OK_ID,
-				IDialogConstants.OK_LABEL,
-				true);
-		createButton(
-			parent,
-			IDialogConstants.CANCEL_ID,
-			IDialogConstants.CANCEL_LABEL,
-			false);
-		
-		okButton.setEnabled(false);
-		
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		GridData data = new GridData();
-		data.widthHint = 350;
-		composite.setLayoutData(data);
-		
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(UpdateUI.getString("NewUpdateSiteDialog.name")); //$NON-NLS-1$
-		
-		name = new Text(composite, SWT.BORDER);
-		name.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		name.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				verifyComplete();
-			}
-		});
-		
-		label = new Label(composite, SWT.NONE);
-		label.setText(UpdateUI.getString("NewUpdateSiteDialog.url")); //$NON-NLS-1$
-		
-		url = new Text(composite, SWT.BORDER);
-		url.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		url.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				verifyComplete();
-			}
-		});
-		
-		initializeFields();
-		Dialog.applyDialogFont(composite);
-		return composite;
-	}
-	
-	protected void initializeFields() {
-		url.setText("http://"); //$NON-NLS-1$
-	}
-	
-	protected void okPressed() {
-		update();
-		super.okPressed();
-	}
-
-	protected void update() {
-		try {
-			UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-			SiteBookmark bookmark = new SiteBookmark(name.getText(), new URL(url.getText()), false);
-			model.addBookmark(bookmark);
-			model.saveBookmarks();
-		} catch (MalformedURLException e) {
-		}
-	}
-	
-	private void verifyComplete() {
-		if (okButton == null)
-			return;
-			
-		if (name.getText().trim().length() == 0 || url.getText().trim().length() == 0) {
-			okButton.setEnabled(false);
-			return;
-		}
-	
-		try {
-			URL newURL = new URL(URLDecoder.decode(url.getText().trim(), "UTF-8")); //$NON-NLS-1$
-			if (url.getEditable())
-				okButton.setEnabled(!newURL.getProtocol().equals("file")); //$NON-NLS-1$
-			else 
-				okButton.setEnabled(true);
-		} catch (Exception e) {
-			okButton.setEnabled(false);
-		}
-	}
-	
-
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewWebSiteDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewWebSiteDialog.java
deleted file mode 100644
index 003eeeb..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewWebSiteDialog.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import java.net.*;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-
-
-public class NewWebSiteDialog extends NewUpdateSiteDialog {
-
-	public NewWebSiteDialog(Shell parentShell) {
-		super(parentShell);
-	}
-	
-	protected void update() {
-		try {
-			UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-			SiteBookmark bookmark = new SiteBookmark(name.getText(), new URL(url.getText()), true);
-			model.addBookmark(bookmark);
-		} catch (MalformedURLException e) {
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java
deleted file mode 100644
index 2ca67bd..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java
+++ /dev/null

@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-import java.util.*;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.help.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.operations.*;
-
-public class OptionalFeaturesPage extends BannerPage implements IDynamicPage {
-	// NL keys
-	private static final String KEY_TITLE =
-		"InstallWizard.OptionalFeaturesPage.title"; //$NON-NLS-1$
-	private static final String KEY_DESC =
-		"InstallWizard.OptionalFeaturesPage.desc"; //$NON-NLS-1$
-	private static final String KEY_TREE_LABEL =
-		"InstallWizard.OptionalFeaturesPage.treeLabel"; //$NON-NLS-1$
-	private static final String KEY_SELECT_ALL =
-		"InstallWizard.OptionalFeaturesPage.selectAll"; //$NON-NLS-1$
-	private static final String KEY_DESELECT_ALL =
-		"InstallWizard.OptionalFeaturesPage.deselectAll"; //$NON-NLS-1$
-	private CheckboxTreeViewer treeViewer;
-	private Button selectAllButton;
-	private Button deselectAllButton;
-	private IInstallConfiguration config;
-	private JobRoot[] jobRoots;
-
-	class TreeContentProvider
-		extends DefaultContentProvider
-		implements ITreeContentProvider {
-
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof JobRoot) {
-				return ((JobRoot) parent).getElements();
-			}
-			if (parent instanceof FeatureHierarchyElement) {
-				FeatureHierarchyElement fe = (FeatureHierarchyElement) parent;
-				Object root = fe.getRoot();
-				boolean oldFeature = false;
-				if (root instanceof JobRoot) {
-					IInstallFeatureOperation job = ((JobRoot)root).getJob();
-					boolean patch = UpdateUtils.isPatch(job.getFeature());
-					oldFeature = job.getOldFeature() != null;
-					return fe.getChildren(oldFeature, patch, config);
-				}
-			}
-			return new Object[0];
-		}
-
-		public Object getParent(Object child) {
-			return null;
-		}
-
-		public boolean hasChildren(Object parent) {
-			return getChildren(parent).length > 0;
-		}
-
-		public Object[] getElements(Object input) {
-			if (jobRoots == null)
-				return new Object[0];
-			return jobRoots;
-		}
-	}
-
-	class TreeLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			if (obj instanceof JobRoot) {
-				IFeature feature = ((JobRoot) obj).getJob().getFeature();
-				return feature.getLabel()
-					+ " " //$NON-NLS-1$
-					+ feature.getVersionedIdentifier().getVersion().toString();
-			}
-			if (obj instanceof FeatureHierarchyElement) {
-				String name = ((FeatureHierarchyElement) obj).getLabel();
-				if (name != null)
-					return name;
-			}
-
-			return super.getText(obj);
-		}
-		public Image getImage(Object obj) {
-			return UpdateUI.getDefault().getLabelProvider().get(
-				UpdateUIImages.DESC_FEATURE_OBJ);
-		}
-	}
-
-	/**
-	 * Constructor for ReviewPage2
-	 */
-	public OptionalFeaturesPage(IInstallConfiguration config) {
-		super("OptionalFeatures"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString(KEY_TITLE));
-		setDescription(UpdateUI.getString(KEY_DESC));
-		this.config = config;
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-	}
-
-	public void setJobs(IInstallFeatureOperation[] jobs) {
-		jobRoots = new JobRoot[jobs.length];
-		for (int i = 0; i < jobs.length; i++) {
-			jobRoots[i] = new JobRoot(jobs[i]);
-		}
-	}
-
-	public void dispose() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-
-
-	public Control createContents(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 0;
-		client.setLayout(layout);
-
-		createCheckboxTreeViewer(client);
-
-		selectAllButton = new Button(client, SWT.PUSH);
-		selectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				selectAll(true);
-			}
-		});
-		selectAllButton.setText(UpdateUI.getString(KEY_SELECT_ALL));
-		GridData gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		selectAllButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(selectAllButton);
-
-		deselectAllButton = new Button(client, SWT.PUSH);
-		deselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				selectAll(false);
-			}
-		});
-		deselectAllButton.setText(UpdateUI.getString(KEY_DESELECT_ALL));
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		deselectAllButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(deselectAllButton);
-		WorkbenchHelp.setHelp(client, "org.eclipse.update.ui.MultiOptionalFeaturesPage2"); //$NON-NLS-1$
-		
-		Dialog.applyDialogFont(parent);
-		
-		return client;
-	}
-
-	private void createCheckboxTreeViewer(Composite parent) {
-		Label label = new Label(parent, SWT.NULL);
-		label.setText(UpdateUI.getString(KEY_TREE_LABEL));
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		treeViewer =
-			new CheckboxTreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.verticalSpan = 2;
-		treeViewer.getTree().setLayoutData(gd);
-		treeViewer.setContentProvider(new TreeContentProvider());
-		treeViewer.setLabelProvider(new TreeLabelProvider());
-		treeViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent e) {
-				handleChecked(e.getElement(), e.getChecked());
-			}
-		});
-		treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
-		treeViewer.setInput(this);
-	}
-
-	public void setVisible(boolean visible) {
-		if (visible) {
-			treeViewer.setInput(jobRoots);
-			initializeStates();
-		}
-		super.setVisible(visible);
-		if (visible) {
-			treeViewer.getTree().setFocus();
-		}		
-	}
-
-	private void initializeStates() {
-		ArrayList checked = new ArrayList();
-		ArrayList grayed = new ArrayList();
-		ArrayList editable = new ArrayList();
-
-		for (int i = 0; i < jobRoots.length; i++) {
-			checked.add(jobRoots[i]);
-			grayed.add(jobRoots[i]);
-			boolean update = jobRoots[i].getJob().getOldFeature() != null;
-			initializeStates(update, jobRoots[i].getElements(), checked, grayed, editable);
-		}
-		treeViewer.setCheckedElements(checked.toArray());
-		treeViewer.setGrayedElements(grayed.toArray());
-		selectAllButton.setEnabled(editable.size()>0);
-		deselectAllButton.setEnabled(editable.size()>0);
-	}
-
-	private void initializeStates(
-		boolean update,
-		Object[] elements,
-		ArrayList checked,
-		ArrayList grayed,
-		ArrayList editable) {
-
-		for (int i = 0; i < elements.length; i++) {
-			FeatureHierarchyElement element =
-				(FeatureHierarchyElement) elements[i];
-			if (element.isChecked())
-				checked.add(element);
-			if (!element.isEditable())
-				grayed.add(element);
-			else
-				editable.add(element);
-			initializeStates(update, element.getChildren(), checked, grayed, editable);
-		}
-	}
-
-	private void selectAll(boolean value) {
-		ArrayList selected = new ArrayList();
-		for (int i = 0; i < jobRoots.length; i++) {
-			IInstallFeatureOperation job = jobRoots[i].getJob();
-			selected.add(job);
-			Object[] elements = jobRoots[i].getElements();
-			for (int j = 0; j < elements.length; j++) {
-				FeatureHierarchyElement element = (FeatureHierarchyElement) elements[j];
-				selectAll(job.getOldFeature() != null, element, selected, value);
-			}
-		}
-		treeViewer.setCheckedElements(selected.toArray());
-	}
-
-	private void selectAll(
-		boolean update,
-		FeatureHierarchyElement ref,
-		ArrayList selected,
-		boolean value) {
-
-		if (!ref.isOptional()) {
-			selected.add(ref);
-		} else {
-			if (ref.isEditable()) {
-				ref.setChecked(value);
-				if (value)
-					selected.add(ref);
-			} else if (ref.isChecked()) {
-				selected.add(ref);
-			}
-		}
-		Object[] included = ref.getChildren();
-		for (int i = 0; i < included.length; i++) {
-			selectAll(update, (FeatureHierarchyElement) included[i], selected, value);
-		}
-	}
-
-	private void handleChecked(Object element, boolean checked) {
-		if (element instanceof JobRoot) {
-			treeViewer.setChecked(element, !checked);
-			return;
-		}
-		FeatureHierarchyElement fe = (FeatureHierarchyElement) element;
-
-		if (!fe.isEditable())
-			treeViewer.setChecked(element, !checked);
-		else {
-			// update the result
-			fe.setChecked(checked);
-		}
-	}
-	
-	public IFeature[] getUnconfiguredOptionalFeatures(IInstallFeatureOperation job, IConfiguredSite targetSite) {
-		for (int i = 0; i < jobRoots.length; i++) {
-			if (job.equals(jobRoots[i].getJob())) {
-				return jobRoots[i].getUnconfiguredOptionalFeatures(config, targetSite);
-			}
-		}
-		return new IFeature[0];
-	}
-	
-	public IFeatureReference[] getCheckedOptionalFeatures(IInstallFeatureOperation currentJob) {
-		HashSet set = new HashSet();
-		JobRoot jobRoot = null;
-
-		for (int i = 0; i < jobRoots.length; i++) {
-			if (currentJob.equals(jobRoots[i].getJob())) {
-				jobRoot = jobRoots[i];
-				break;
-			}
-		}
-		if (jobRoot == null)
-			return new IFeatureReference[0];
-
-		IInstallFeatureOperation job = jobRoot.getJob();
-		boolean update = job.getOldFeature() != null;
-		boolean patch = UpdateUtils.isPatch(job.getFeature());
-		FeatureHierarchyElement[] elements = jobRoot.getElements();
-		for (int i = 0; i < elements.length; i++) {
-			elements[i].addCheckedOptionalFeatures(update, patch, config, set);
-		}
-		return (IFeatureReference[]) set.toArray(new IFeatureReference[set.size()]);
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizard.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizard.java
deleted file mode 100644
index c1995ba..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizard.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package org.eclipse.update.internal.ui.wizards;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.internal.ui.UpdateUI;
-import org.eclipse.update.internal.ui.UpdateUIImages;
-
-
-public class ReplaceFeatureVersionWizard extends Wizard {
-	private ReplaceFeatureVersionWizardPage page;
-
-	public ReplaceFeatureVersionWizard(IFeature currentFeature, IFeature[] features) {
-		setWindowTitle(UpdateUI.getString("ReplaceFeatureVersionWizard.title")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(UpdateUIImages.DESC_UPDATE_WIZ);
-		page = new ReplaceFeatureVersionWizardPage(currentFeature, features);
-	}
-
-	public void addPages() {
-		addPage(page);
-	}
-	
-	public boolean performFinish() {
-		return page.performFinish();
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizardPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizardPage.java
deleted file mode 100644
index 3ebeed4..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReplaceFeatureVersionWizardPage.java
+++ /dev/null

@@ -1,167 +0,0 @@
-package org.eclipse.update.internal.ui.wizards;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.operations.*;
-
-
-public class ReplaceFeatureVersionWizardPage extends WizardPage {
-	
-	private IFeature currentFeature;
-	private IFeature[] features;
-	private TableViewer tableViewer;
-
-	public ReplaceFeatureVersionWizardPage(IFeature currentFeature, IFeature[] features) {
-		super("SwapFeature"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString("ReplaceFeatureVersionWizardPage.title")); //$NON-NLS-1$
-		setDescription(UpdateUI.getString("ReplaceFeatureVersionWizardPage.desc")); //$NON-NLS-1$
-		this.currentFeature = currentFeature;
-		this.features = features;
-	}
-
-	public void createControl(Composite parent) {
-		Composite tableContainer = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		tableContainer.setLayout(layout);
-
-		Label label = new Label(tableContainer, SWT.NONE);
-		label.setText(UpdateUI.getString("ReplaceFeatureVersionWizardPage.label")); //$NON-NLS-1$
-
-		Table table = new Table(tableContainer, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		tableViewer = new TableViewer(table);
-		tableViewer.setLabelProvider(new LabelProvider() {
-			public Image getImage(Object element) {
-				UpdateLabelProvider provider =
-					UpdateUI.getDefault().getLabelProvider();
-				return provider.get(UpdateUIImages.DESC_UNCONF_FEATURE_OBJ, 0);
-			}
-			public String getText(Object element) {
-				IFeature feature = (IFeature) element;
-				return feature.getLabel() + " " + feature.getVersionedIdentifier().getVersion().toString(); //$NON-NLS-1$
-			}
-		});
-		
-		tableViewer.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object element) {
-				return features;
-			}
-			public void dispose() {
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		
-		tableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				PluginVersionIdentifier v1 = ((IFeature)e1).getVersionedIdentifier().getVersion();
-				PluginVersionIdentifier v2 = ((IFeature)e2).getVersionedIdentifier().getVersion();
-				return v1.isGreaterOrEqualTo(v2) ? -1 : 1;
-			}
-		});
-		
-		tableViewer.addFilter(new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				String version =
-					((IFeature) element).getVersionedIdentifier().getVersion().toString();
-				return !version.equals(
-					currentFeature.getVersionedIdentifier().getVersion().toString());
-			}
-		});
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection ssel = (IStructuredSelection)tableViewer.getSelection();
-				if (ssel == null)
-					return;
-				IFeature chosenFeature = (IFeature)ssel.getFirstElement();
-				IStatus validationStatus =
-					OperationsManager.getValidator().validatePendingReplaceVersion(currentFeature, chosenFeature);
-				setPageComplete(validationStatus == null || validationStatus.getCode() == IStatus.WARNING);
-		
-				if (validationStatus == null) {
-					setErrorMessage(null);
-				} else if (validationStatus.getCode() == IStatus.WARNING) {
-					setErrorMessage(null);
-					setMessage(validationStatus.getMessage(), IMessageProvider.WARNING);
-				} else {
-					setErrorMessage(validationStatus.getMessage());
-				}
-			}
-		});
-		
-		tableViewer.setInput(currentFeature);
-		tableViewer.getTable().select(0);
-		setControl(tableContainer);
-		
-		Dialog.applyDialogFont(tableContainer);
-	}
-
-	public boolean performFinish() {
-		IStructuredSelection ssel = (IStructuredSelection)tableViewer.getSelection();
-		IFeature chosenFeature = (IFeature)ssel.getFirstElement();
-		
-		return swap(currentFeature, chosenFeature);
-	}
-	
-	private boolean swap(final IFeature currentFeature, final IFeature anotherFeature) {
-//		IStatus status =
-//			OperationsManager.getValidator().validatePendingReplaceVersion(currentFeature, anotherFeature);
-//		if (status != null) {
-//			ErrorDialog.openError(
-//				UpdateUI.getActiveWorkbenchShell(),
-//				null,
-//				null,
-//				status);
-//			return false;
-//		}
-
-		IRunnableWithProgress operation = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-				throws InvocationTargetException {
-				IOperation revertOperation =
-					OperationsManager
-						.getOperationFactory()
-						.createReplaceFeatureVersionOperation(currentFeature, anotherFeature);
-				try {
-					boolean restartNeeded = revertOperation.execute(monitor, null);
-					UpdateUI.requestRestart(restartNeeded);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, operation);
-			return true;
-		} catch (InvocationTargetException e) {
-			Throwable targetException = e.getTargetException();
-			if (targetException instanceof InstallAbortedException) {
-				return true;
-			} else {
-				UpdateUI.logException(e);
-			}
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ResizableWizardDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ResizableWizardDialog.java
deleted file mode 100644
index 14adaf8..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ResizableWizardDialog.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.internal.ui.wizards;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-
-public class ResizableWizardDialog extends WizardDialog {
-	/**
-	 * Creates a new resizable wizard dialog.
-	 */
-	public ResizableWizardDialog(Shell parent, IWizard wizard) {
-		super(parent, wizard);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-	}	
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizard.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizard.java
deleted file mode 100644
index f2b84f6..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizard.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.internal.ui.wizards;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.UpdateUI;
-
-/**
- * @author Wassim Melhem
- */
-public class RevertConfigurationWizard extends Wizard {
-	
-	RevertConfigurationWizardPage page;
-
-	public RevertConfigurationWizard() {
-		super();
-		setWindowTitle(UpdateUI.getString("RevertConfigurationWizard.wtitle")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(UpdateUIImages.DESC_CONFIG_WIZ);
-	}
-	
-	public void addPages() {
-		page = new RevertConfigurationWizardPage();
-		addPage(page);
-	}
-
-	public boolean performFinish() {
-		return page.performFinish();
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizardPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizardPage.java
deleted file mode 100644
index 2f10dc3..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/RevertConfigurationWizardPage.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.operations.*;
-
-
-public class RevertConfigurationWizardPage extends WizardPage {
-
-	private TableViewer activitiesViewer;
-	private TableViewer configViewer;
-	public static Color blueBGColor;
-	private SashForm sashForm;
-
-	public RevertConfigurationWizardPage() {
-		super("RevertConfiguration"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString("RevertConfigurationWizardPage.title")); //$NON-NLS-1$
-		setDescription(UpdateUI.getString("RevertConfigurationWizardPage.desc")); //$NON-NLS-1$
-		blueBGColor = new Color(null, 238,238,255);
-		
-	}
-
-	public void createControl(Composite parent) {
-		sashForm = new SashForm(parent, SWT.VERTICAL);
-		sashForm.setLayout(new GridLayout());
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createConfigurationsSection(sashForm);
-		createActivitiesSection(sashForm);
-		setControl(sashForm);
-
-		Object element = configViewer.getElementAt(0);
-		if (element != null)
-			configViewer.setSelection(new StructuredSelection(element));
-		Dialog.applyDialogFont(sashForm);
-	}
-
-	private void createConfigurationsSection(Composite parent) {
-		Composite tableContainer = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		tableContainer.setLayout(layout);
-		tableContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label label = new Label(tableContainer, SWT.NONE);
-		label.setText(UpdateUI.getString("RevertConfigurationWizardPage.label")); //$NON-NLS-1$
-
-		Table table = new Table(tableContainer, SWT.BORDER | SWT.V_SCROLL);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		configViewer = new TableViewer(table);
-		configViewer.setLabelProvider(new LabelProvider() {
-			public Image getImage(Object element) {
-				UpdateLabelProvider provider =
-					UpdateUI.getDefault().getLabelProvider();
-				return provider.get(UpdateUIImages.DESC_CONFIG_OBJ, 0);
-			}
-			public String getText(Object element) {
-				return Utilities.format(
-					((IInstallConfiguration) element).getCreationDate());
-			}
-
-		});
-		configViewer.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object element) {
-				ArrayList result = new ArrayList();
-				ILocalSite localSite = (ILocalSite) element;
-				IInstallConfiguration current =	localSite.getCurrentConfiguration();
-				IInstallConfiguration[] configurations = localSite.getConfigurationHistory();
-				for (int i = configurations.length - 1; i >= 0; i--) {
-					if (!current.equals(configurations[i])) {
-						result.add(configurations[i]);
-					}
-				}
-				return result.toArray();
-			}
-			
-			public void dispose() {
-			}
-
-			public void inputChanged(
-				Viewer viewer,
-				Object oldInput,
-				Object newInput) {
-			}
-
-		});
-
-		configViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				IStructuredSelection ssel =	(IStructuredSelection) e.getSelection();
-				InstallConfiguration currentConfig = (InstallConfiguration)ssel.getFirstElement();
-				activitiesViewer.setInput(currentConfig);
-				activitiesViewer.refresh();
-				TableItem[] items = activitiesViewer.getTable().getItems();
-				for (int i =0; i<items.length; i++){
-					IActivity activity = (IActivity)items[i].getData();
-					// for now, we test exact config match. If needed, we can also compare dates, etc.
-					if (((InstallConfiguration)activity.getInstallConfiguration()).equals(currentConfig))
-						items[i].setBackground(blueBGColor);
-					else
-						items[i].setBackground(activitiesViewer.getControl().getBackground());
-				}
-			}
-		});
-
-		try {
-			configViewer.setInput(SiteManager.getLocalSite());
-		} catch (CoreException e1) {
-		}
-	}
-
-	private void createActivitiesSection(Composite parent) {
-		final Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.marginHeight = gridLayout.marginWidth = 0;
-		composite.setLayout(gridLayout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(gd);
-
-
-
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(
-			UpdateUI.getString("RevertConfigurationWizardPage.activities")); //$NON-NLS-1$
-		activitiesViewer = ActivitiesTableViewer.createViewer(composite, false);
-
-		TableLayout layout = new TableLayout();
-		layout.addColumnData(new ColumnWeightData(5, 20, false));
-		layout.addColumnData(new ColumnWeightData(30, 100, true));
-		layout.addColumnData(new ColumnWeightData(50, 183, true));
-		layout.addColumnData(new ColumnWeightData(50, 100, true));
-
-		activitiesViewer.getTable().setLayout(layout);
-
-		TableItem[] configs = configViewer.getTable().getItems();
-		if (configs.length >0)
-			activitiesViewer.setInput((InstallConfiguration)configs[0].getData());
-		
-		composite.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				int sashHeight = getSashForm().getSize().y;
-				int sashWidth = getSashForm().getSize().x;
-				if (composite.getSize().y > (sashHeight*0.85) && composite.getSize().x > (sashWidth*0.5)){
-					getSashForm().setOrientation(SWT.HORIZONTAL);
-				} else {
-					getSashForm().setOrientation(SWT.VERTICAL);
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		blueBGColor.dispose();
-	}
-	
-	public SashForm getSashForm(){
-		return sashForm;
-	}
-	public boolean performFinish() {
-		Shell shell = getContainer().getShell();
-		boolean result =
-			MessageDialog.openQuestion(
-				shell,
-				shell.getText(),
-				UpdateUI.getString("RevertConfigurationWizardPage.question")); //$NON-NLS-1$
-		if (!result)
-			return false;
-
-		boolean finish = performRevert();
-		if (finish) {
-			PlatformUI.getWorkbench().restart();
-		}
-		return finish;
-	}
-
-	public boolean performRevert() {
-
-		IStructuredSelection ssel =
-			(IStructuredSelection) configViewer.getSelection();
-		final IInstallConfiguration target =
-			(IInstallConfiguration) ssel.getFirstElement();
-
-		IStatus status =
-			OperationsManager.getValidator().validatePendingRevert(target);
-		if (status != null && status.getCode() == IStatus.ERROR) {
-			ErrorDialog.openError(
-				UpdateUI.getActiveWorkbenchShell(),
-				null,
-				null,
-				status);
-			return false;
-		}
-
-		IRunnableWithProgress operation = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-				throws InvocationTargetException {
-				IOperation revertOperation =
-					OperationsManager
-						.getOperationFactory()
-						.createRevertConfigurationOperation(
-						target,
-						new UIProblemHandler());
-				try {
-					revertOperation.execute(monitor, null);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, operation);
-			return true;
-		} catch (InvocationTargetException e) {
-			Throwable targetException = e.getTargetException();
-			if (targetException instanceof InstallAbortedException) {
-				return true;
-			} else {
-				UpdateUI.logException(e);
-			}
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReviewPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReviewPage.java
deleted file mode 100644
index 4923120..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ReviewPage.java
+++ /dev/null

@@ -1,779 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-import java.net.URL;
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.operations.UpdateUtils;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.SimpleFeatureAdapter;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-public class ReviewPage
-	extends BannerPage
-	implements IUpdateSearchResultCollector {
-
-	private ArrayList jobs;
-	private Label counterLabel;
-	private CheckboxTableViewer tableViewer;
-	private IStatus validationStatus;
-	private Collection problematicFeatures = new HashSet();
-	// feature that was recently selected or null
-	private IFeature newlySelectedFeature;
-	// 
-	private FeatureStatus lastDisplayedStatus;
-	private PropertyDialogAction propertiesAction;
-	private Text descLabel;
-	private Button statusButton;
-	private Button moreInfoButton;
-	private Button propertiesButton;
-	private Button filterCheck;
-	private ContainmentFilter filter = new ContainmentFilter();
-	private SearchRunner searchRunner;
-	private int LABEL_ORDER = 1;
-	private int VERSION_ORDER = 1;
-	private int PROVIDER_ORDER = 1;
-	class JobsContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-
-		public Object[] getElements(Object inputElement) {
-			return jobs.toArray();
-		}
-	}
-
-	class JobsLabelProvider
-		extends SharedLabelProvider
-		implements ITableLabelProvider {
-		public String getColumnText(Object obj, int column) {
-			IInstallFeatureOperation job = (IInstallFeatureOperation) obj;
-			IFeature feature = job.getFeature();
-
-			switch (column) {
-				case 0 :
-					return feature.getLabel();
-				case 1 :
-					return feature
-						.getVersionedIdentifier()
-						.getVersion()
-						.toString();
-				case 2 :
-					return feature.getProvider();
-			}
-			return ""; //$NON-NLS-1$
-		}
-		public Image getColumnImage(Object obj, int column) {
-			if (column == 0) {
-				IFeature feature = ((IInstallFeatureOperation) obj).getFeature();
-				boolean patch = feature.isPatch();
-				
-				boolean problematic=problematicFeatures.contains(feature);
-				
-				if (patch) {
-					return get(UpdateUIImages.DESC_EFIX_OBJ, problematic? F_ERROR : 0);
-				} else {
-					return get(UpdateUIImages.DESC_FEATURE_OBJ, problematic? F_ERROR : 0);
-				}
-			}
-			return null;
-		}
-	}
-
-	class ContainmentFilter extends ViewerFilter {
-		public boolean select(Viewer v, Object parent, Object child) {
-			return !isContained((IInstallFeatureOperation) child);
-		}
-		private boolean isContained(IInstallFeatureOperation job) {
-			VersionedIdentifier vid = job.getFeature().getVersionedIdentifier();
-
-			for (int i = 0; i < jobs.size(); i++) {
-				IInstallFeatureOperation candidate = (IInstallFeatureOperation) jobs.get(i);
-				if (candidate.equals(job))
-					continue;
-				IFeature feature = candidate.getFeature();
-				if (includes(feature, vid,null))
-					return true;
-			}
-			return false;
-		}
-		private boolean includes(IFeature feature, VersionedIdentifier vid, ArrayList cycleCandidates) {
-			try {
-				if (cycleCandidates == null)
-					cycleCandidates = new ArrayList();
-				if (cycleCandidates.contains(feature))
-					throw Utilities.newCoreException(UpdateUI.getFormattedMessage("InstallWizard.ReviewPage.cycle", feature.getVersionedIdentifier().toString()), null); //$NON-NLS-1$
-				else
-					cycleCandidates.add(feature);
-				IFeatureReference[] irefs =
-					feature.getIncludedFeatureReferences();
-				for (int i = 0; i < irefs.length; i++) {
-					IFeatureReference iref = irefs[i];
-					IFeature ifeature = iref.getFeature(null);
-					VersionedIdentifier ivid =
-						ifeature.getVersionedIdentifier();
-					if (ivid.equals(vid))
-						return true;
-					if (includes(ifeature, vid, cycleCandidates))
-						return true;
-				}
-				return false;
-			} catch (CoreException e) {
-				return false;
-			} finally {
-				// after this feature has been DFS-ed, it is no longer a cycle candidate
-				cycleCandidates.remove(feature);
-			}
-		}
-	}
-
-	class FeaturePropertyDialogAction extends PropertyDialogAction {
-		private IStructuredSelection selection;
-
-		public FeaturePropertyDialogAction(
-			Shell shell,
-			ISelectionProvider provider) {
-			super(shell, provider);
-		}
-
-		public IStructuredSelection getStructuredSelection() {
-			return selection;
-		}
-
-		public void selectionChanged(IStructuredSelection selection) {
-			this.selection = selection;
-		}
-
-	}
-	/**
-	 * Constructor for ReviewPage2
-	 */
-	public ReviewPage(SearchRunner searchRunner, ArrayList jobs) {
-		super("Review"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString("InstallWizard.ReviewPage.title")); //$NON-NLS-1$
-		setDescription(UpdateUI.getString("InstallWizard.ReviewPage.desc")); //$NON-NLS-1$
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-		this.searchRunner = searchRunner;
-		setBannerVisible(false);
-		this.jobs = jobs;
-		if (this.jobs==null) this.jobs = new ArrayList();
-	}
-
-	public void dispose() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		
-		// when searching for updates, only nested patches can be shown.
-		// when searching for features, features and patches can be shown
-		String filterText = filterCheck.getText();
-		String filterFeatures = UpdateUI.getString("InstallWizard.ReviewPage.filterFeatures"); //$NON-NLS-1$
-		String filterPatches = UpdateUI.getString("InstallWizard.ReviewPage.filterPatches"); //$NON-NLS-1$
-		boolean isUpdateSearch = searchRunner.getSearchProvider() instanceof ModeSelectionPage;
-		if (isUpdateSearch && filterText.equals(filterFeatures))
-			filterCheck.setText(filterPatches);
-		else if ( !isUpdateSearch && filterText.equals(filterPatches))
-			filterCheck.setText(filterFeatures);
-		
-		if (visible && searchRunner.isNewSearchNeeded()) {
-			jobs.clear();
-			tableViewer.refresh();
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					searchRunner.runSearch();
-					performPostSearchProcessing();
-				}
-			});
-		}
-	}
-
-	private void performPostSearchProcessing() {
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {
-				if (tableViewer != null) {
-					tableViewer.refresh();
-					tableViewer.getTable().layout(true);
-					if (searchRunner.getSearchProvider() instanceof ModeSelectionPage) {
-						selectTrueUpdates();
-					}
-				}
-				pageChanged();
-			}
-		});
-	}
-	
-	private void selectTrueUpdates() {
-		ArrayList trueUpdates = new ArrayList();
-		for (int i=0; i<jobs.size(); i++) {
-			IInstallFeatureOperation job = (IInstallFeatureOperation)jobs.get(i);
-			if (!UpdateUtils.isPatch(job.getFeature()))
-				trueUpdates.add(job);
-		}
-		tableViewer.setCheckedElements(trueUpdates.toArray()); 
-	}	
-
-	/**
-	 * @see DialogPage#createControl(Composite)
-	 */
-	public Control createContents(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 0;
-		client.setLayout(layout);
-		Label label = new Label(client, SWT.NULL);
-		label.setText(UpdateUI.getString("InstallWizard.ReviewPage.label")); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		createTable(client);
-
-		Composite buttonContainer = new Composite(client, SWT.NULL);
-		gd = new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		buttonContainer.setLayout(layout);
-
-		Button button = new Button(buttonContainer, SWT.PUSH);
-		button.setText(UpdateUI.getString("InstallWizard.ReviewPage.selectAll")); //$NON-NLS-1$
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.VERTICAL_ALIGN_BEGINNING);
-		button.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(button);
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelectAll(true);
-			}
-		});
-
-		button = new Button(buttonContainer, SWT.PUSH);
-		button.setText(UpdateUI.getString("InstallWizard.ReviewPage.deselectAll")); //$NON-NLS-1$
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.VERTICAL_ALIGN_BEGINNING);
-		button.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(button);
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelectAll(false);
-			}
-		});
-
-		moreInfoButton = new Button(buttonContainer, SWT.PUSH);
-		moreInfoButton.setText(UpdateUI.getString("InstallWizard.ReviewPage.moreInfo")); //$NON-NLS-1$
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.VERTICAL_ALIGN_BEGINNING);
-		moreInfoButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(moreInfoButton);
-		moreInfoButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleMoreInfo();
-			}
-		});
-		moreInfoButton.setEnabled(false);
-		
-		
-		propertiesButton = new Button(buttonContainer, SWT.PUSH);
-		propertiesButton.setText(UpdateUI.getString("InstallWizard.ReviewPage.properties")); //$NON-NLS-1$
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.VERTICAL_ALIGN_BEGINNING);
-		propertiesButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(propertiesButton);
-		propertiesButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleProperties();
-			}
-		});
-		propertiesButton.setEnabled(false);
-
-		statusButton = new Button(buttonContainer, SWT.PUSH);
-		statusButton.setText(UpdateUI.getString("InstallWizard.ReviewPage.showStatus")); //$NON-NLS-1$
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.VERTICAL_ALIGN_BEGINNING);
-		statusButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(statusButton);
-		statusButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				showStatus();
-			}
-		});
-
-		//new Label(client, SWT.NULL);
-
-		counterLabel = new Label(client, SWT.NULL);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		counterLabel.setLayoutData(gd);
-
-		filterCheck = new Button(client, SWT.CHECK);
-		filterCheck.setText(UpdateUI.getString("InstallWizard.ReviewPage.filterFeatures")); //$NON-NLS-1$
-		filterCheck.setSelection(true);
-		tableViewer.addFilter(filter);
-		filterCheck.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (filterCheck.getSelection())
-					tableViewer.addFilter(filter);
-				else
-					tableViewer.removeFilter(filter);
-				pageChanged();
-			}
-		});
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		filterCheck.setLayoutData(gd);
-		pageChanged();
-
-		WorkbenchHelp.setHelp(client, "org.eclipse.update.ui.MultiReviewPage2"); //$NON-NLS-1$
-
-		Dialog.applyDialogFont(parent);
-
-		return client;
-	}
-
-	private void createTable(Composite parent) {
-		SashForm sform = new SashForm(parent, SWT.VERTICAL);
-		tableViewer =
-			CheckboxTableViewer.newCheckList(
-				sform,
-				SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
-		Table table = tableViewer.getTable();
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 250;
-		sform.setLayoutData(gd);
-
-		table.setHeaderVisible(true);
-
-		TableColumn column = new TableColumn(table, SWT.NULL);
-		column.setText(UpdateUI.getString("InstallWizard.ReviewPage.feature")); //$NON-NLS-1$
-		column.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				LABEL_ORDER *= -1;
-				tableViewer.setSorter(
-					new FeatureSorter(
-						FeatureSorter.FEATURE_LABEL,
-						LABEL_ORDER,
-						VERSION_ORDER,
-						PROVIDER_ORDER));
-			}
-		});
-
-		column = new TableColumn(table, SWT.NULL);
-		column.setText(UpdateUI.getString("InstallWizard.ReviewPage.version")); //$NON-NLS-1$
-		column.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				VERSION_ORDER *= -1;
-				tableViewer.setSorter(
-					new FeatureSorter(
-						FeatureSorter.FEATURE_VERSION,
-						LABEL_ORDER,
-						VERSION_ORDER,
-						PROVIDER_ORDER));
-			}
-		});
-
-		column = new TableColumn(table, SWT.NULL);
-		column.setText(UpdateUI.getString("InstallWizard.ReviewPage.provider")); //$NON-NLS-1$
-		column.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				PROVIDER_ORDER *= -1;
-				tableViewer.setSorter(
-					new FeatureSorter(
-						FeatureSorter.FEATURE_PROVIDER,
-						LABEL_ORDER,
-						VERSION_ORDER,
-						PROVIDER_ORDER));
-			}
-		});
-
-		TableLayout layout = new TableLayout();
-		//layout.addColumnData(new ColumnWeightData(80, 225, true));
-		//layout.addColumnData(new ColumnWeightData(30, 80));
-		//layout.addColumnData(new ColumnWeightData(100, 140, true));
-
-		layout.addColumnData(new ColumnPixelData(225, true));
-		layout.addColumnData(new ColumnPixelData(80, true));
-		layout.addColumnData(new ColumnPixelData(140, true));
-
-		table.setLayout(layout);
-
-		tableViewer.setContentProvider(new JobsContentProvider());
-		tableViewer.setLabelProvider(new JobsLabelProvider());
-		tableViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				newlySelectedFeature = null;
-				if(event.getChecked()){
-					// save checked feeature, so its error can be shown if any
-					Object checked = event.getElement();
-					if(checked instanceof IInstallFeatureOperation){
-						newlySelectedFeature= ((IInstallFeatureOperation)checked).getFeature();
-					}
-				}
-				tableViewer
-					.getControl()
-					.getDisplay()
-					.asyncExec(new Runnable() {
-					public void run() {
-						pageChanged();
-					}
-				});
-			}
-		});
-
-		tableViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				jobSelected((IStructuredSelection) e.getSelection());
-			}
-		});
-
-		tableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleProperties();
-			}
-		});
-		tableViewer.setSorter(new FeatureSorter());
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				fillContextMenu(manager);
-			}
-		});
-		table.setMenu(menuMgr.createContextMenu(table));
-		
-		tableViewer.setInput(UpdateUI.getDefault().getUpdateModel());
-		tableViewer.setAllChecked(true);
-		
-		descLabel = new Text(sform, SWT.BORDER|SWT.WRAP|SWT.MULTI|SWT.V_SCROLL);
-		descLabel.setEditable(false);
-		
-		sform.setWeights(new int[] {10, 2});
-	}
-	
-	private void fillContextMenu(IMenuManager manager) {
-		if (tableViewer.getSelection().isEmpty()) return;
-		Action action = new Action(UpdateUI.getString("InstallWizard.ReviewPage.prop")) { //$NON-NLS-1$
-			public void run() {
-				handleProperties();
-			}
-		};
-		manager.add(action);
-	}
-
-	public void accept(final IFeature feature) {
-		getShell().getDisplay().syncExec(new Runnable() {
-			public void run() {
-				IInstallFeatureOperation job = OperationsManager.getOperationFactory().createInstallOperation( null, feature,null, null, null);
-				ViewerFilter[] filters = tableViewer.getFilters();
-				boolean visible = true;
-
-				for (int i = 0; i < filters.length; i++) {
-					ViewerFilter filter = filters[i];
-					if (!filter.select(tableViewer, null, job)) {
-						visible = false;
-						break;
-					}
-				}
-				if (visible) {
-					tableViewer.add(job);
-					updateItemCount(0, -1);
-				}
-				jobs.add(job);
-			}
-		});
-	}
-
-	private void jobSelected(IStructuredSelection selection) {
-		IInstallFeatureOperation job = (IInstallFeatureOperation) selection.getFirstElement();
-		IFeature feature = job != null ? job.getFeature() : null;
-		IURLEntry descEntry = feature != null ? feature.getDescription() : null;
-		String desc = null;
-		if (descEntry != null)
-			desc = descEntry.getAnnotation();
-		if (desc == null)
-			desc = ""; //$NON-NLS-1$
-		descLabel.setText(desc);
-		propertiesButton.setEnabled(feature != null);
-		moreInfoButton.setEnabled(job != null && getMoreInfoURL(job) != null);
-	}
-	
-	private void pageChanged() {
-		Object[] checked = tableViewer.getCheckedElements();
-		int totalCount = tableViewer.getTable().getItemCount();
-		updateItemCount(checked.length, totalCount);
-		if (checked.length > 0) {
-			validateSelection();
-		} else {
-			lastDisplayedStatus = null;
-			setErrorMessage(null);
-			setPageComplete(false);
-			validationStatus = null;
-			problematicFeatures.clear();
-		}
-		tableViewer.update(jobs.toArray(), null);
-		statusButton.setEnabled(validationStatus != null);
-	}
-
-	private void updateItemCount(int checkedCount, int totalCount) {
-		if (checkedCount == -1) {
-			Object[] checkedElements = tableViewer.getCheckedElements();
-			checkedCount = checkedElements.length;
-		}
-		if (totalCount == -1) {
-			totalCount = tableViewer.getTable().getItemCount();
-		}
-		String total = "" + totalCount; //$NON-NLS-1$
-		String selected = "" + checkedCount; //$NON-NLS-1$
-		counterLabel.setText(
-			UpdateUI.getFormattedMessage(
-				"InstallWizard.ReviewPage.counter", //$NON-NLS-1$
-				new String[] { selected, total }));
-		counterLabel.getParent().layout();
-	}
-
-	private void handleSelectAll(boolean select) {
-		tableViewer.setAllChecked(select);
-		tableViewer.getControl().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				pageChanged();
-			}
-		});
-	}
-
-	private void handleProperties() {
-		final IStructuredSelection selection =
-			(IStructuredSelection) tableViewer.getSelection();
-
-		final IInstallFeatureOperation job =
-			(IInstallFeatureOperation) selection.getFirstElement();
-		if (propertiesAction == null) {
-			propertiesAction =
-				new FeaturePropertyDialogAction(getShell(), tableViewer);
-		}
-
-		BusyIndicator
-			.showWhile(tableViewer.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				SimpleFeatureAdapter adapter =
-					new SimpleFeatureAdapter(job.getFeature());
-				propertiesAction.selectionChanged(
-					new StructuredSelection(adapter));
-				propertiesAction.run();
-			}
-		});
-	}
-
-	private String getMoreInfoURL(IInstallFeatureOperation job) {
-		IURLEntry desc = job.getFeature().getDescription();
-		if (desc != null) {
-			URL url = desc.getURL();
-			return (url == null) ? null : url.toString();
-		}
-		return null;
-	}
-
-	private void handleMoreInfo() {
-		IStructuredSelection selection =
-			(IStructuredSelection) tableViewer.getSelection();
-		final IInstallFeatureOperation selectedJob =
-			(IInstallFeatureOperation) selection.getFirstElement();
-		BusyIndicator
-			.showWhile(tableViewer.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				String urlName = getMoreInfoURL(selectedJob);
-				UpdateUI.showURL(urlName);
-			}
-		});
-	}
-
-	public IInstallFeatureOperation[] getSelectedJobs() {
-		Object[] selected = tableViewer.getCheckedElements();
-		IInstallFeatureOperation[] result = new IInstallFeatureOperation[selected.length];
-		System.arraycopy(selected, 0, result, 0, selected.length);
-		return result;
-	}
-
-	public void validateSelection() {
-		IInstallFeatureOperation[] jobs = getSelectedJobs();
-		validationStatus =
-			OperationsManager.getValidator().validatePendingChanges(jobs);
-		problematicFeatures.clear();
-		if (validationStatus != null) {
-			IStatus[] status = validationStatus.getChildren();
-			for (int i = 0; i < status.length; i++) {
-				IStatus singleStatus = status[i];
-				if(isSpecificStatus(singleStatus)){
-					IFeature f = ((FeatureStatus) singleStatus).getFeature();
-					problematicFeatures.add(f);				
-				}
-			}
-		}
-
-		setPageComplete(validationStatus == null || validationStatus.getCode() == IStatus.WARNING);
-		
-		updateWizardMessage();
-	}
-
-	private void showStatus() {
-		if (validationStatus != null) {
-			new StatusDialog().open();
-		}
-
-	}
-	/**
-	 * Check whether status is relevant to show for
-	 * a specific feature or is a other problem
-	 * @param status
-	 * @return true if status is FeatureStatus with
-	 * specified feature and certain error codes
-	 */
-	private boolean isSpecificStatus(IStatus status){
-		if(!(status instanceof FeatureStatus)){
-			return false;
-		}
-		if(status.getSeverity()!=IStatus.ERROR){
-			return false;
-		}
-		FeatureStatus featureStatus = (FeatureStatus) status;
-		if(featureStatus.getFeature()==null){
-			return false;
-		}
-		return 0!= (featureStatus.getCode()
-				& FeatureStatus.CODE_CYCLE
-				+ FeatureStatus.CODE_ENVIRONMENT
-				+ FeatureStatus.CODE_EXCLUSIVE
-				+ FeatureStatus.CODE_OPTIONAL_CHILD
-				+ FeatureStatus.CODE_PREREQ_FEATURE
-				+ FeatureStatus.CODE_PREREQ_PLUGIN);
-	}
-	/**
-	 * Update status in the wizard status area
-	 */
-	private void updateWizardMessage() {
-		if (validationStatus == null) {
-			lastDisplayedStatus=null;
-			setErrorMessage(null);
-		} else if (validationStatus.getCode() == IStatus.WARNING) {
-			lastDisplayedStatus=null;
-			setErrorMessage(null);
-			setMessage(validationStatus.getMessage(), IMessageProvider.WARNING);
-		} else {
-			// 1.  Feature selected, creating a problem for it, show status for it
-			if(newlySelectedFeature !=null){
-				IStatus[] status = validationStatus.getChildren();
-				for(int s =0; s< status.length; s++){
-					if(isSpecificStatus(status[s])){
-						FeatureStatus featureStatus = (FeatureStatus)status[s];
-						if(newlySelectedFeature.equals(featureStatus.getFeature())){
-							lastDisplayedStatus=featureStatus;
-							setErrorMessage(featureStatus.getMessage());
-							return;
-						}
-					}
-				}
-			}
-			
-			// 2.  show old status if possible (it is still valid)
-			if(lastDisplayedStatus !=null){
-				IStatus[] status = validationStatus.getChildren();
-				for(int i=0; i<status.length; i++){
-					if(lastDisplayedStatus.equals(status[i])){
-						//lastDisplayedStatus=lastDisplayedStatus;
-						//setErrorMessage(status[i].getMessage());
-						return;
-					}
-				}
-				lastDisplayedStatus = null;
-			}
-			
-			// 3.  pick the first problem that is specific to some feature
-			IStatus[] status = validationStatus.getChildren();
-			for(int s =0; s< status.length; s++){
-				if(isSpecificStatus(status[s])){
-					lastDisplayedStatus = (FeatureStatus)status[s];
-					setErrorMessage(status[s].getMessage());
-					return;
-				}
-			}
-				
-			// 4.  display the first problem (no problems specify a feature)
-			if(status.length>0){
-				IStatus singleStatus=status[0];
-				setErrorMessage(singleStatus.getMessage());
-			}else{
-			// 5. not multi or empty multi status
-				setErrorMessage(UpdateUI.getString("InstallWizard.ReviewPage.invalid.long")); //$NON-NLS-1$
-			}
-		}
-	}
-
-	class StatusDialog extends ErrorDialog {
-//		Button detailsButton;
-		public StatusDialog() {
-			super(UpdateUI.getActiveWorkbenchShell(), UpdateUI
-					.getString("InstallWizard.ReviewPage.invalid.short"), null, //$NON-NLS-1$
-					validationStatus, IStatus.OK | IStatus.INFO
-							| IStatus.WARNING | IStatus.ERROR);
-		}
-//		protected Button createButton(
-//				Composite parent,
-//				int id,
-//				String label,
-//				boolean defaultButton) {
-//			Button b = super.createButton(parent, id, label, defaultButton);
-//			if(IDialogConstants.DETAILS_ID == id){
-//				detailsButton = b;
-//			}
-//			return b;
-//		}
-		public void create() {
-			super.create();
-			buttonPressed(IDialogConstants.DETAILS_ID);
-//			if(detailsButton!=null){
-//				detailsButton.dispose();
-//			}
-		}
-	}
-
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SearchRunner.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SearchRunner.java
deleted file mode 100644
index ed31013..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SearchRunner.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.search.*;
-
-/**
- * Runs a search query
- */
-public class SearchRunner {
-	private Shell shell;
-	private IRunnableContext context;
-	private ISearchProvider searchProvider;
-	private IUpdateSearchResultCollector collector;
-	private boolean newSearchNeeded;
-	
-	public SearchRunner(Shell shell, IRunnableContext context) {
-		this.shell = shell;
-		this.context = context;
-	}
-	
-	public void setResultCollector(IUpdateSearchResultCollector collector) {
-		this.collector = collector;
-	}
-	
-	public ISearchProvider getSearchProvider() {
-		return searchProvider;
-	}
-	
-	public void setSearchProvider(ISearchProvider searchProvider) {
-		if (this.searchProvider!=searchProvider)
-			newSearchNeeded = true;
-		this.searchProvider = searchProvider;
-	}
-	
-	public void setNewSearchNeeded(boolean value) {
-		newSearchNeeded = value;
-	}
-	
-	public boolean isNewSearchNeeded() {
-		return newSearchNeeded;
-	}
-
-	public void runSearch() {
-		if (searchProvider==null) return;
-		try {
-			context.run(true, true, getSearchOperation(collector));
-			newSearchNeeded=false;
-		} catch (InterruptedException e) {
-			UpdateUI.logException(e);
-			return;
-		} catch (InvocationTargetException e) {
-			Throwable t = e.getTargetException();
-			if (t instanceof CoreException) {
-				CoreException ce = (CoreException)t;
-				IStatus status = ce.getStatus();
-				if (status!=null &&
-					status.getCode()==ISite.SITE_ACCESS_EXCEPTION) {
-					// Just show this but do not throw exception
-					// because there may be results anyway.
-					ErrorDialog.openError(shell,UpdateUI.getString("SearchRunner.connectionError"), //$NON-NLS-1$
-						null, 
-						status);
-					return;
-				}
-			}
-			UpdateUI.logException(e);
-			return;
-		}
-	}
-
-	private IRunnableWithProgress getSearchOperation(final IUpdateSearchResultCollector collector) {
-		final UpdateSearchRequest request = searchProvider.getSearchRequest();
-		
-		IRunnableWithProgress op = new IRunnableWithProgress () {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				try {
-					request.performSearch(collector, monitor);
-				}
-				catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
-				finally {
-					monitor.done();
-				}
-			}
-		};
-		return op;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ShowActivitiesDialog.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ShowActivitiesDialog.java
deleted file mode 100644
index 3fd63be..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ShowActivitiesDialog.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.update.internal.ui.wizards;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.ui.*;
-
-
-
-public class ShowActivitiesDialog extends Dialog {
-	private TableViewer activitiesViewer;
-
-	// location configuration
-	private IDialogSettings dialogSettings;
-	private Point dialogLocation;
-	private Point dialogSize;
-
-	/**
-	 * @param parentShell
-	 */
-	public ShowActivitiesDialog(Shell parentShell) {
-		super(parentShell);
-		setShellStyle(SWT.RESIZE | SWT.MIN | SWT.MAX);
-		readConfiguration();
-	}
-	
-	public void create() {
-		super.create();
-		// dialog location 
-		if (dialogLocation != null)
-			getShell().setLocation(dialogLocation);
-		
-		// dialog size
-		if (dialogSize != null)
-			getShell().setSize(dialogSize);
-		else
-			getShell().setSize(500,500);
-		
-		
-		applyDialogFont(buttonBar);
-		getButton(IDialogConstants.OK_ID).setFocus();
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.makeColumnsEqualWidth = false;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.grabExcessHorizontalSpace = true;
-		gd.grabExcessVerticalSpace = true;
-		container.setLayoutData(gd);
-		createDescriptionSection(container);
-		createActivitiesViewer(container);
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-
-	protected Control createDescriptionSection(Composite parent){
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = false;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		container.setLayoutData(gd);
-		try {
-			Label targetLabel = new Label(container, SWT.NONE);
-			targetLabel.setText(UpdateUI.getString("ShowActivitiesDialog.date")); //$NON-NLS-1$
-			Label target = new Label(container, SWT.NONE);
-			target.setText(SiteManager.getLocalSite().getCurrentConfiguration().getLabel());
-			
-			Label urlLabel = new Label(container, SWT.NONE);
-			urlLabel.setText(UpdateUI.getString("ShowActivitiesDialog.loc")); //$NON-NLS-1$
-			Label url = new Label(container, SWT.NONE);
-			url.setText(((InstallConfiguration)SiteManager.getLocalSite().getCurrentConfiguration()).getURL().getFile());
-			
-			
-		} catch (CoreException e) {
-			UpdateUI.logException(e);
-		}
-		return container;
-	}
-	protected Control createActivitiesViewer(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.marginHeight = gridLayout.marginWidth = 4;
-		composite.setLayout(gridLayout);
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-//		gd.grabExcessHorizontalSpace = true;
-//		gd.grabExcessVerticalSpace = true;
-
-		composite.setLayoutData(gd);
-
-		
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(UpdateUI.getString("ShowActivitiesDialog.label")); //$NON-NLS-1$
-		activitiesViewer = ActivitiesTableViewer.createViewer(composite, true);
-
-		TableLayout layout = new TableLayout();
-		layout.addColumnData(new ColumnWeightData(8, 20, false));
-		layout.addColumnData(new ColumnWeightData(50, 160, true));
-		layout.addColumnData(new ColumnWeightData(50, 183, true));
-		layout.addColumnData(new ColumnWeightData(50, 100, true));
-
-		activitiesViewer.getTable().setLayout(layout);
-		try {
-			activitiesViewer.setInput(SiteManager.getLocalSite().getCurrentConfiguration());
-		} catch (CoreException e) {
-		}
-		Dialog.applyDialogFont(composite);
-		return composite;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK button only by default
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	}
-
-	public boolean close() {
-		storeSettings();
-		return super.close();
-	}
-	
-	/**
-	 * Stores the current state in the dialog settings.
-	 * @since 2.0
-	 */
-	private void storeSettings() {
-		writeConfiguration();
-	}
-	/**
-	 * Returns the dialog settings object used to share state
-	 * between several event detail dialogs.
-	 * 
-	 * @return the dialog settings to be used
-	 */
-	private IDialogSettings getDialogSettings() {
-		IDialogSettings settings = UpdateUI.getDefault().getDialogSettings();
-		dialogSettings = settings.getSection(getClass().getName());
-		if (dialogSettings == null)
-			dialogSettings= settings.addNewSection(getClass().getName());
-		return dialogSettings;
-	}
-
-	/**
-	 * Initializes itself from the dialog settings with the same state
-	 * as at the previous invocation.
-	 */
-	private void readConfiguration() {
-		IDialogSettings s= getDialogSettings();
-		try {
-			int x= s.getInt("x"); //$NON-NLS-1$
-			int y= s.getInt("y"); //$NON-NLS-1$
-			dialogLocation= new Point(x, y);
-			
-			x = s.getInt("width"); //$NON-NLS-1$
-			y = s.getInt("height"); //$NON-NLS-1$
-			dialogSize = new Point(x,y);
-		} catch (NumberFormatException e) {
-			dialogLocation= null;
-			dialogSize = null;
-		}
-	}
-	
-	private void writeConfiguration(){
-		IDialogSettings s = getDialogSettings();
-		Point location = getShell().getLocation();
-		s.put("x", location.x); //$NON-NLS-1$
-		s.put("y", location.y); //$NON-NLS-1$
-		
-		Point size = getShell().getSize();
-		s.put("width", size.x); //$NON-NLS-1$
-		s.put("height", size.y); //$NON-NLS-1$
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SitePage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SitePage.java
deleted file mode 100644
index 313d4d4..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/SitePage.java
+++ /dev/null

@@ -1,561 +0,0 @@
-package org.eclipse.update.internal.ui.wizards;
-
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.internal.search.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.model.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-public class SitePage extends BannerPage implements ISearchProvider {
-
-	class TreeContentProvider
-		extends DefaultContentProvider
-		implements ITreeContentProvider {
-
-		public Object[] getElements(Object parent) {
-			UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-			Object[] bookmarks = model.getBookmarkLeafs();
-			Object[] sitesToVisit =
-				discoveryFolder.getChildren(discoveryFolder);
-			Object[] all = new Object[bookmarks.length + sitesToVisit.length];
-			System.arraycopy(bookmarks, 0, all, 0, bookmarks.length);
-			System.arraycopy(
-				sitesToVisit,
-				0,
-				all,
-				bookmarks.length,
-				sitesToVisit.length);
-			return all;
-		}
-
-		public Object[] getChildren(final Object parent) {
-			if (parent instanceof SiteBookmark) {
-				final SiteBookmark bookmark = (SiteBookmark) parent;
-				final Object[] children =
-					getSiteCatalogWithIndicator(
-						bookmark,
-						!bookmark.isSiteConnected());
-				treeViewer.getControl().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						if (children.length > 0)
-							handleSiteExpanded(bookmark, children);
-					}
-				});
-				return children;
-			}
-			return new Object[0];
-		}
-
-		public Object getParent(Object element) {
-			if (element instanceof SiteCategory)
-				return ((SiteCategory) element).getBookmark();
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			return (element instanceof SiteBookmark);
-		}
-
-	}
-
-	class TreeLabelProvider extends LabelProvider {
-
-		public Image getImage(Object obj) {
-			if (obj instanceof SiteBookmark)
-				return UpdateUI.getDefault().getLabelProvider().get(
-					UpdateUIImages.DESC_SITE_OBJ);
-			if (obj instanceof SiteCategory)
-				return UpdateUI.getDefault().getLabelProvider().get(
-					UpdateUIImages.DESC_CATEGORY_OBJ);
-			return super.getImage(obj);
-		}
-
-		public String getText(Object obj) {
-			if (obj instanceof SiteBookmark) {
-				return ((SiteBookmark) obj).getLabel();
-			}
-			return super.getText(obj);
-		}
-	}
-
-	class ModelListener implements IUpdateModelChangedListener {
-		public void objectChanged(Object object, String property) {
-			treeViewer.refresh();
-			checkItems();
-		}
-
-		public void objectsAdded(Object parent, Object[] children) {
-			treeViewer.refresh();
-			checkItems();
-		}
-
-		public void objectsRemoved(Object parent, Object[] children) {
-			treeViewer.refresh();
-			checkItems();
-		}
-	}
-
-	private static DiscoveryFolder discoveryFolder = new DiscoveryFolder();
-	private CheckboxTreeViewer treeViewer;
-	private Button addSiteButton;
-	private Button addLocalButton;
-	private Button addLocalZippedButton;
-	private Button editButton;
-	private Button removeButton;
-	private Button envFilterCheck;
-	private SearchRunner searchRunner;
-	private EnvironmentFilter envFilter;
-	private UpdateSearchRequest searchRequest;
-	private ModelListener modelListener;
-
-
-	public SitePage(SearchRunner searchRunner) {
-		super("SitePage"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString("SitePage.title")); //$NON-NLS-1$
-		setDescription(UpdateUI.getString("SitePage.desc")); //$NON-NLS-1$
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-		searchRequest =
-			new UpdateSearchRequest(
-				new SiteSearchCategory(),
-				new UpdateSearchScope());
-		searchRequest.addFilter(new BackLevelFilter());
-		envFilter = new EnvironmentFilter();
-		this.searchRunner = searchRunner;
-		modelListener = new ModelListener();
-		UpdateUI.getDefault().getUpdateModel().addUpdateModelChangedListener(
-			modelListener);
-	}
-
-	private void toggleEnvFilter(boolean add) {
-		if (add)
-			searchRequest.addFilter(envFilter);
-		else
-			searchRequest.removeFilter(envFilter);
-		searchRunner.setNewSearchNeeded(true);
-	}
-
-	public void dispose() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		UpdateUI
-			.getDefault()
-			.getUpdateModel()
-			.removeUpdateModelChangedListener(
-			modelListener);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc) @see
-	 * org.eclipse.update.internal.ui.wizards.BannerPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		client.setLayout(layout);
-
-		Label label = new Label(client, SWT.NULL);
-		label.setText(UpdateUI.getString("SitePage.label")); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		createTreeViewer(client);
-
-		Composite buttonContainer = new Composite(client, SWT.NULL);
-		buttonContainer.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		buttonContainer.setLayout(layout);
-
-		addSiteButton = new Button(buttonContainer, SWT.PUSH);
-		addSiteButton.setText(UpdateUI.getString("SitePage.addUpdateSite")); //$NON-NLS-1$
-		addSiteButton.setLayoutData(
-			new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(addSiteButton);
-		addSiteButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAddSite();
-			}
-		});
-
-		addLocalButton = new Button(buttonContainer, SWT.PUSH);
-		addLocalButton.setText(UpdateUI.getString("SitePage.addLocalSite")); //$NON-NLS-1$
-		addLocalButton.setLayoutData(
-			new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(addLocalButton);
-		addLocalButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAddLocal();
-			}
-		});
-
-		addLocalZippedButton = new Button(buttonContainer, SWT.PUSH);
-		addLocalZippedButton.setText(UpdateUI.getString("SitePage.addLocalZippedSite")); //$NON-NLS-1$
-		addLocalZippedButton.setLayoutData(
-			new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(addLocalZippedButton);
-		addLocalZippedButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAddLocalZipped();
-			}
-		});
-
-		editButton = new Button(buttonContainer, SWT.PUSH);
-		editButton.setText(UpdateUI.getString("SitePage.edit")); //$NON-NLS-1$
-		editButton.setEnabled(false);
-		editButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(editButton);
-		editButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleEdit();
-			}
-		});
-
-		removeButton = new Button(buttonContainer, SWT.PUSH);
-		removeButton.setText(UpdateUI.getString("SitePage.remove")); //$NON-NLS-1$
-		removeButton.setEnabled(false);
-		removeButton.setLayoutData(
-			new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(removeButton);
-		removeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleRemove();
-			}
-		});
-
-		envFilterCheck = new Button(client, SWT.CHECK);
-		envFilterCheck.setText(UpdateUI.getString("SitePage.ignore")); //$NON-NLS-1$
-		envFilterCheck.setSelection(true);
-		toggleEnvFilter(true);
-		envFilterCheck.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				toggleEnvFilter(envFilterCheck.getSelection());
-			}
-		});
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		envFilterCheck.setLayoutData(gd);
-
-		Dialog.applyDialogFont(parent);
-
-		return client;
-	}
-
-	private void createTreeViewer(Composite parent) {
-		treeViewer =
-			new CheckboxTreeViewer(
-				parent,
-				SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		treeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-		treeViewer.setContentProvider(new TreeContentProvider());
-		treeViewer.setLabelProvider(new TreeLabelProvider());
-		treeViewer.setInput(UpdateUI.getDefault().getUpdateModel());
-
-		initializeItems();
-
-		treeViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent e) {
-				Object element = e.getElement();
-				if (element instanceof SiteBookmark)
-					handleSiteChecked((SiteBookmark) element, e.getChecked());
-				else if (element instanceof SiteCategory) {
-					handleCategoryChecked(
-						(SiteCategory) element,
-						e.getChecked());
-				}
-			}
-		});
-
-		treeViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				handleSelectionChanged((IStructuredSelection) e.getSelection());
-			}
-		});
-
-		treeViewer.addFilter(new ViewerFilter() {
-			public boolean select(
-				Viewer viewer,
-				Object parentElement,
-				Object element) {
-				if (element instanceof SiteBookmark)
-					return !((SiteBookmark) element).isWebBookmark();
-				return true;
-			}
-		});
-	}
-
-	private void initializeItems() {
-		checkItems();
-		updateSearchRequest();
-	}
-
-	private void checkItems() {
-		TreeItem[] items = treeViewer.getTree().getItems();
-		for (int i = 0; i < items.length; i++) {
-			SiteBookmark bookmark = (SiteBookmark) items[i].getData();
-			treeViewer.setChecked(bookmark, bookmark.isSelected());
-		}
-	}
-
-	private void handleAddSite() {
-		NewUpdateSiteDialog dialog = new NewUpdateSiteDialog(getShell());
-		dialog.create();
-		dialog.getShell().setText(UpdateUI.getString("SitePage.new")); //$NON-NLS-1$
-		if (dialog.open() == NewUpdateSiteDialog.OK)
-			updateSearchRequest();
-	}
-
-	private void handleAddLocal() {
-		SiteBookmark siteBookmark = LocalSiteSelector.getLocaLSite(getShell());
-		if (siteBookmark != null) {
-			UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-			model.addBookmark(siteBookmark);
-			model.saveBookmarks();
-			updateSearchRequest();
-		}
-		return;
-	}
-
-	private void handleAddLocalZipped() {
-		SiteBookmark siteBookmark =
-			LocalSiteSelector.getLocaLZippedSite(getShell());
-		if (siteBookmark != null) {
-			UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-			model.addBookmark(siteBookmark);
-			model.saveBookmarks();
-			updateSearchRequest();
-		}
-		return;
-	}
-
-	private void handleRemove() {
-		BusyIndicator
-			.showWhile(treeViewer.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				UpdateModel updateModel =
-					UpdateUI.getDefault().getUpdateModel();
-				IStructuredSelection ssel =
-					(IStructuredSelection) treeViewer.getSelection();
-				SiteBookmark bookmark = (SiteBookmark) ssel.getFirstElement();
-				if (!bookmark.isReadOnly()) {
-					updateModel.removeBookmark(bookmark);
-					updateSearchRequest();
-				}
-			}
-		});
-	}
-
-	private void handleEdit() {
-		IStructuredSelection ssel =
-			(IStructuredSelection) treeViewer.getSelection();
-		SiteBookmark bookmark = (SiteBookmark) ssel.getFirstElement();
-		URL oldURL = bookmark.getURL();
-		EditSiteDialog dialog = new EditSiteDialog(getShell(), bookmark);
-		dialog.create();
-		String title = bookmark.isLocal() ? UpdateUI.getString("SitePage.dialogEditLocal") : UpdateUI.getString("SitePage.dialogEditUpdateSite"); //$NON-NLS-1$ //$NON-NLS-2$
-																																				  // //$NON-NLS-2$
-		dialog.getShell().setText(title);
-		if (dialog.open() == EditSiteDialog.OK ) {
-			URL newURL = bookmark.getURL();
-			if (!UpdateManagerUtils.sameURL(oldURL, newURL)) {
-				UpdateModel model = UpdateUI.getDefault().getUpdateModel();
-				model.fireObjectChanged(bookmark, null);
-				updateSearchRequest();	
-			}
-		}
-	}
-
-	private void handleSiteChecked(SiteBookmark bookmark, boolean checked) {
-		bookmark.setSelected(checked);
-		if (checked) {
-			bookmark.setIgnoredCategories(new String[0]);
-		} else {
-			Object[] cats =
-				(
-					(TreeContentProvider) treeViewer
-						.getContentProvider())
-						.getChildren(
-					bookmark);
-			ArrayList result = new ArrayList();
-			for (int i = 0; i < cats.length; i++) {
-				if (cats[i] instanceof SiteCategory) {
-					result.add(((SiteCategory) cats[i]).getFullName());
-				}
-			}
-			bookmark.setIgnoredCategories(
-				(String[]) result.toArray(new String[result.size()]));
-		}
-		treeViewer.setSubtreeChecked(bookmark, checked);
-		treeViewer.setGrayed(bookmark, false);
-		updateSearchRequest();
-	}
-
-	private void handleSiteExpanded(SiteBookmark bookmark, Object[] cats) {
-		if (!bookmark.isSelected()) {
-			treeViewer.setSubtreeChecked(bookmark, false);
-			ArrayList result = new ArrayList();
-			for (int i = 0; i < cats.length; i++) {
-				if (cats[i] instanceof SiteCategory) {
-					result.add(((SiteCategory) cats[i]).getFullName());
-				}
-			}
-			bookmark.setIgnoredCategories(
-				(String[]) result.toArray(new String[result.size()]));
-		} else {
-			String[] ignored = bookmark.getIgnoredCategories();
-			HashSet imap = new HashSet();
-			for (int i = 0; i < ignored.length; i++) {
-				imap.add(ignored[i]);
-			}
-
-			for (int i = 0; i < cats.length; i++) {
-				if (cats[i] instanceof SiteCategory) {
-					SiteCategory category = (SiteCategory) cats[i];
-					treeViewer.setChecked(
-						category,
-						!imap.contains(category.getFullName()));
-				}
-			}
-			treeViewer.setGrayed(
-				bookmark,
-				ignored.length > 0 && ignored.length < cats.length);
-		}
-		searchRunner.setNewSearchNeeded(true);
-	}
-
-	private void handleCategoryChecked(
-		SiteCategory category,
-		boolean checked) {
-		SiteBookmark bookmark = category.getBookmark();
-		String[] ignored = bookmark.getIgnoredCategories();
-		ArrayList array = new ArrayList();
-
-		for (int i = 0; i < ignored.length; i++) {
-			array.add(ignored[i]);
-		}
-		if (checked) {
-			array.remove(category.getFullName());
-		} else {
-			array.add(category.getFullName());
-		}
-
-		bookmark.setIgnoredCategories(
-			(String[]) array.toArray(new String[array.size()]));
-		searchRunner.setNewSearchNeeded(true);
-
-		Object[] children =
-			(
-				(TreeContentProvider) treeViewer
-					.getContentProvider())
-					.getChildren(
-				category.getBookmark());
-		treeViewer.setChecked(bookmark, array.size() < children.length);
-		bookmark.setSelected(array.size() < children.length);
-		treeViewer.setGrayed(
-			bookmark,
-			array.size() > 0 && array.size() < children.length);
-		updateSearchRequest();
-	}
-
-	private void handleSelectionChanged(IStructuredSelection ssel) {
-		boolean enable = false;
-		Object item = ssel.getFirstElement();
-		if (item instanceof SiteBookmark) {
-			enable = !((SiteBookmark) item).isReadOnly();
-		}
-		editButton.setEnabled(enable);
-		removeButton.setEnabled(enable);
-
-	}
-
-	private void updateSearchRequest() {
-		Object[] checked = treeViewer.getCheckedElements();
-
-		UpdateSearchScope scope = new UpdateSearchScope();
-		int nsites = 0;
-
-		for (int i = 0; i < checked.length; i++) {
-			if (checked[i] instanceof SiteBookmark) {
-				SiteBookmark bookmark = (SiteBookmark) checked[i];
-				scope.addSearchSite(
-					bookmark.getLabel(),
-					bookmark.getURL(),
-					bookmark.getIgnoredCategories());
-				nsites++;
-			}
-		}
-		searchRequest.setScope(scope);
-		searchRunner.setNewSearchNeeded(true);
-		setPageComplete(nsites > 0);
-	}
-
-	public UpdateSearchRequest getSearchRequest() {
-		return searchRequest;
-	}
-
-	public void setVisible(boolean value) {
-		super.setVisible(value);
-		if (value)
-			searchRunner.setSearchProvider(this);
-	}
-
-	class CatalogBag {
-		Object[] catalog;
-	}
-
-	private Object[] getSiteCatalogWithIndicator(
-		final SiteBookmark bookmark,
-		final boolean connect) {
-		final CatalogBag bag = new CatalogBag();
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-				throws InvocationTargetException {
-				try {
-					monitor.beginTask("", 3); //$NON-NLS-1$
-					monitor.worked(1);
-
-					if (connect)
-						bookmark.connect(new SubProgressMonitor(monitor, 1));
-					else
-						monitor.worked(1);
-					bag.catalog =
-						bookmark.getCatalog(
-							true,
-							new SubProgressMonitor(monitor, 1));
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(true, true, op);
-		} catch (InvocationTargetException e) {
-			UpdateUI.logException(e);
-		} catch (InterruptedException e) {
-		}
-
-		return (bag.catalog == null) ? new Object[0] : bag.catalog;
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java
deleted file mode 100644
index f7344e0..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java
+++ /dev/null

@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.wizards;
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.help.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.operations.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.operations.*;
-
-public class TargetPage extends BannerPage implements IDynamicPage {
-	private TableViewer jobViewer;
-	private TableViewer siteViewer;
-	private IInstallConfiguration config;
-	private ConfigListener configListener;
-	private Label requiredSpaceLabel;
-	private Label availableSpaceLabel;
-	private IInstallFeatureOperation[] jobs;
-	private Button addButton;
-	private Button deleteButton;
-	private HashSet added;
-	private JobTargetSites targetSites;
-
-	class JobsContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return jobs;
-		}
-	}
-
-	class SitesContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-
-		public Object[] getElements(Object parent) {
-			return config.getConfiguredSites();
-		}
-	}
-
-	class JobsLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-			
-		public Image getColumnImage(Object obj, int col) {
-			UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider();
-
-			IInstallFeatureOperation job = (IInstallFeatureOperation) obj;
-			ImageDescriptor base =
-				job.getFeature().isPatch()
-					? UpdateUIImages.DESC_EFIX_OBJ
-					: UpdateUIImages.DESC_FEATURE_OBJ;
-			int flags = 0;
-			JobTargetSite jobSite = (JobTargetSite) targetSites.get(job);
-			if (jobSite == null || jobSite.targetSite == null)
-				flags = UpdateLabelProvider.F_ERROR;
-			return provider.get(base, flags);
-		}
-
-		public String getColumnText(Object obj, int col) {
-			if (col == 0) {
-				IFeature feature = ((IInstallFeatureOperation) obj).getFeature();
-				return feature.getLabel()
-					+ " " //$NON-NLS-1$
-					+ feature.getVersionedIdentifier().getVersion().toString();
-			}
-			return null;
-		}
-	}
-	
-	class SitesLabelProvider
-	extends LabelProvider
-	implements ITableLabelProvider {
-		
-		public Image getColumnImage(Object obj, int col) {
-			UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider();
-			return provider.getLocalSiteImage((IConfiguredSite) obj);
-		}
-	
-		public String getColumnText(Object obj, int col) {
-			if (col == 0) {
-				ISite site = ((IConfiguredSite) obj).getSite();
-				return site.getURL().getFile();
-			}
-			return null;
-		}
-	}
-
-	class ConfigListener implements IInstallConfigurationChangedListener {
-		public void installSiteAdded(IConfiguredSite csite) {
-			siteViewer.add(csite);
-			if (added == null)
-				added = new HashSet();
-			added.add(csite);
-			siteViewer.setSelection(new StructuredSelection(csite));
-			siteViewer.getControl().setFocus();
-		}
-
-		public void installSiteRemoved(IConfiguredSite csite) {
-			siteViewer.remove(csite);
-			if (added != null)
-				added.remove(csite);
-			IInstallFeatureOperation job = (IInstallFeatureOperation) siteViewer.getInput();
-			if (job != null) {
-				JobTargetSite jobSite = (JobTargetSite) targetSites.get(job);
-				IConfiguredSite defaultSite = targetSites.computeTargetSite(jobSite);
-				if (defaultSite != null)
-					siteViewer.setSelection(new StructuredSelection(defaultSite));
-			}
-			siteViewer.getControl().setFocus();
-		}
-	}
-
-	/**
-	 * Constructor for ReviewPage2
-	 */
-	public TargetPage(IInstallConfiguration config) {
-		super("Target"); //$NON-NLS-1$
-		setTitle(UpdateUI.getString("InstallWizard.TargetPage.title")); //$NON-NLS-1$
-		setDescription(UpdateUI.getString("InstallWizard.TargetPage.desc")); //$NON-NLS-1$
-		this.config = config;
-		UpdateUI.getDefault().getLabelProvider().connect(this);
-		configListener = new ConfigListener();
-		targetSites = new JobTargetSites(config);
-	}
-
-	public void setJobs(IInstallFeatureOperation[] jobs) {
-		this.jobs = jobs;
-		targetSites.setJobs(jobs);
-	}
-
-	public void dispose() {
-		UpdateUI.getDefault().getLabelProvider().disconnect(this);
-		config.removeInstallConfigurationChangedListener(configListener);
-		super.dispose();
-	}
-
-	public Control createContents(Composite parent) {
-		Composite client = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginWidth = layout.marginHeight = 0;
-		client.setLayout(layout);
-
-		Label label = new Label(client, SWT.NULL);
-		label.setText(UpdateUI.getString("InstallWizard.TargetPage.jobsLabel")); //$NON-NLS-1$
-
-		label = new Label(client, SWT.NULL);
-		label.setText(UpdateUI.getString("InstallWizard.TargetPage.siteLabel")); //$NON-NLS-1$
-
-		new Label(client, SWT.NULL);
-
-		createJobViewer(client);
-		createSiteViewer(client);
-
-		Composite buttonContainer = new Composite(client, SWT.NULL);
-		GridLayout blayout = new GridLayout();
-		blayout.marginWidth = blayout.marginHeight = 0;
-		buttonContainer.setLayout(blayout);
-		buttonContainer.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		
-		addButton = new Button(buttonContainer, SWT.PUSH);
-		addButton.setText(UpdateUI.getString("InstallWizard.TargetPage.new")); //$NON-NLS-1$
-		addButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				addTargetLocation();
-			}
-		});
-		addButton.setEnabled(false);
-		addButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER));
-		SWTUtil.setButtonDimensionHint(addButton);
-		
-		deleteButton = new Button(buttonContainer, SWT.PUSH);
-		deleteButton.setText(UpdateUI.getString("InstallWizard.TargetPage.delete")); //$NON-NLS-1$
-		deleteButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					removeSelection();
-				}
-				catch (CoreException ex) {
-					UpdateUI.logException(ex);
-				}
-			}
-		});
-		deleteButton.setEnabled(false);
-		deleteButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER));
-		SWTUtil.setButtonDimensionHint(deleteButton);		
-		
-				
-		Composite status = new Composite(client, SWT.NULL);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 3;
-		status.setLayoutData(gd);
-		layout = new GridLayout();
-		layout.numColumns = 2;
-		status.setLayout(layout);
-		label = new Label(status, SWT.NULL);
-		label.setText(UpdateUI.getString("InstallWizard.TargetPage.requiredSpace")); //$NON-NLS-1$
-		requiredSpaceLabel = new Label(status, SWT.NULL);
-		requiredSpaceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		label = new Label(status, SWT.NULL);
-		label.setText(UpdateUI.getString("InstallWizard.TargetPage.availableSpace")); //$NON-NLS-1$
-		availableSpaceLabel = new Label(status, SWT.NULL);
-		availableSpaceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		WorkbenchHelp.setHelp(client, "org.eclipse.update.ui.MultiTargetPage2"); //$NON-NLS-1$
-		
-		Dialog.applyDialogFont(parent);
-		
-		return client;
-	}
-
-	private void createJobViewer(Composite parent) {
-		jobViewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 150;
-		jobViewer.getTable().setLayoutData(gd);
-		jobViewer.setContentProvider(new JobsContentProvider());
-		jobViewer.setLabelProvider(new JobsLabelProvider());
-
-		jobViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				IInstallFeatureOperation job = (IInstallFeatureOperation) selection.getFirstElement();
-				if (job != null) {
-					siteViewer.setInput(job);
-					JobTargetSite jobSite = (JobTargetSite) targetSites.get(job);
-					addButton.setEnabled(jobSite.affinitySite == null);
-					if (jobSite.targetSite != null) {
-						siteViewer.setSelection(new StructuredSelection(jobSite.targetSite));
-					}
-				}
-			}
-		});
-	}
-
-	private void createSiteViewer(Composite parent) {
-		siteViewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 200;
-		siteViewer.getTable().setLayoutData(gd);
-		siteViewer.setContentProvider(new SitesContentProvider());
-		siteViewer.setLabelProvider(new SitesLabelProvider());
-		siteViewer.addFilter(new ViewerFilter() {
-			public boolean select(Viewer v, Object parent, Object obj) {
-				IInstallFeatureOperation job = (IInstallFeatureOperation) siteViewer.getInput();
-				JobTargetSite jobSite = (JobTargetSite) targetSites.get(job);
-				return targetSites.getSiteVisibility((IConfiguredSite) obj, jobSite);
-			}
-		});
-		siteViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection ssel = (IStructuredSelection) event.getSelection();
-				selectTargetSite(ssel);
-				updateDeleteButton(ssel);
-			}
-		});
-
-		if (config != null)
-			config.addInstallConfigurationChangedListener(configListener);
-	}
-	
-	private void updateDeleteButton(IStructuredSelection selection) {
-		boolean enable = added != null && !added.isEmpty();
-		if (enable) {
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				if (!added.contains(iter.next())) {
-					enable = false;
-					break;
-				}
-			}
-		}
-		deleteButton.setEnabled(enable);
-	}
-
-	public void setVisible(boolean visible) {
-		if (visible) {
-			targetSites.computeDefaultTargetSites();
-			jobViewer.setInput(jobs);
-			if (jobViewer.getSelection().isEmpty() && jobs.length > 0)
-				jobViewer.setSelection(new StructuredSelection(jobs[0]));
-		}
-		
-		super.setVisible(visible);
-	}
-
-	private void verifyNotEmpty(boolean empty) {
-		String errorMessage = null;
-		if (empty)
-			errorMessage = UpdateUI.getString("InstallWizard.TargetPage.location.empty"); //$NON-NLS-1$
-		setErrorMessage(errorMessage);
-		setPageComplete(!empty);
-	}
-
-	private void selectTargetSite(IStructuredSelection selection) {
-		IConfiguredSite site = (IConfiguredSite) selection.getFirstElement();
-		IInstallFeatureOperation job = (IInstallFeatureOperation) siteViewer.getInput();
-		if (job != null) {
-			JobTargetSite jobSite = (JobTargetSite) targetSites.get(job);
-			if (site != null)
-				jobSite.targetSite = site;
-			pageChanged();
-		}
-		updateStatus(site);
-	}
-
-	private void addTargetLocation() {
-		DirectoryDialog dd = new DirectoryDialog(getContainer().getShell());
-		dd.setMessage(UpdateUI.getString("InstallWizard.TargetPage.location.message")); //$NON-NLS-1$
-		String path = dd.open();
-		if (path != null) {
-			addConfiguredSite(getContainer().getShell(), config, new File(path));
-		}
-	}
-	
-	private void removeSelection() throws CoreException {
-		IStructuredSelection selection = (IStructuredSelection) siteViewer.getSelection();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			config.removeConfiguredSite((IConfiguredSite) iter.next());
-		}
-	}
-
-	private IConfiguredSite addConfiguredSite(
-		Shell shell,
-		IInstallConfiguration config,
-		File file) {
-		try {
-			IConfiguredSite csite = config.createConfiguredSite(file);
-			IStatus status = csite.verifyUpdatableStatus();
-			if (status.isOK())
-				config.addConfiguredSite(csite);
-			else 
-				throw new CoreException(status);
-			
-			return csite;
-		} catch (CoreException e) {
-			String title = UpdateUI.getString("InstallWizard.TargetPage.location.error.title"); //$NON-NLS-1$
-			ErrorDialog.openError(shell, title, null, e.getStatus());
-			UpdateUI.logException(e);
-			return null;
-		}
-	}
-
-	private void updateStatus(Object element) {
-		if (element == null) {
-			requiredSpaceLabel.setText(""); //$NON-NLS-1$
-			availableSpaceLabel.setText(""); //$NON-NLS-1$
-			return;
-		}
-		IConfiguredSite site = (IConfiguredSite) element;
-		File file = new File(site.getSite().getURL().getFile());
-		long available = LocalSystemInfo.getFreeSpace(file);
-		long required = computeRequiredSizeFor(site);
-		if (required == -1)
-			requiredSpaceLabel.setText(UpdateUI.getString("InstallWizard.TargetPage.unknownSize")); //$NON-NLS-1$
-		else
-			requiredSpaceLabel.setText(
-				UpdateUI.getFormattedMessage("InstallWizard.TargetPage.size", "" + required)); //$NON-NLS-1$ //$NON-NLS-2$
-
-		if (available == LocalSystemInfo.SIZE_UNKNOWN)
-			availableSpaceLabel.setText(UpdateUI.getString("InstallWizard.TargetPage.unknownSize")); //$NON-NLS-1$
-		else
-			availableSpaceLabel.setText(
-				UpdateUI.getFormattedMessage("InstallWizard.TargetPage.size", "" + available)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private long computeRequiredSizeFor(IConfiguredSite site) {
-		long totalSize = 0;
-		for (int i = 0; i < jobs.length; i++) {
-			JobTargetSite jobSite = (JobTargetSite) targetSites.get(jobs[i]);
-			if (site.equals(jobSite.targetSite)) {
-				long jobSize = site.getSite().getInstallSizeFor(jobs[i].getFeature());
-				if (jobSize == -1)
-					return -1;
-				totalSize += jobSize;
-			}
-		}
-		return totalSize;
-	}
-
-	private void pageChanged() {
-		boolean empty = false;
-		for (Iterator enum = targetSites.keySet().iterator(); enum.hasNext();) {
-			JobTargetSite jobSite = (JobTargetSite) targetSites.get(enum.next());
-			if (jobSite.targetSite == null) {
-				empty = true;
-				break;
-			}
-			IFeature feature = jobSite.job.getFeature();
-			if (feature.isPatch()) {
-				// Patches must go together with the features
-				// they are patching.
-				JobTargetSite patchedSite = targetSites.findPatchedFeature(feature);
-				if (patchedSite != null
-					&& jobSite.targetSite != null
-					&& patchedSite.targetSite != null
-					&& jobSite.targetSite.equals(patchedSite.targetSite) == false) {
-					UpdateUI.getFormattedMessage(
-						"IntallWizard.TargetPage.patchError", //$NON-NLS-1$
-						new String[] {
-							feature.getLabel(),
-							patchedSite.job.getFeature().getLabel()});
-					setPageComplete(false);
-					return;
-				}
-			}
-		}
-		verifyNotEmpty(empty);
-	}
-	
-	public IConfiguredSite getTargetSite(IInstallFeatureOperation job) {
-		return targetSites.getTargetSite(job);
-	}
-	
-	public JobTargetSite[] getTargetSites() {
-		JobTargetSite[] sites = new JobTargetSite[jobs.length];
-		for (int i = 0; i < jobs.length; i++) {
-			JobTargetSite jobSite = (JobTargetSite) targetSites.get(jobs[i]);
-			sites[i] = jobSite;
-		}
-		return sites;
-	}
-	
-	void removeAddedSites() {
-		if (added != null) {
-			for (Iterator it = added.iterator(); it.hasNext(); ) 
-				config.removeConfiguredSite((IConfiguredSite) it.next());
-		}
-			
-	}
-}

diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/UIProblemHandler.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/UIProblemHandler.java
deleted file mode 100644
index 0375691..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/UIProblemHandler.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.internal.ui.wizards;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.ui.*;
-
-/**
- *
- */
-public class UIProblemHandler implements IProblemHandler {
-
-	/*
-	 * @see IProblemHandler#reportProblem(String)
-	 */
-	public boolean reportProblem(String problemText) {
-		String title = UpdateUI.getString("Revert.ProblemDialog.title"); //$NON-NLS-1$
-		return MessageDialog.openQuestion(UpdateUI.getActiveWorkbenchShell(), title, problemText);
-	}
-}

diff --git a/update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/InstallServlet.java b/update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/InstallServlet.java
deleted file mode 100644
index 8ad7032..0000000
--- a/update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/InstallServlet.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.internal.ui.servlets;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.search.*;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.internal.ui.wizards.*;
-import org.eclipse.update.operations.*;
-import org.eclipse.update.search.*;
-
-/**
- *
- * 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 InstallServlet extends HttpServlet {
-	private ServletConfig servletConfig;
-	public static final String SERVLET_NAME = "/InstallServlet"; //$NON-NLS-1$
-
-	public void init(ServletConfig config) throws ServletException {
-		this.servletConfig = config;
-	}
-
-	public void destroy() {
-	}
-
-	public ServletConfig getServletConfig() {
-		return servletConfig;
-	}
-
-	public String getServletInfo() {
-		return "Eclipse Install servlet"; //$NON-NLS-1$
-	}
-
-	public void service(
-		HttpServletRequest servletRequest,
-		HttpServletResponse servletResponse)
-		throws ServletException, IOException {
-		PrintWriter writer =
-			ServletsUtil.createResponsePrologue(servletResponse);
-		execute(writer, servletRequest);
-		ServletsUtil.createResponseEpilogue(
-			servletRequest,
-			servletResponse,
-			writer);
-	}
-
-	/**
-	 * Method execute.
-	 * @param servletRequest
-	 */
-	private void execute(
-		PrintWriter writer,
-		HttpServletRequest servletRequest) {
-		String serverURL = servletRequest.getParameter("server"); //$NON-NLS-1$
-		String license = servletRequest.getParameter("license"); //$NON-NLS-1$
-		boolean needLicensePage = true;
-		if (license != null && license.equalsIgnoreCase("false")) //$NON-NLS-1$
-			needLicensePage = false;
-
-		String[] versionedIds = servletRequest.getParameterValues("feature"); //$NON-NLS-1$
-
-		if (serverURL == null) {
-			createPageError(writer, UpdateUI.getString("InstallServlet.unknownServerURL")); //$NON-NLS-1$
-			return;
-		}
-		if (versionedIds == null) {
-			createPageError(writer, UpdateUI.getString("InstallServlet.noFeatures")); //$NON-NLS-1$
-			return;
-		}
-		if (OperationsManager.isInProgress()) {
-			ServletsUtil.createError(writer, UpdateUI.getString("InstallServlet.inProgress"), null); //$NON-NLS-1$
-			return;
-		}
-//		if (DetailsForm.isInProgress()) {
-//			ServletsUtil.createError(writer, UpdateUI.getString("InstallServlet.inProgress"), null);
-//			return;
-//		}
-		try {
-			URL url = new URL(serverURL);
-			VersionedIdentifier[] vids =
-				computeVersionedIdentifiers(versionedIds);
-			boolean success =
-				executeInstall(writer, url, vids, needLicensePage);
-			if (success)
-				ServletsUtil.createInfo(writer);
-		} catch (MalformedURLException e) {
-			createPageError(writer, UpdateUI.getFormattedMessage("InstallServlet.incorrectURLFormat", //$NON-NLS-1$
-			serverURL.toString()));
-		}
-	}
-
-	private void createPageError(PrintWriter writer, String problem) {
-		ServletsUtil.createError(writer, problem, UpdateUI.getString("InstallServlet.contactWebmaster")); //$NON-NLS-1$
-	}
-
-	private VersionedIdentifier[] computeVersionedIdentifiers(String[] array) {
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < array.length; i++) {
-			String id_version = array[i];
-			int sep = id_version.lastIndexOf('_');
-			if (sep == -1)
-				continue;
-			String id = id_version.substring(0, sep);
-			String version = id_version.substring(sep + 1);
-			VersionedIdentifier vid = new VersionedIdentifier(id, version);
-			result.add(vid);
-		}
-		return (VersionedIdentifier[]) result.toArray(
-			new VersionedIdentifier[result.size()]);
-	}
-
-	private boolean executeInstall(
-		final PrintWriter writer,
-		final URL siteURL,
-		final VersionedIdentifier[] vids,
-		final boolean needLicensePage) {
-
-		Display display = SWTUtil.getStandardDisplay();
-		final boolean[] result = new boolean[] { false };
-
-		display.syncExec(new Runnable() {
-			public void run() {
-				final Shell shell = UpdateUI.getActiveWorkbenchShell();
-				BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
-					public void run() {
-						result[0] =
-							doExecuteInstall(
-								writer,
-								shell,
-								siteURL,
-								vids,
-								needLicensePage);
-					}
-				});
-			}
-		});
-		return result[0];
-	}
-
-	private boolean doExecuteInstall(
-		PrintWriter writer,
-		final Shell shell,
-		URL siteURL,
-		VersionedIdentifier[] vids,
-		final boolean needLicensePage) {
-			
-		shell.forceActive();
-
-		UpdateSearchScope searchScope = new UpdateSearchScope();
-		searchScope.addSearchSite(
-			siteURL.toString(),
-			siteURL,
-			new String[0]);
-
-		final UpdateSearchRequest searchRequest =
-			new UpdateSearchRequest(
-				new SiteSearchCategory(),
-				searchScope);
-	
-		searchRequest.addFilter(new VersionedIdentifiersFilter(vids));
-		searchRequest.addFilter(new EnvironmentFilter());
-		searchRequest.addFilter(new BackLevelFilter());
-
-		shell.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				openWizard(shell, searchRequest);
-			}
-		});	
-		return true;
-	}
-
-
-	private void openWizard(Shell shell, UpdateSearchRequest searchRequest) {
-		InstallWizard wizard = new InstallWizard(searchRequest);
-		WizardDialog dialog = new ResizableWizardDialog(shell, wizard);
-		dialog.create();
-//		dialog.getShell().setText(
-//			UpdateUI.getString(KEY_OPTIONAL_INSTALL_TITLE));
-		dialog.getShell().setSize(600, 500);
-		dialog.open();
-		if (wizard.isSuccessfulInstall())
-			UpdateUI.requestRestart();
-	}
-}

diff --git a/update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/ServletsUtil.java b/update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/ServletsUtil.java
deleted file mode 100644
index 5f8eff2..0000000
--- a/update/org.eclipse.update.ui/src_webapp/org/eclipse/update/internal/ui/servlets/ServletsUtil.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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.servlets;
-
-import java.io.*;
-import java.util.*;
-
-import javax.servlet.http.*;
-
-import org.eclipse.core.boot.*;
-import org.eclipse.update.internal.ui.*;
-
-/**
- */
-public class ServletsUtil {
-
-	public static String getServerInfo(HttpServletRequest servletRequest) {
-		String host = servletRequest.getServerName();
-		int port = servletRequest.getServerPort();
-		String context = servletRequest.getContextPath();
-
-		Enumeration atts = servletRequest.getParameterNames();
-		StringBuffer buff = new StringBuffer();
-		for (; atts.hasMoreElements();) {
-			String attName = (String) atts.nextElement();
-			Object attValue = servletRequest.getParameter(attName);
-			buff.append(attName + "=" + "\"" + attValue + "\"+"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		return host + ":" + port + context + "?" + buff.toString(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static PrintWriter createResponsePrologue(HttpServletResponse response)
-		throws IOException {
-		response.setContentType("text/html"); //$NON-NLS-1$
-		PrintWriter writer = response.getWriter();
-		String title = UpdateUI.getString("ServletsUtil.responseTitle"); //$NON-NLS-1$
-		writer.println(
-			"" //$NON-NLS-1$
-				+ "<!DOCTYPE HTML PUBLIC \" -//W3C//DTD HTML 4.0 Transitional//EN\">" //$NON-NLS-1$
-				+ "\n <HTML> \n <HEAD> \n" //$NON-NLS-1$
-				+ "<TITLE>"+title+"</TITLE>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "<META http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" //$NON-NLS-1$
-				+ "</HEAD>"); //$NON-NLS-1$
-		writer.println(" <BODY topmargin=\"0\" leftmargin=\"0\">"); //$NON-NLS-1$
-		return writer;
-	}
-
-	public static void createError(
-		PrintWriter writer,
-		String problem,
-		String resolution) {
-		createHeading(writer, UpdateUI.getString("ServletsUtil.updateFailed")); //$NON-NLS-1$
-		startTextArea(writer);
-		createParagraph(writer, UpdateUI.getString("ServletsUtil.problem"), problem); //$NON-NLS-1$
-		if (resolution != null) {
-			writer.println("<p>"); //$NON-NLS-1$
-			createParagraph(writer, UpdateUI.getString("ServletsUtil.whatToDo"), resolution); //$NON-NLS-1$
-		}
-		endTextArea(writer);
-	}
-
-	public static void createParagraph(
-		PrintWriter writer,
-		String heading,
-		String text) {
-		writer.print("<b><font color=\"#5B78AC\">"); //$NON-NLS-1$
-		writer.print(heading);
-		writer.println("</b></font><br>"); //$NON-NLS-1$
-		writer.println(text);
-	}
-
-	public static void createInfo(PrintWriter writer) {
-		createHeading(writer, UpdateUI.getString("ServletsUtil.updateInProgress")); //$NON-NLS-1$
-		startTextArea(writer);
-		writer.println(
-			UpdateUI.getString("ServletsUtil.updateInitiated")); //$NON-NLS-1$
-		endTextArea(writer);
-	}
-	
-	private static boolean isWin32() {
-		return BootLoader.getWS().equals("win32"); //$NON-NLS-1$
-	}
-
-	private static void startTextArea(PrintWriter writer) {
-		writer.println(
-			"<table border=\"0\" width=\"100%\" cellspacing=\"5\" cellpadding=\"5\">"); //$NON-NLS-1$
-		writer.println("<tr>"); //$NON-NLS-1$
-		writer.print("<td width=\"100%\">"); //$NON-NLS-1$
-		if (isWin32())
-			writer.println("<font face=\"MS Sans Serif\" size=\"1\">"); //$NON-NLS-1$
-		else
-			writer.println(""); //$NON-NLS-1$
-	}
-	private static void endTextArea(PrintWriter writer) {
-		if (isWin32())
-			writer.println("</font>"); //$NON-NLS-1$
-		writer.println("</td>"); //$NON-NLS-1$
-		writer.println("</tr>"); //$NON-NLS-1$
-		writer.println("</table>"); //$NON-NLS-1$
-	}
-
-	public static void createHeading(PrintWriter writer, String title) {
-		writer.println(
-			"<table cols=1 width=\"588\" cellspacing=\"0\" cellpadding=\"0\">"); //$NON-NLS-1$
-		writer.println("<tr>"); //$NON-NLS-1$
-		writer.println(
-			"<td background=\"images/form_banner.jpg\" width=\"580\" height=\"30\">"); //$NON-NLS-1$
-		writer.print("<p><b><font size=\"3\" face=\"Tahoma\">&nbsp;"); //$NON-NLS-1$
-		writer.print(title);
-		writer.println("</font></b></p>"); //$NON-NLS-1$
-		writer.println("</td>"); //$NON-NLS-1$
-		writer.println("</tr>"); //$NON-NLS-1$
-
-		writer.println("<tr>"); //$NON-NLS-1$
-		writer.println(
-			"<td width=\"580\"><img border=\"0\" src=\"images/form_underline.jpg\" width=\"600\" height=\"15\"></td>"); //$NON-NLS-1$
-		writer.println("</td>"); //$NON-NLS-1$
-		writer.println("</tr>"); //$NON-NLS-1$
-		writer.println("</table>"); //$NON-NLS-1$
-	}
-
-	public static void createResponseEpilogue(
-		HttpServletRequest request,
-		HttpServletResponse response,
-		PrintWriter writer) {
-
-		String backURL = getOriginatingURL(request);
-		if (backURL != null) {
-			startTextArea(writer);
-			String backText = UpdateUI.getString("ServletsUtil.back"); //$NON-NLS-1$
-			writer.print("<img border=\"0\" src=\"images/backward_nav.gif\"/><a href=\""); //$NON-NLS-1$
-			writer.print(getOriginatingURL(request));
-			writer.print("\">"+backText+"</a>"); //$NON-NLS-1$ //$NON-NLS-2$
-			endTextArea(writer);
-		}
-		writer.println(" </BODY> "); //$NON-NLS-1$
-		writer.println("</HTML>"); //$NON-NLS-1$
-		writer.close();
-	}
-	private static String getOriginatingURL(HttpServletRequest request) {
-		return request.getParameter("backURL"); //$NON-NLS-1$
-	}
-}
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/webapp/WEB-INF/.cvsignore b/update/org.eclipse.update.ui/webapp/WEB-INF/.cvsignore
deleted file mode 100644
index 90b07e9..0000000
--- a/update/org.eclipse.update.ui/webapp/WEB-INF/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-classes

diff --git a/update/org.eclipse.update.ui/webapp/WEB-INF/lib/.cvsignore b/update/org.eclipse.update.ui/webapp/WEB-INF/lib/.cvsignore
deleted file mode 100644
index 64292a3..0000000
--- a/update/org.eclipse.update.ui/webapp/WEB-INF/lib/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-update-servlets.jar

diff --git a/update/org.eclipse.update.ui/webapp/WEB-INF/web.xml b/update/org.eclipse.update.ui/webapp/WEB-INF/web.xml
deleted file mode 100644
index ff84774..0000000
--- a/update/org.eclipse.update.ui/webapp/WEB-INF/web.xml
+++ /dev/null

@@ -1,20 +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>
-
-    <servlet>
-        <servlet-name>install</servlet-name>
-        <servlet-class>org.eclipse.update.internal.ui.servlets.InstallServlet</servlet-class>
-    </servlet>
-    
-	<servlet-mapping>
-		<servlet-name>install</servlet-name>
-		<url-pattern>/install</url-pattern>
-	</servlet-mapping>
-
-</web-app>
\ No newline at end of file

diff --git a/update/org.eclipse.update.ui/webapp/images/backward_nav.gif b/update/org.eclipse.update.ui/webapp/images/backward_nav.gif
deleted file mode 100644
index 85188b7..0000000
--- a/update/org.eclipse.update.ui/webapp/images/backward_nav.gif
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/webapp/images/form_banner.jpg b/update/org.eclipse.update.ui/webapp/images/form_banner.jpg
deleted file mode 100644
index 253e2d2..0000000
--- a/update/org.eclipse.update.ui/webapp/images/form_banner.jpg
+++ /dev/null
Binary files differ

diff --git a/update/org.eclipse.update.ui/webapp/images/form_underline.jpg b/update/org.eclipse.update.ui/webapp/images/form_underline.jpg
deleted file mode 100644
index 0ff3d0b..0000000
--- a/update/org.eclipse.update.ui/webapp/images/form_underline.jpg
+++ /dev/null
Binary files differ

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
commit	07db56908bb0e2552397d0430f957ce71796e46d	[log] [tgz]
author	cvs2svn <platform-releng-dev@eclipse.org>	Thu May 20 03:58:28 2004 +0000
committer	cvs2svn <platform-releng-dev@eclipse.org>	Thu May 20 03:58:28 2004 +0000
tree	efa399148bda0fe6d399dd0529ff8dbf07eeac64
parent	32d9af1c41733ad9d02251aff69183622ff80192 [diff]