This commit was manufactured by cvs2svn to create tag 'v20040603a'.
Sprout from master 2004-06-03 21:04:59 UTC darins 'Bug 65086 - Missing code completions for attribute values'
Cherrypick from master 2004-05-18 02:40:30 UTC Dorian Birsan <dbirsan> 'bug 61530':
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
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/.settings/org.eclipse.pde.core.prefs
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/.settings/org.eclipse.pde.core.prefs
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
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/standby_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.configurator/.classpath
update/org.eclipse.update.configurator/.cvsignore
update/org.eclipse.update.configurator/.options
update/org.eclipse.update.configurator/.project
update/org.eclipse.update.configurator/about.html
update/org.eclipse.update.configurator/build.properties
update/org.eclipse.update.configurator/config.ini
update/org.eclipse.update.configurator/plugin.properties
update/org.eclipse.update.configurator/plugin.xml
update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java
update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java
update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/package.html
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BootDescriptor.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleManifest.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Configuration.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationParser.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureParser.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FullFeatureParser.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/IConfigurationConstants.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfigurationFactory.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginEntry.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginParser.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ProductProvider.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SitePolicy.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/AboutInfo.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IBundleGroupConstants.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IProductConstants.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IniFileReader.java
update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties
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.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/.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.javadiff --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:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet" editPageId="org.eclipse.ui.resourceWorkingSetPage"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.ant.core/src_ant" type="2"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml" type="1"/> </launchConfigurationWorkingSet> }"/>
-<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:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.ant.core" type="4"/> </launchConfigurationWorkingSet> }"/>
-<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/.settings/org.eclipse.pde.core.prefs b/ant/org.eclipse.ant.core/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index a490ecf..0000000
--- a/ant/org.eclipse.ant.core/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu May 27 14:47:50 PDT 2004
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.ant.core/src_ant_bin
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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Ant-Derived Work") 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 "Ant" and "Apache Software Foundation" must not be used to endorse or promote products derived from this
-software without prior written permission. For written permission, please contact <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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 793a766..0000000
--- a/ant/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
+++ /dev/null
@@ -1,50 +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"/>
- </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="yes"
- 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}/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>
\ No newline at end of file
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 f0f9ed1..0000000
--- a/ant/org.eclipse.ant.core/buildnotes_platform-ant.html
+++ /dev/null
@@ -1,920 +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 June 3, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=65582">65582</a>: warning in generated javadoc for AntCorePreferences<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 27, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63448">63448</a>: Exception with non-existent property file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=55793">55793</a>: [Editor] Taskdef warnings length is not adjusted correctly in targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63123">63123</a>: Run from context menu of external entity does not build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63165">63165</a>: AntModel#possiblyWaitForReconcile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51333">51333</a>: Position for error markers is wrong<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 25, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63760">63760</a>: No external tool build on clean if first builder disabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63558">63558</a>: formatter removes text<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63335">63335</a>: VM arguments text pane should grab horizontal space<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63884">63884</a>: NPE editing Ant builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63604">63604</a>: Modal progress improvements round two<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63339">63339</a>: AntUtil#getFileForLocation(...) has incorrect behavior on WinOS<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 20, 2004
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62830">62830</a>: Ant Build and Ant Build... both appear on Run menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63010">63010</a>: Colon for projects label from Ant build tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63142">63142</a>: Error remains after turning off Build before launch<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63151">63151</a>: NPE parsing buildfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63045">63045</a>: Use JFace MessageDialogWithToggle<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62826">62826</a>: Remove duplicate property configuration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62967">62967</a>: VM never exits (using older VM for an Ant build)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=63125">63125</a>: Problem from import not reported correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=60916">60916</a>: Icon look unalligned<br>
-
-<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>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61788">61788</a>: Cleanup IntrospectionHelpers when editor closes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61947">61947</a>: InternalAntRunner.java has 2 copyright notices<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51381">51381</a>: Add "Import from Ant buildfile"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51781">51781</a>: Top level tasks causing problems<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61396">61396</a>: Consistency in Ant shortcuts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=57379">57379</a>: partition scanner doesn't handle CDATA sections<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61830">61830</a>: Ant Editor shows bogus errors when using property setting tasks<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62234">62234</a>: Ant color settings should NOT be shown in Workbench>Colors and Fonts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61402">61402</a>: Remove AntEditor annotation and quick diff pref pages<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62563">62563</a>: NPE editing external Ant file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34971">34971</a>: Global and local properties and property files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61553">61553</a>: formatter should expose api for formatting docs & tags together<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54723">54723</a>: [Editor] No indication of error, no outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=58374">58374</a>: Building with external build files from editor "context"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61955">61955</a>: dangerous practice of catching Throwable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54466">54466</a>: ant formatter preference page should include preview window<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62237">62237</a>: Ant syntax coloring options lacks a preview<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=62403">62403</a>: Create separate Code Assist page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=61806">61806</a>: Move off of InputDialog deprecated code<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 "</"<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 problem 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 189b63a..0000000
--- a/ant/org.eclipse.ant.core/plugin.xml
+++ /dev/null
@@ -1,68 +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="*"/>
- </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>
-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>
-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 "class" attribute is ignored.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
- If there is no 'value' 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 "headless" Ant environment. If running headless and the attribute is "false",
- the property will not be set and any specified <samp>org.eclipse.ant.core.IAntPropertyProvider</samp> 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:
-<p>
-<pre>
- <extension point="org.eclipse.ant.core.antProperties">
- <antProperty name="eclipse.home"
- class="org.eclipse.ant.internal.core.AntPropertyValueProvider"/>
- <antProperty name="eclipse.running"
- value="true"/>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The class named in the <samp>class</samp> property must implement the <samp>org.eclipse.ant.core.IAntPropertyProvider</samp> 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>
- <a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2003. All Rights Reserved." BORDER=0 height=12 width=195></a>
- </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
-<samp>org.apache.tools.ant.Task</samp>.
- </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 "headless" Ant environment. If running headless and the attribute is "false",
- the task will not be loaded or defined. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
- The implied value is true, when not specified.
- </documentation>
- </annotation>
- </attribute>
- <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:
-<p>
-<pre>
- <extension point="org.eclipse.ant.core.antTasks">
- <antTask name="coolTask" class="com.example.CoolTask" library="lib/antSupport.jar"/>
- </extension>
-</pre>
-</p>
- </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>
- <a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003. All Rights Reserved." BORDER=0 height=14 width=324></a>
- </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
-<samp>org.apache.tools.ant.types.DataType</samp>.
- </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 "headless" Ant environment. If running headless and the attribute is "false",
- the type will not be loaded or defined. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
- The implied value is true, when not specified.
- </documentation>
- </annotation>
- </attribute>
- <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:
-<p>
-<pre>
- <extension point="org.eclipse.ant.core.antTypes">
- <antType name="coolType" class="com.example.CoolType" library="lib/antSupport.jar"/>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- <a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003. All Rights Reserved." BORDER=0 height=14 width=324></a>
- </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 "headless" Ant environment. If running headless and the attribute is "false",
- this entry will not be added to the Ant classpath. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
- The implied value is true, when not specified.
- </documentation>
- </annotation>
- </attribute>
- <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:
-
-<p>
-<pre>
- <extension point="org.eclipse.ant.core.extraClasspathEntries">
- <extraClasspathEntry library="myExtraLibrary.jar"/>
- </extension>
-</pre>
-</p>
- </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>
- <a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003. All Rights Reserved." BORDER=0 height=14 width=324></a>
- </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 a4c2950..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
+++ /dev/null
@@ -1,1500 +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 ("jre".equalsIgnoreCase(javaHomePath.lastSegment())) { //$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) {
- addEntryURLs(result, antHomeEntries);
- }
- if (additionalEntries != null && additionalEntries.length > 0) {
- addEntryURLs(result, additionalEntries);
- }
-
- for (int i = 0; i < extraClasspathURLs.size(); i++) {
- IAntClasspathEntry entry = (IAntClasspathEntry) extraClasspathURLs.get(i);
- URL url= entry.getEntryURL();
- if (url != null) {
- result.add(url);
- }
- }
-
- return (URL[]) result.toArray(new URL[result.size()]);
- }
-
- private void addEntryURLs(List result, IAntClasspathEntry[] entries) {
- for (int i = 0; i < entries.length; i++) {
- IAntClasspathEntry entry = entries[i];
- URL url= entry.getEntryURL();
- if (url != null) {
- result.add(url);
- }
- }
- }
-
- 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) {
- //notify the user via the Ant console of the missing file
- files.add(filename);
- }
- }
- 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);
- boolean classpathChanged= AntCorePlugin.getPlugin().getPluginPreferences().needsSaving();
- AntCorePlugin.getPlugin().savePluginPreferences();
- if (classpathChanged) {
- prefs.setValue(IAntCoreConstants.PREFERENCE_CLASSPATH_CHANGED, true);
- }
- prefs.setValue(IAntCoreConstants.PREFERENCE_CLASSPATH_CHANGED, false);
- 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 <input> 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 06f6517..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java
+++ /dev/null
@@ -1,103 +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) {
- try {
- return new URL("file:" + entryString); //$NON-NLS-1$
- } catch (MalformedURLException e1) {
- return null;
- }
- } 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 561e06d..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.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.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$
-
- public static final String PREFERENCE_CLASSPATH_CHANGED = "classpath_changed"; //$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 9fb0ac8..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalProject.java
+++ /dev/null
@@ -1,179 +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;
- }
-
- Throwable thrown = 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) {
- thrown = ite.getTargetException();
- } catch (IllegalArgumentException e) {
- thrown = e;
- } catch (InstantiationException e) {
- thrown = e;
- } catch (IllegalAccessException e) {
- thrown = e;
- } catch (NoSuchMethodException nse) {
- thrown = nse;
- } catch (NoClassDefFoundError ncdfe) {
- thrown = ncdfe;
- }
- if (thrown != null) {
- String message= MessageFormat.format(InternalAntMessages.getString("InternalProject.0"), new String[]{typeName, thrown.toString()}); //$NON-NLS-1$
- throw new BuildException(message, thrown);
- }
- // this line is actually unreachable
- return null;
- }
-
- /**
- * Initialize the mapping of data type name to data type classname
- */
- private void initializeTypes() {
- typeNameToClass = new Hashtable(18);
- String dataDefs = "/org/apache/tools/ant/types/defaults.properties"; //$NON-NLS-1$
- try {
- Properties props = new Properties();
- InputStream in = Project.class.getResourceAsStream(dataDefs);
- if (in == null) {
- return;
- }
- props.load(in);
- in.close();
-
- Enumeration 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:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet" editPageId="org.eclipse.ui.resourceWorkingSetPage"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.ant.tests.core/test support/org" type="2"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml" type="1"/> </launchConfigurationWorkingSet> }"/>
-<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:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" name="workingSet"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.ant.tests.core" type="4"/> </launchConfigurationWorkingSet> }"/>
-<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/.settings/org.eclipse.pde.core.prefs b/ant/org.eclipse.ant.tests.core/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index f01a374..0000000
--- a/ant/org.eclipse.ant.tests.core/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu May 27 14:48:43 PDT 2004
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.ant.tests.core/test_support_bin
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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 5c62628..0000000
--- a/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
+++ /dev/null
@@ -1,42 +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="yes" bootclasspath="${bootclasspath}"
- classpath="${basedir}/../org.eclipse.core.runtime/bin;
- ${eclipse.home}/plugins/org.eclipse.core.runtime${version.suffix}/runtime.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/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 e76e7e9..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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 90a4aa2..0000000
--- a/platform/org.eclipse.platform/about.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-# 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 Eclipse contributors and others 2000, 2004. 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 > 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 > 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 > 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 540306b..0000000
--- a/platform/org.eclipse.platform/css/overview/swt.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-
-overview.layout.ncolumns = 2
-overview.page-content.overview-links.layout.vspacing = 35
-
-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 ea4ca8d..0000000
--- a/platform/org.eclipse.platform/css/root.css
+++ /dev/null
@@ -1,192 +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,
-#page-links a:focus .link-label,
-#page-links a:active .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,
-#page-links a:focus,
-#page-links a:active { border : 0px; }
-
-#page-links a:hover p,
-#page-links a:focus p,
-#page-links a:active 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,
-a#overview:focus img,
-a#overview:active img { background-image : url(graphics/icons/ctool/overview72.gif); }
-
-a#tutorials img { background-image : url(graphics/icons/etool/tutorials72.gif); }
-a#tutorials:hover img,
-a#tutorials:focus img,
-a#tutorials:active img { background-image : url(graphics/icons/ctool/tutorials72.gif); }
-
-a#samples img { background-image : url(graphics/icons/etool/samples72.gif); }
-a#samples:hover img,
-a#samples:focus img,
-a#samples:active img { background-image : url(graphics/icons/ctool/samples72.gif); }
-
-a#news img { background-image : url(graphics/icons/etool/whatsnew72.gif); }
-a#news:hover img,
-a#news:focus img,
-a#news:active 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,
-a#workbench:focus img,
-a#workbench:active 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,
-#action-links a:focus .link-label,
-#action-links a:active .link-label { display : block; width : 16em; }
-
-#action-links a:hover p .text,
-#action-links a:focus p .text,
-#action-links a:active p .text { display : block; width : 16em; }
-
-#action-links a:hover,
-#action-links a:focus,
-#action-links a:active { 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 bbbdb55..0000000
--- a/platform/org.eclipse.platform/css/root_swt.properties
+++ /dev/null
@@ -1,29 +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
-
-root.layout.ncolumns = 1
-root.links-background.page-links.layout.hspacing = 40
-root.layout.vspacing = 35
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 28c5efb..0000000
--- a/platform/org.eclipse.platform/css/samples/swt.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-
-samples.page-content.layout.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.layout.vspacing = 30
-samples.page-content.swt.layout.ncolumns = 2
-samples.page-content.swt.layout.vspacing = 30
-samples.page-content.swt.layout.hspacing = 30
-samples.page-content.workbench.layout.ncolumns = 2
-samples.page-content.workbench.layout.vspacing = 30
-samples.page-content.workbench.layout.hspacing = 30
-
-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 cbfa285..0000000
--- a/platform/org.eclipse.platform/css/shared.css
+++ /dev/null
@@ -1,250 +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,
-#navigation-links a:focus
-#navigation-links a:active { 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,
-#navigation-links a#overview:focus img,
-#navigation-links a#overview:active 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,
-#navigation-links a#tutorials:active img,
-#navigation-links a#tutorials:focus 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,
-#navigation-links a#samples:active img,
-#navigation-links a#samples:focus 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,
-#navigation-links a#news:focus img,
-#navigation-links a#news:active 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,
-#navigation-links a#workbench:focus .link-label,
-#navigation-links a#workbench:active .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,
-#navigation-links a#workbench:focus img,
-#navigation-links a#workbench:active 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/standby_swt.properties b/platform/org.eclipse.platform/css/standby_swt.properties
deleted file mode 100644
index 8fbb36d..0000000
--- a/platform/org.eclipse.platform/css/standby_swt.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-standby.links-background.page-links.overview.link-icon = css/graphics/icons/etool/overview72.gif
-standby.links-background.page-links.tutorials.link-icon = css/graphics/icons/etool/tutorials72.gif
-standby.links-background.page-links.samples.link-icon= css/graphics/icons/etool/samples72.gif
-standby.links-background.page-links.news.link-icon = css/graphics/icons/etool/whatsnew72.gif
-
-
-standby.links-background.page-links.overview.hover-icon = css/graphics/icons/ctool/overview72.gif
-standby.links-background.page-links.tutorials.hover-icon = css/graphics/icons/ctool/tutorials72.gif
-standby.links-background.page-links.samples.hover-icon = css/graphics/icons/ctool/samples72.gif
-standby.links-background.page-links.news.hover-icon = css/graphics/icons/ctool/whatsnew72.gif
-
-
-standby.links-background.page-links.layout.vspacing = 30
-standby.layout.vspacing = 35
-standby.show-link-description = false
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 c0ad472..0000000
--- a/platform/org.eclipse.platform/css/tutorials/swt.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tutorials.page-content.layout.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 1f60ce8..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.page-content.news-links.layout.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 783db20..0000000
--- a/platform/org.eclipse.platform/introContent.xml
+++ /dev/null
@@ -1,155 +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'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/close" label="Workbench" id="workbench">
- <text>Go to the workbench</text>
- </link>
- </group>
- </page>
- <!--
-
--->
- <page alt-style="css/standby_swt.properties" style="css/root.css" id="standby" 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&standby=false" 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&standby=false" 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&standby=false" id="samples" style-id="right">
- <text>Explore Eclipse development through code samples</text>
- </link>
- <link label="What's New" url="http://org.eclipse.ui.intro/showPage?id=news&standby=false" id="news" style-id="right">
- <text>Find out what is new in this release</text>
- </link>
- </group>
- </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" filteredFrom="swt"/>
- <group id="curve-image" filteredFrom="swt"/>
- <group id="navigation-links" filteredFrom="swt">
- <include path="root/links-background/page-links"/>
- <include path="root/action-links"/>
- </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>
- <anchor id="jdtAnchor"/>
- <anchor id="pdeAnchor"/>
- </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" filteredFrom="swt"/>
- <group id="curve-image" filteredFrom="swt"/>
- <include path="overview/navigation-links"/>
- <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>
- <anchor id="jdtAnchor"/>
- <anchor id="pdeAnchor"/>
- </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" filteredFrom="swt"/>
- <group id="curve-image" filteredFrom="swt"/>
- <include path="overview/navigation-links"/>
- <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&class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&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&class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&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&class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&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&class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&id=org.eclipse.sdk.samples.readmetool" id="readmetool" style-id="sample-link">
- <text>Shows how to create your own extension points</text>
- </link>
- <anchor id="jdtAnchor"/>
- </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" filteredFrom="swt"/>
- <group id="curve-image" filteredFrom="swt"/>
- <include path="overview/navigation-links"/>
- <group id="page-content">
- <text style-id="page-title" id="page-title">WHAT'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.ui.ide&class=org.eclipse.ui.internal.ide.update.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 edb80af..0000000
--- a/platform/org.eclipse.platform/plugin.xml
+++ /dev/null
@@ -1,76 +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="$nl$/introContent.xml">
- <presentation
- home-page-id="root" standby-page-id="standby">
- <implementation
- ws="win32"
- style="css/shared.css"
- kind="html"
- os="win32">
- </implementation>
- <implementation
- 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 f22863c..0000000
--- a/platform/org.eclipse.platform/plugin_customization.ini
+++ /dev/null
@@ -1,17 +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
-
-# new-style tabs by default
-org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
-
-# put the perspective switcher on the top right
-org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
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 a1ef183..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 dc4f4cf..0000000
--- a/platform/org.eclipse.platform/src-intro/org/eclipse/platform/internal/CheatSheetStandbyContent.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.platform.internal;
-
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.cheatsheets.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.intro.*;
-import org.eclipse.ui.intro.config.*;
-
-public final class CheatSheetStandbyContent implements IStandbyContentPart {
-
- private static String MEMENTO_CHEATSHEET_ID_ATT = "cheatsheetId";
-
- private IIntroPart introPart;
- private ICheatSheetViewer viewer;
- private Composite container;
- private String input;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#init(org.eclipse.ui.intro.IIntroPart)
- */
- public void init(IIntroPart introPart, IMemento memento) {
- this.introPart = introPart;
- // try to restore last state.
- input = getCachedInput(memento);
- }
-
- /*
- * (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#setInput(java.lang.Object)
- */
- public void setInput(Object input) {
- // if the new input is null, use cacched input from momento.
- if (input != null)
- this.input = (String) input;
- viewer.setInput(this.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() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.intro.config.IStandbyContentPart#saveState(org.eclipse.ui.IMemento)
- */
- public void saveState(IMemento memento) {
- String currentCheatSheetId = viewer.getCheatSheetID();
- if (currentCheatSheetId != null)
- memento.putString(MEMENTO_CHEATSHEET_ID_ATT, currentCheatSheetId);
- }
-
- /**
- * Tries to create the last content part viewed, based on content part id..
- *
- * @param memento
- * @return
- */
- private String getCachedInput(IMemento memento) {
- if (memento == null)
- return null;
- return memento.getString(MEMENTO_CHEATSHEET_ID_ATT);
-
- }
-
-}
\ No newline at end of file
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 317bdd2..0000000
--- a/platform/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java
+++ /dev/null
@@ -1,1511 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies 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;
- // sync call to the launcher
- runCommand(true, 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);
- } 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;
- // async call to the launcher
- showProcess = runCommand(false, showSplash, location, " " + SHOWSPLASH); //$NON-NLS-1$
- }
-
- private Process runCommand(boolean block, 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);
- if (block)
- result.waitFor();
- } 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>
-</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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 0d65b09..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 Eclipse contributors and others 2000, 2004. 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 73152aa..0000000
--- a/platform/org.eclipse.sdk/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-pluginName=Eclipse Project SDK
-providerName=Eclipse.org
-
-activity.java=Java Development
-activity.java.desc=Develop Java applications.
-activity.plugin=Plug-in Development
-activity.plugin.desc=Develop plug-ins, fragments, and features for Eclipse.
-
-activity.team.cvs=CVS Support
-activity.team.cvs.desc=Use the Concurrent Versions System (CVS) to manage resources.
-activity.team=Core Team Support
-activity.team.desc=Share projects using configuration management systems.
-
-activity.cat.development=Development
-activity.cat.development.desc=Use the Eclipse SDK to develop applications.
-activity.cat.team=Team
-activity.cat.team.desc=Use configuration management systems to manage resources.
-
-
-
-
diff --git a/platform/org.eclipse.sdk/plugin.xml b/platform/org.eclipse.sdk/plugin.xml
deleted file mode 100644
index 68c39dc..0000000
--- a/platform/org.eclipse.sdk/plugin.xml
+++ /dev/null
@@ -1,157 +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>
-
- <activityRequirementBinding
- activityId="org.eclipse.plugInDevelopment"
- requiredActivityId="org.eclipse.javaDevelopment">
- </activityRequirementBinding>
-
- <activity
- name="%activity.team.cvs"
- description="%activity.team.cvs.desc"
- id="org.eclipse.team.cvs">
- </activity>
-
- <activity
- name="%activity.team"
- description="%activity.team.desc"
- id="org.eclipse.team">
- </activity>
-
- <activityRequirementBinding
- activityId="org.eclipse.team.cvs"
- requiredActivityId="org.eclipse.team">
- </activityRequirementBinding>
-
- <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>
- <activityPatternBinding
- activityId="org.eclipse.team"
- pattern="org\.eclipse\.team\.ui/org.*">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.team.cvs"
- pattern="org\.eclipse\.team\.cvs\.ui/.*">
- </activityPatternBinding>
-
- <category
- name="%activity.cat.development"
- description="%activity.cat.development.desc"
- id="org.eclipse.categories.developmentCategory">
- </category>
-
- <category
- name="%activity.cat.team"
- description="%activity.cat.team.desc"
- id="org.eclipse.categories.teamCategory">
-
- </category>
-
- <categoryActivityBinding
- activityId="org.eclipse.javaDevelopment"
- categoryId="org.eclipse.categories.developmentCategory">
- </categoryActivityBinding>
-
- <categoryActivityBinding
- activityId="org.eclipse.plugInDevelopment"
- categoryId="org.eclipse.categories.developmentCategory">
- </categoryActivityBinding>
-
- <categoryActivityBinding
- activityId="org.eclipse.team"
- categoryId="org.eclipse.categories.teamCategory">
- </categoryActivityBinding>
-
- <categoryActivityBinding
- activityId="org.eclipse.team.cvs"
- categoryId="org.eclipse.categories.teamCategory">
- </categoryActivityBinding>
-
- <!-- bind all elements that start with "org" -->
-
- <defaultEnablement
- id="org.eclipse.javaDevelopment">
- </defaultEnablement>
-
- <defaultEnablement
- id="org.eclipse.plugInDevelopment">
- </defaultEnablement>
-
- <defaultEnablement
- id="org.eclipse.team">
- </defaultEnablement>
-
- <defaultEnablement
- id="org.eclipse.team.cvs">
- </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/.classpath b/update/org.eclipse.update.configurator/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/update/org.eclipse.update.configurator/.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.configurator/.cvsignore b/update/org.eclipse.update.configurator/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/update/org.eclipse.update.configurator/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/update/org.eclipse.update.configurator/.options b/update/org.eclipse.update.configurator/.options
deleted file mode 100644
index a2c714f..0000000
--- a/update/org.eclipse.update.configurator/.options
+++ /dev/null
@@ -1,5 +0,0 @@
-# Debugging options for the org.eclipse.update.configurator plugin
-
-# Turn on general debugging for the plugin.
-org.eclipse.update.configurator/debug=false
-
diff --git a/update/org.eclipse.update.configurator/.project b/update/org.eclipse.update.configurator/.project
deleted file mode 100644
index 0f091b2..0000000
--- a/update/org.eclipse.update.configurator/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.update.configurator</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.core.boot</project>
- <project>org.eclipse.core.runtime</project>
- <project>org.eclipse.osgi</project>
- <project>org.eclipse.osgi.util</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.configurator/about.html b/update/org.eclipse.update.configurator/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.configurator/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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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.configurator/build.properties b/update/org.eclipse.update.configurator/build.properties
deleted file mode 100644
index 9fd124f..0000000
--- a/update/org.eclipse.update.configurator/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = .options,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- *.jar,\
- META-INF/,\
- config.ini
-src.includes = about.html
-source.configurator.jar = src/
diff --git a/update/org.eclipse.update.configurator/config.ini b/update/org.eclipse.update.configurator/config.ini
deleted file mode 100644
index 2dcd1a8..0000000
--- a/update/org.eclipse.update.configurator/config.ini
+++ /dev/null
@@ -1,60 +0,0 @@
-# Eclipse runtime configuration file
-# This file contains a number of key/value pairs that are merged into the
-# System properties on system startup. The values control the way the
-# runtime is structured and runs.
-
-# Note: Only platform:/base/ and file: URLs are supported. In general the
-# URLs given may include a version number (e.g., .../location_1.2.3).
-# If a version is not specified, the system binds
-# to the location which matches exactly or to the versioned location with the
-# latest version number. If a version number is given then only exact matches
-# are considered.
-
-# The URL for the runtime entry point. The default value is
-# platform:/base/plugins/org.eclipse.osgi
-#osgi.framework = platform:/base/plugins/org.eclipse.osgi
-
-# The classpath for the framework found at the osgi.framework location. This
-# comma-separated list contains either URLs or simple element names. Simple
-# names are assumed to be relative to the framework's install directory.
-# Typically this value need not be set as it is initialized by the framework itself.
-# Version match searching is not done for URLs listed here.
-#osgi.frameworkClassPath =
-
-# The comma-separated list of locations to search for the splash screen file (splash.bmp).
-# For each list element a subdirectory structure based on the pattern nl/<locale> is searched.
-# The system binds to the first matching file. There is no default value.
-osgi.splashPath = platform:/base/plugins/org.eclipse.platform
-
-# The location of the splash screen file. If this value is set at system startup it is used
-# in favour of the osgi.splashPath searching outlined above. If the value is not set
-# the searching is done and this key is bound to the result of the search.
-#osgi.splashLocation =
-
-# The comma-separated list of bundles which are automatically installed and started
-# once the system is up and running. Each entry if of the form
-# <URL | simple bundle location>[@<startlevel>]
-# Simple bundle locations are interepreted as relative to the framework's parent directory.
-# The startlevel indicates the OSGi start level at which the bundle should run.
-# If this value is not set, the system computes an appropriate default.
-# osgi.bundles =
-#osgi.bundles=org.eclipse.core.runtime@2:start, org.eclipse.update.configurator@3:start
-
-# Default start level of bundles
-#osgi.bundles.defaultStartLevel=4
-
-# The product to run. A given Eclipse configuration may contain many products.
-# The product identified will supply the branding (window icons, title bar text) etc
-# as well as define the default application to run.
-eclipse.product=org.eclipse.platform
-
-# The application to run. The value specified here is the id of the application extension
-# the runtime will find, instantiate and execute once the system is up. When this
-# application exits, eclipse will also exit. Note that typically the identified eclipse.product
-# defines the default application to run.
-#eclipse.application=org.eclipse.ui.ide.workbench
-
-
-
-# End of file marker - must be here
-eof=eof
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/plugin.properties b/update/org.eclipse.update.configurator/plugin.properties
deleted file mode 100644
index 9ec972d..0000000
--- a/update/org.eclipse.update.configurator/plugin.properties
+++ /dev/null
@@ -1,14 +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= Install/Update Configurator
-providerName= Eclipse.org
-productProviderName= Update Configurator Product Provider
-
diff --git a/update/org.eclipse.update.configurator/plugin.xml b/update/org.eclipse.update.configurator/plugin.xml
deleted file mode 100644
index 3b5bbef..0000000
--- a/update/org.eclipse.update.configurator/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.update.configurator"
- name="%pluginName"
- version="3.0.0"
- provider-name="%providerName"
- class="org.eclipse.update.internal.configurator.ConfigurationActivator">
-
- <runtime>
- <library name="configurator.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-
-
- <extension
- id="updateConfiguratorProductProvider"
- name="%productProviderName"
- point="org.eclipse.core.runtime.products">
- <provider>
- <run class="org.eclipse.update.internal.configurator.ProductProvider"/>
- </provider>
-
- </extension>
-
-</plugin>
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java
deleted file mode 100644
index c6c3ed0..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfiguratorUtils.java
+++ /dev/null
@@ -1,80 +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.update.configurator;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.update.internal.configurator.ConfigurationActivator;
-import org.osgi.framework.*;
-
-/**
- * Helper class to get platform configuration data without having to
- * use BootLoader methods from the compatibility layer.
- * <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 ConfiguratorUtils {
- /**
- * Returns the current platform configuration. This method replaces the one we used
- * to call on BootLoader.
- *
- * @return platform configuration used in current instance of platform
- * @since 3.0
- */
- public static IPlatformConfiguration getCurrentPlatformConfiguration() {
- // acquire factory service first
- BundleContext context = ConfigurationActivator.getBundleContext();
- ServiceReference configFactorySR = context.getServiceReference(IPlatformConfigurationFactory.class.getName());
- if (configFactorySR == null)
- throw new IllegalStateException();
- IPlatformConfigurationFactory configFactory = (IPlatformConfigurationFactory) context.getService(configFactorySR);
- if (configFactory == null)
- throw new IllegalStateException();
- // get the configuration using the factory
- IPlatformConfiguration currentConfig = configFactory.getCurrentPlatformConfiguration();
- context.ungetService(configFactorySR);
- return currentConfig;
- }
-
- /**
- * Returns a platform configuration object, optionally initialized with previously saved
- * configuration information. We will use this method instead of the old one in BootLoader.
- *
- * @param url location of previously save configuration information. If <code>null</code>
- * is specified, an empty configuration object is returned
- * @return platform configuration used in current instance of platform
- */
- public static IPlatformConfiguration getPlatformConfiguration(URL url) throws IOException {
- // acquire factory service first
- BundleContext context = ConfigurationActivator.getBundleContext();
- ServiceReference configFactorySR = context.getServiceReference(IPlatformConfigurationFactory.class.getName());
- if (configFactorySR == null)
- throw new IllegalStateException();
- IPlatformConfigurationFactory configFactory = (IPlatformConfigurationFactory) context.getService(configFactorySR);
- if (configFactory == null)
- throw new IllegalStateException();
- // get the configuration using the factory
- IPlatformConfiguration config = configFactory.getPlatformConfiguration(url);
- context.ungetService(configFactorySR);
- return config;
- }
-
- public static URL getInstallURL() {
- return ConfigurationActivator.getInstallURL();
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
deleted file mode 100644
index 2e402b5..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfiguration.java
+++ /dev/null
@@ -1,583 +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.configurator;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * Platform configuration interface. Represents the runtime
- * configuration used by the Eclipse platform. Any configuration
- * changes do not take effect until next startup of the Eclipse
- * platform.
- * <p>
- * Do not provide implementations of this interface or its nested interfaces. Use the factory methods
- * on IPlatformConfigurationFactory to create a IPlatformConfiguration, then use the factory methods
- * on the IPlatformConfiguration to create instances of ISiteEntry,IFeatureEntry and ISitePolicy.
- * </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 3.0
- */
-public interface IPlatformConfiguration {
-
- /**
- * Configuration entry representing an install site.
- *
- * @since 2.0
- */
- public interface ISiteEntry {
-
- /**
- * Returns the URL for this site
- *
- * @return site url
- * @since 2.0
- */
- public URL getURL();
-
- /**
- * Returns the policy for this site
- *
- * @return site policy
- * @since 2.0
- */
- public ISitePolicy getSitePolicy();
-
- /**
- * Sets the site policy
- *
- * @param policy site policy
- * @since 2.0
- */
- public void setSitePolicy(ISitePolicy policy);
-
- /**
- * Returns a list of features visible on the site. Note, that this is simply a
- * reflection of the site content. The features may or may not be actually configured.
- *
- * @return an array of feature entries, or an empty array if no features are found.
- * A feature entry is returned as a path relative to the site URL
- * @since 2.0
- */
- public String[] getFeatures();
-
- /**
- * Returns a list of plug-ins visible on the site. Note, that this is simply a
- * reflection of the site content and the current policy for the site. The plug-ins
- * may or may not end up being used by Eclipse (depends on which plug-in are
- * actually bound by the platform).
- *
- * @return an array of plug-in entries, or an empty array if no plug-ins are found.
- * A plug-in entry is returned as a path relative to the site URL *
- * @since 2.0
- */
- public String[] getPlugins();
-
- /**
- * Returns a stamp reflecting the current state of the site. If called repeatedly,
- * returns the same value as long as no changes were made to the site (changes to
- * features or plugins).
- *
- * @return site change stamp
- * @since 2.0
- */
- public long getChangeStamp();
-
- /**
- * Returns a stamp reflecting the current state of the features on the site.
- * If called repeatedly, returns the same value as long as no changes were made to
- * features on the site.
- *
- * @return site features change stamp
- * @since 2.0
- * @deprecated Do not use this method
- */
- public long getFeaturesChangeStamp();
-
- /**
- * Returns a stamp reflecting the current state of the plug-ins on the site.
- * If called repeatedly, returns the same value as long as no changes were made to
- * plug-ins on the site.
- *
- * @return site plug-ins change stamp
- * @since 2.0
- * @deprecated Do not use this method
- */
- public long getPluginsChangeStamp();
-
- /**
- * Returns an indication whether the site can be updated.
- *
- * @return <code>true</code> if site can be updated, <code>false</code> otherwise
- * @since 2.0
- */
- public boolean isUpdateable();
-
- /**
- * Returns an indication whether the site represents an install site
- * that has been linked via a native installer (using the links/<linkfile>
- * mechanism)
- *
- * @return <code>true</code> if the site is linked, <code>false</code> otherwise
- * @since 2.0
- */
- public boolean isNativelyLinked();
- }
-
- /**
- * Site policy. The site policy object determines how plug-ins
- * contained on the site are processed during startup. In general,
- * there are 3 ways of configuring a site policy
- * <ul>
- * <li>explicitly specify which plug-ins are to be included at
- * startup (type==USER_INCLUDE). Any other plug-ins located
- * at the site are ignored at startup. This is typically the best
- * policy when using remote sites where the user wishes
- * to retain explicit control over the plug-ins that are included
- * from such site.
- * <li>explicitly specify which plug-ins are to be excluded at
- * startup (type==USER-EXCLUDE). All other plug-ins located
- * at the site are used at startup. This policy requires that
- * the site support an access "protocol" that allows plug-in
- * discovery. In general, these are sites defined using the "file"
- * URL protocol. This is typically the best policy for local
- * install sites (on the user system).
- * </ul>
- *
- * @since 2.0
- */
- public interface ISitePolicy {
-
- /**
- * Policy type constants.
- */
-
- /**
- * User-defined inclusion list. The list associated with this
- * policy type is interpreted as path entries to included plugin.xml
- * or fragment.xml <b>relative</b> to the site URL
- */
- public static final int USER_INCLUDE = 0;
-
- /**
- * User-defined exclusion list. The list associated with this
- * policy type is interpreted as path entries to excluded plugin.xml
- * or fragment.xml <b>relative</b> to the site URL
- */
- public static final int USER_EXCLUDE = 1;
-
- /**
- * Return policy type
- *
- * @return policy type
- * @since 2.0
- */
- public int getType();
-
- /**
- * Return policy inclusion/ exclusion list
- *
- * @return the list as an array
- * @since 2.0
- */
- public String[] getList();
-
- /**
- * Set new policy list. The list entries are interpreted based on the policy
- * type. See description of the policy type constants for details.
- *
- * @param list policy inclusion/ exclusion list as an array.
- * Returns an empty array if there are no entries.
- * @see #USER_INCLUDE
- * @see #USER_EXCLUDE
- * @since 2.0
- */
- public void setList(String[] list);
- }
-
- /**
- * Feature entry.
- * Represents runtime "hints" about configured features.
- * The information is used during execution to locate the
- * correct attribution information for a feature. Note,
- * that a typical configuration can declare multiple feature
- * entries. At execution time, only one can be selected as
- * the active primary feature. This is determined based on
- * specified command line arguments or computed defaults.
- *
- * @since 2.0
- */
- public interface IFeatureEntry {
-
- /**
- * Returns feature identifier.
- * @return feature identifier
- * @since 2.0
- */
- public String getFeatureIdentifier();
-
- /**
- * Returns the currently configured version for the feature.
- * @return feature version (as string), or <code>null</code>
- * @since 2.0
- */
- public String getFeatureVersion();
-
- /**
- * Returns the identifier of the feature plug-in for this feature entry.
- * Note, that there is no guarantee that a feature in fact
- * supplies a corresponding feature plugin, so the result can be
- * <code>null</code>. Also, if supplied, there is no guarantee that the
- * plugin will in fact be loaded into the plug-in registry at runtime
- * (due to rules and constraint checking performed by the registry
- * loading support). Consequently code making use of this method must
- * handle these conditions.
- * @return feature identifier (as string), or <code>null</code>
- * @since 2.1
- */
- public String getFeaturePluginIdentifier();
-
- /**
- * Returns the version of the feature plug-in for this feature
- * entry. Note, that there is no guarantee that a feature in fact
- * supplies a corresponding feature plugin, so the result can be
- * <code>null</code>. Also, if supplied, there is no guarantee that the
- * plugin will in fact be loaded into the plug-in registry at runtime
- * (due to rules and constraint checking performed by the registry
- * loading support). Consequently code making use of this method must
- * handle these conditions.
- * @return feature version (as string), or <code>null</code>
- * @since 2.0
- */
- public String getFeaturePluginVersion();
-
- /**
- * Returns the application to run when this feature is the
- * primary feature.
- * @return application identifier, or <code>null</code>
- * @since 2.0
- */
- public String getFeatureApplication();
-
- /**
- * Returns URLs to the feature "root" locations. The root
- * URLs are install locations of the feature plugin and its
- * fragments.
- *
- * @return array of URLs, or an empty array
- * @since 2.0
- */
- public URL[] getFeatureRootURLs();
-
- /**
- * Returns an indication whether this feature has been defined
- * to act as a primary feature.
- * @return <code>true</code> if the feature can be primary,
- * <code>false</code> otherwise.
- * @since 2.0
- */
- public boolean canBePrimary();
- }
-
- /**
- * Create a site entry
- *
- * @param url site URL
- * @param policy site policy
- * @return created site entry
- * @since 2.0
- */
- public ISiteEntry createSiteEntry(URL url, ISitePolicy policy);
-
- /**
- * Create a site policy. The policy determines the way the site
- * plug-in are processed at startpu
- *
- * @param type policy type
- * @param list an array of site-relative paths representing the
- * inclusion/ exclusion list
- * @return created site policy entry
- * @since 2.0
- */
- public ISitePolicy createSitePolicy(int type, String[] list);
-
- /**
- * Create a feature entry
- * @param id feature identifier. Must not be <code>null</code>.
- * @param version feature version (as String). Can be <code>null</code>.
- * @param pluginVersion version of the feature plugin (as String). Can be
- * <code>null</code>.
- * @param primary <code>true</code> if the feature is defined as a primary
- * feature, otherwise <code>false</code>.
- * @param application identifier of the application to run when
- * this feature is the primary feature. Can be <code>null</code>.
- * If specified, the identifier must represent a valid extension
- * registered in the <code>org.eclipse.core.runtime.applications</code>
- * extension point.
- * @param root an array of URLs to feature root directories.
- * These are URLs to install locations for the feature plugin
- * and its fragments. Can be <code>null</code>.
- * @return create feature entry
- * @since 2.0
- */
- public IFeatureEntry createFeatureEntry(String id, String version, String pluginVersion, boolean primary, String application, URL[] root);
-
- /**
- * Create a feature entry
- * @param id feature identifier. Must not be <code>null</code>.
- * @param version feature version (as String). Can be <code>null</code>.
- * @param pluginIdentifier identifier of the feature plugin (as String). Can
- * be <code>null</code>.
- * @param pluginVersion version of the feature plugin (as String). Can be
- * <code>null</code>.
- * @param primary <code>true</code> if the feature is defined as a primary
- * feature, otherwise <code>false</code>.
- * @param application identifier of the application to run when
- * this feature is the primary feature. Can be <code>null</code>.
- * If specified, the identifier must represent a valid extension
- * registered in the <code>org.eclipse.core.runtime.applications</code>
- * extension point.
- * @param root an array of URLs to feature root directories.
- * These are URLs to install locations for the feature plugin
- * and its fragments. Can be <code>null</code>.
- * @return create feature entry
- * @since 2.1
- */
- public IFeatureEntry createFeatureEntry(String id, String version, String pluginIdentifier, String pluginVersion, boolean primary, String application, URL[] root);
-
- /**
- * Configures the specified site entry. If a site entry with the
- * same site URL is already configured, the entry is <b>not</b> replaced.
- *
- * @param entry site entry
- * @since 2.0
- */
- public void configureSite(ISiteEntry entry);
-
- /**
- * Configures the specified site entry. If a site entry with the
- * same site URL is already configured, the replacement behavior for
- * the entry can be specified.
- *
- * @param entry site entry
- * @param replace indicating whether an existing configured entry with
- * the same URL should be replaced (<code>true</code>) or not (<code>false</code>).
- * @since 2.0
- */
- public void configureSite(ISiteEntry entry, boolean replace);
-
- /**
- * Unconfigures the specified entry. Does not do anything if the entry
- * is not configured.
- *
- * @param entry site entry
- * @since 2.0
- */
- public void unconfigureSite(ISiteEntry entry);
-
- /**
- * Returns configured site entries
- *
- * @return array of site entries. Returns an empty array if no sites are
- * configured
- * @since 2.0
- */
- public ISiteEntry[] getConfiguredSites();
-
- /**
- * Returns a site entry matching the specified URL
- *
- * @param url site url
- * @return matching site entry, or <code>null</code> if no match found
- * @since 2.0
- */
- public ISiteEntry findConfiguredSite(URL url);
-
- /**
- * Configures the feature entry.
- * If another feature entry with the same feature identifier
- * already exists, it is replaced.
- * @param entry feature entry
- * @since 2.0
- */
- public void configureFeatureEntry(IFeatureEntry entry);
-
- /**
- * Unconfigures the specified feature entry if it exists.
- * @param entry feature entry
- * @since 2.0
- */
- public void unconfigureFeatureEntry(IFeatureEntry entry);
-
- /**
- * Returns a list of configured feature entries.
- * @return array or entries, or an empty array if no entries
- * are configured
- * @since 2.0
- */
- public IFeatureEntry[] getConfiguredFeatureEntries();
-
- /**
- * Locates the specified feature entry.
- * @param id feature identifier
- * @return ferature entry, or <code>null</code>.
- * @since 2.0
- */
- public IFeatureEntry findConfiguredFeatureEntry(String id);
-
- /**
- * Returns the URL location of the configuration information
- *
- * @return configuration location URL, or <code>null</code> if the
- * configuration location could not be determined.
- * @since 2.0
- */
- public URL getConfigurationLocation();
-
- /**
- * Returns a stamp reflecting the current state of the configuration. If called repeatedly,
- * returns the same value as long as no changes were made to the configuration (changes to
- * sites, features or plugins).
- *
- * @return configuration change stamp
- * @since 2.0
- */
- public long getChangeStamp();
-
- /**
- * Returns a stamp reflecting the current state of the features in the configuration.
- * If called repeatedly, returns the same value as long as no changes were made to
- * features in the configuration.
- *
- * @return configuration features change stamp
- * @since 2.0
- * @deprecated Do not use this method.
- */
- public long getFeaturesChangeStamp();
-
- /**
- * Returns a stamp reflecting the current state of the plug-ins in the configuration.
- * If called repeatedly, returns the same value as long as no changes were made to
- * plug-ins in the configuration.
- *
- * @return configuration plug-ins change stamp
- * @since 2.0
- * @deprecated Do not use this method
- */
- public long getPluginsChangeStamp();
-
- /**
- * Returns the identifier of the configured primary feature. A primary feature
- * is used to specify product customization information for a running instance
- * of Eclipse.
- *
- * @return primary feature identifier, or <code>null</code> if none configured
- * @since 2.0
- */
- public String getPrimaryFeatureIdentifier();
-
- /**
- * Computes the plug-in path for this configuration. The result includes all plug-ins
- * visible on each of the configured sites based on each site policy.
- *
- * @return an array of plug-in path elements (full URL entries), or an empty array.
- * @since 2.0
- */
- public URL[] getPluginPath();
-
- /**
- * Returns an array of bootstrap plugin identifiers whose
- * location needs to be explicitly identified in the configuration.
- *
- * @return an array of identifiers, or empty array
- * otherwise
- * @since 2.0
- * @deprecated Do not use this method. Check the osgi.bundles system property for the
- * urls of the automatically started bundles
- */
- public String[] getBootstrapPluginIdentifiers();
-
- /**
- * Sets the location of a bootstrap plugin.
- *
- * @see IPlatformConfiguration#getBootstrapPluginIdentifiers()
- * @param id plugin identifier. Must match one of the entries returned
- * by getBootstrapPluginIdentifiers()
- * @param location
- * @since 2.0
- * @deprecated Do not use this method. Use the osig.bundles system property contains
- * the urls of the automatically started bundles.
- */
- public void setBootstrapPluginLocation(String id, URL location);
-
- /**
- * Returns an indication whether the configuration can be updated.
- *
- * @return <code>true</code> if configuration can be updated, <code>false</code>
- * otherwise
- * @since 2.0
- */
- public boolean isUpdateable();
-
- /**
- * Returns an indication whether the configuration is transient. A transient
- * configuration typically represents a scenario where the configuration
- * was computed for a single instantiation of the platform and is not
- * guaranteed to be valid on subsequent instantiations.
- *
- * @return <code>true</code> if configuration is transient, <code>false</code>
- * otherwise
- * @since 2.0
- */
- public boolean isTransient();
-
- /**
- * Indicates whether the configuration is transient or not. A transient
- * configuration typically represents a scenario where the configuration
- * was computed for a single instantiation of the platform and is not
- * guaranteed to be valid on subsequent instantiations. This method has
- * no effect if called on the current platform configuration.
- *
- * @param value <code>true</code> if configuration is transient, <code>false</code>
- * otherwise
- * @since 2.0
- */
- public void isTransient(boolean value);
-
- /**
- * Called to refresh the configuration information. In particular,
- * causes change stamps to be recomputed based on the current
- * configuration state, and updates the lists of available plug-ins.
- * @since 2.0
- */
- public void refresh();
-
- /**
- * Called to save the configuration information
- * @since 2.0
- */
- public void save() throws IOException;
-
- /**
- * Called to save the configuration information in the
- * specified location
- *
- * @param url save location.
- * @since 2.0
- */
- public void save(URL url) throws IOException;
-
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.java
deleted file mode 100644
index b09c988..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/IPlatformConfigurationFactory.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.configurator;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * Factory for creating platform configurations.
- * <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 IPlatformConfigurationFactory {
- /**
- * Returns the current platform configuration.
- *
- * @return platform configuration used in current instance of platform
- */
- public IPlatformConfiguration getCurrentPlatformConfiguration();
- /**
- * Returns a platform configuration object, optionally initialized with previously saved
- * configuration information.
- *
- * @param url location of previously save configuration information. If <code>null</code>
- * is specified, an empty configuration object is returned
- * @return platform configuration used in current instance of platform
- */
- public IPlatformConfiguration getPlatformConfiguration(URL url) throws IOException;
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/package.html b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/package.html
deleted file mode 100644
index fa0f9f6..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/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 accessing platform configuration data.
-<h2>
-Package Specification</h2>
-This package contains interfaces for accessing and manipulating the local
-system installation and configuration information.
-<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.configurator/src/org/eclipse/update/internal/configurator/BootDescriptor.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BootDescriptor.java
deleted file mode 100644
index bc63b75..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BootDescriptor.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.update.internal.configurator;
-
-import java.net.*;
-
-
-public class BootDescriptor {
- private String id;
- private String version;
- private String[] libs;
- private URL dir;
-
- public BootDescriptor(String id, String version, String[] libs, URL dir) {
- this.id = id;
- this.version = version;
- this.libs = libs;
- this.dir = dir;
- }
-
- public String getId() {
- return id;
- }
-
- public String getVersion() {
- return version;
- }
-
- public String[] getLibraries() {
- return libs;
- }
-
- public URL getPluginDirectoryURL() {
- return dir;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleManifest.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleManifest.java
deleted file mode 100644
index bdaba9e..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleManifest.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.configurator;
-import java.io.*;
-import java.util.jar.*;
-
-import org.eclipse.osgi.util.*;
-import org.osgi.framework.*;
-/**
- * Parses MANIFEST.MF
- */
-public class BundleManifest implements IConfigurationConstants {
- private File manifestFile;
- private PluginEntry pluginEntry;
- private IOException exception;
- private String bundleURL;
- /**
- * Constructor for local file
- */
- public BundleManifest(File manifest) {
- super();
- manifestFile = manifest;
- 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, String bundleUrl) {
- super();
- bundleURL = bundleUrl;
- 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);
- if (version == null) {
- Utils.log(Messages.getString(
- "BundleManifest.noVersion", Constants.BUNDLE_VERSION, //$NON-NLS-1$
- id));
- return;
- }
- String hostPlugin = a.getValue(Constants.FRAGMENT_HOST);
- pluginEntry = new PluginEntry();
- pluginEntry.setVersionedIdentifier(new VersionedIdentifier(id,
- version));
- pluginEntry.isFragment(hostPlugin != null
- && hostPlugin.length() > 0);
- // Set URL
- if(bundleURL!=null){
- pluginEntry.setURL(bundleURL);
- }else{
- File pluginDir = manifestFile.getParentFile();
- if (pluginDir != null) {
- pluginDir = pluginDir.getParentFile();
- }
- if (pluginDir != null){
- pluginEntry.setURL(PLUGINS + "/" + pluginDir.getName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- //
- } 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;
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Configuration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Configuration.java
deleted file mode 100644
index 2c4a760..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Configuration.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.internal.configurator;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-import org.w3c.dom.*;
-
-
-public class Configuration implements IConfigurationConstants {
-
- private HashMap sites = new HashMap();
- private Date date;
- private long lastModified; // needed to account for file system limitations
- private URL url;
- private boolean transientConfig;
- private boolean isDirty;
- private Configuration linkedConfig; // shared configuration
-
- public Configuration() {
- this(new Date());
- // the config is created now or out of a platform.xml without a date
- isDirty = true;
- }
- public Configuration(Date date) {
- this.date = date;
- }
-
- public void setURL(URL url) {
- this.url = url;
- }
-
- public URL getURL() {
- return url;
- }
-
- public void setLinkedConfig(Configuration linkedConfig) {
- this.linkedConfig = linkedConfig;
- // make all the sites read-only
- SiteEntry[] linkedSites = linkedConfig.getSites();
- for (int i=0; i<linkedSites.length; i++)
- linkedSites[i].setUpdateable(false);
- }
-
- public Configuration getLinkedConfig() {
- return linkedConfig;
- }
-
- /**
- * @return true if the config needs to be saved
- */
- public boolean isDirty() {
- return isDirty;
- }
-
- public void setDirty(boolean dirty) {
- isDirty = dirty;
- }
-
- public void addSiteEntry(String url, SiteEntry site) {
- // only add the same site once
- if (sites.get(url) == null && (linkedConfig == null || linkedConfig.sites.get(url) == null)) {
- site.setConfig(this);
- sites.put(url, site);
- }
- }
-
- public void removeSiteEntry(String url) {
- sites.remove(url);
- }
-
- public SiteEntry getSiteEntry(String url) {
- SiteEntry site = (SiteEntry)sites.get(url);
- if (site == null && linkedConfig != null)
- site = linkedConfig.getSiteEntry(url);
- return site;
- }
-
- public SiteEntry[] getSites() {
- if (linkedConfig == null)
- return (SiteEntry[]) sites.values().toArray(new SiteEntry[sites.size()]);
- else {
- ArrayList combinedSites = new ArrayList(sites.values());
- combinedSites.addAll(linkedConfig.sites.values());
- return (SiteEntry[]) combinedSites.toArray(new SiteEntry[combinedSites.size()]);
- }
- }
-
- public Element toXML(Document doc) throws CoreException {
- try {
- Element configElement = doc.createElement(CFG);
-
- configElement.setAttribute(CFG_VERSION, VERSION);
- configElement.setAttribute(CFG_DATE, String.valueOf(date.getTime()));
- String transitory = isTransient() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
- configElement.setAttribute(CFG_TRANSIENT, transitory);
-
- if (linkedConfig != null) {
- configElement.setAttribute(CFG_SHARED_URL, linkedConfig.getURL().toExternalForm());
- }
-
- // collect site entries
- SiteEntry[] list = (SiteEntry[]) sites.values().toArray(new SiteEntry[0]);
- for (int i = 0; i < list.length; i++) {
- if (linkedConfig != null && linkedConfig.getSiteEntry(list[i].getURL().toExternalForm()) != null)
- continue;
- Element siteElement = list[i].toXML(doc);
- configElement.appendChild(siteElement);
- }
-
- return configElement;
-
- } catch (Exception e) {
- throw Utils.newCoreException("", e); //$NON-NLS-1$
- }
- }
-
- public boolean isTransient() {
- return transientConfig;
- }
-
- public void setTransient(boolean isTransient) {
- this.transientConfig = isTransient;
- }
-
- public Date getDate() {
- return date;
- }
-
- public void setDate(Date date) {
- this.date = date;
- }
-
- public boolean unconfigureFeatureEntry(IPlatformConfiguration.IFeatureEntry feature) {
- SiteEntry[] sites = getSites();
- for (int i=0; i<sites.length; i++)
- if (sites[i].unconfigureFeatureEntry(feature))
- return true;
- return false;
- }
-
- public void setLastModified(long lastModified) {
- this.lastModified = lastModified;
- }
-
- public long lastModified() {
- if (lastModified != 0)
- return lastModified;
- else
- return date.getTime();
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
deleted file mode 100644
index 9143da8..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
+++ /dev/null
@@ -1,446 +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.update.internal.configurator;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.framework.log.*;
-import org.eclipse.osgi.service.datalocation.*;
-import org.eclipse.osgi.service.debug.*;
-import org.eclipse.update.configurator.*;
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.*;
-import org.osgi.service.startlevel.*;
-import org.osgi.util.tracker.*;
-
-public class ConfigurationActivator implements BundleActivator, IBundleGroupProvider, IConfigurationConstants {
-
- public static String PI_CONFIGURATOR = "org.eclipse.update.configurator"; //$NON-NLS-1$
- public static final String INSTALL_LOCATION = "osgi.installLocation"; //$NON-NLS-1$
- public static final String LAST_CONFIG_STAMP = "last.config.stamp"; //$NON-NLS-1$
- public static final String NAME_SPACE = "org.eclipse.update"; //$NON-NLS-1$
- public static final String UPDATE_PREFIX = "update@"; //$NON-NLS-1$
-
- // debug options
- public static String OPTION_DEBUG = PI_CONFIGURATOR + "/debug"; //$NON-NLS-1$
- // debug values
- public static boolean DEBUG = false;
- // os
- private static boolean isWindows = System.getProperty("os.name").startsWith("Win"); //$NON-NLS-1$ //$NON-NLS-2$
-
- private static BundleContext context;
- private ServiceTracker platformTracker;
- private ServiceRegistration configurationFactorySR;
- private PlatformConfiguration configuration;
-
- // Install location
- private static URL installURL;
-
- // Location of the configuration data
- private Location configLocation;
-
- //Need to store that because it is not provided by the platformConfiguration
- private long lastTimeStamp;
-
- // The expected states timestamp
- private long lastStateTimeStamp;
-
- // Singleton
- private static ConfigurationActivator configurator;
-
- public ConfigurationActivator() {
- configurator = this;
- }
-
- public void start(BundleContext ctx) throws Exception {
- context = ctx;
- loadOptions();
- acquireFrameworkLogService();
- initialize();
-
- //Short cut, if the configuration has not changed
- String product = configuration.getPrimaryFeatureIdentifier();
-
- if (canRunWithCachedData()) {
- Utils.debug("Same last time stamp *****"); //$NON-NLS-1$
- if (System.getProperty(ECLIPSE_PRODUCT) == null && product != null) {
- Utils.debug("no eclipse.product, setting it and returning"); //$NON-NLS-1$
- System.setProperty(ECLIPSE_PRODUCT, product);
- }
- Platform.registerBundleGroupProvider(this);
- return;
- }
-
- Utils.debug("Starting update configurator..."); //$NON-NLS-1$
-
- installBundles();
- Platform.registerBundleGroupProvider(this);
- }
-
-
- private void initialize() throws Exception {
- // TODO this test is not really needed any more than any plugin has
- // to test to see if the runtime is running. It was there from earlier days
- // where startup was much more disjoint. Some day that level of decoupling
- // will return but for now...
- if (!Platform.isRunning())
- throw new Exception(Messages.getString("ConfigurationActivator.initialize")); //$NON-NLS-1$
-
- configLocation = Platform.getConfigurationLocation();
- // create the name space directory for update (configuration/org.eclipse.update)
- if (!configLocation.isReadOnly()) {
- try {
- URL privateURL = new URL(configLocation.getURL(), NAME_SPACE);
- File f = new File(privateURL.getFile());
- if(!f.exists())
- f.mkdirs();
- } catch (MalformedURLException e1) {
- // ignore
- }
- }
- configurationFactorySR = context.registerService(IPlatformConfigurationFactory.class.getName(), new PlatformConfigurationFactory(), null);
- configuration = getPlatformConfiguration(getInstallURL(), configLocation);
- if (configuration == null)
- throw Utils.newCoreException(Messages.getString("ConfigurationActivator.createConfig", configLocation.getURL().toExternalForm()), null); //$NON-NLS-1$
-
- DataInputStream stream = null;
- try {
- stream = new DataInputStream(new URL(configLocation.getURL(),NAME_SPACE+'/'+LAST_CONFIG_STAMP).openStream());
- lastTimeStamp = stream.readLong();
- lastStateTimeStamp = stream.readLong();
- } catch (Exception e) {
- lastTimeStamp = configuration.getChangeStamp() - 1;
- lastStateTimeStamp = -1;
- } finally {
- if (stream != null)
- try {
- stream.close();
- } catch (IOException e1) {
- Utils.log(e1.getLocalizedMessage());
- }
- }
- }
-
-
- public void stop(BundleContext ctx) throws Exception {
- // quick fix (hack) for bug 47861
- try {
- PlatformConfiguration.shutdown();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- configurationFactorySR.unregister();
- }
-
- public boolean installBundles() {
- Utils.debug("Installing bundles..."); //$NON-NLS-1$
- ServiceReference reference = context.getServiceReference(StartLevel.class.getName());
- int startLevel = 4;
- String defaultStartLevel = System.getProperty("osgi.bundles.defaultStartLevel"); //$NON-NLS-1$
- if (defaultStartLevel != null) {
- try {
- startLevel = Integer.parseInt(defaultStartLevel);
- } catch (NumberFormatException e1) {
- startLevel = 4;
- }
- }
- if (startLevel < 1)
- startLevel = 4;
-
- StartLevel start = null;
- if (reference != null)
- start = (StartLevel) context.getService(reference);
- try {
- // Get the list of cached bundles and compare with the ones to be installed.
- // Uninstall all the cached bundles that do not appear on the new list
- Bundle[] cachedBundles = context.getBundles();
- URL[] plugins = configuration.getPluginPath();
-
- Bundle[] bundlesToUninstall = getBundlesToUninstall(cachedBundles, plugins);
- for (int i=0; i<bundlesToUninstall.length; i++) {
- try {
- if (DEBUG)
- Utils.debug("Uninstalling " + bundlesToUninstall[i].getLocation()); //$NON-NLS-1$
- bundlesToUninstall[i].uninstall();
- } catch (Exception e) {
- Utils.log(Messages.getString("ConfigurationActivator.uninstallBundle", bundlesToUninstall[i].getLocation())); //$NON-NLS-1$
- }
- }
-
- // starts the list of bundles to refresh with all currently unresolved bundles (see bug 50680)
- List toRefresh = getUnresolvedBundles();
-
- // Get the urls to install
- String[] bundlesToInstall = getBundlesToInstall(cachedBundles, plugins);
-
- for (int i = 0; i < bundlesToInstall.length; i++) {
- try {
- if (DEBUG)
- Utils.debug("Installing " + bundlesToInstall[i]); //$NON-NLS-1$
- URL bundleURL = new URL("reference:file:"+bundlesToInstall[i]); //$NON-NLS-1$
- //Bundle target = context.installBundle(bundlesToInstall[i]);
- Bundle target = context.installBundle(UPDATE_PREFIX+bundlesToInstall[i], bundleURL.openStream());
- // any new bundle should be refreshed as well
- toRefresh.add(target);
- if (start != null)
- start.setBundleStartLevel(target, startLevel);
-
- } catch (Exception e) {
- if (!Utils.isAutomaticallyStartedBundle(bundlesToInstall[i]))
- Utils.log(Messages.getString("ConfigurationActivator.installBundle", bundlesToInstall[i]) + " " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- context.ungetService(reference);
- refreshPackages((Bundle[]) toRefresh.toArray(new Bundle[toRefresh.size()]));
-
- if (System.getProperty(ECLIPSE_PRODUCT) == null && configuration.getPrimaryFeatureIdentifier() != null)
- System.setProperty(ECLIPSE_PRODUCT, configuration.getPrimaryFeatureIdentifier());
-
- // keep track of the last config successfully processed
- writePlatformConfigurationTimeStamp();
- return true;
- } catch (Exception e) {
- return false;
- }
- }
-
- private List getUnresolvedBundles() {
- Bundle[] allBundles = context.getBundles();
- List unresolved = new ArrayList();
- for (int i = 0; i < allBundles.length; i++)
- if (allBundles[i].getState() == Bundle.INSTALLED)
- unresolved.add(allBundles[i]);
- return unresolved;
- }
-
- private String[] getBundlesToInstall(Bundle[] cachedBundles, URL[] newPlugins) {
- // First, create a map of the cached bundles, for faster lookup
- HashSet cachedBundlesSet = new HashSet(cachedBundles.length);
- int offset = UPDATE_PREFIX.length();
- for (int i=0; i<cachedBundles.length; i++) {
- if (cachedBundles[i].getBundleId() == 0)
- continue; // skip the system bundle
- String bundleLocation = cachedBundles[i].getLocation();
- // Ignore bundles not installed by us
- if (!bundleLocation.startsWith(UPDATE_PREFIX))
- continue;
-
- bundleLocation = bundleLocation.substring(offset);
- cachedBundlesSet.add(bundleLocation);
- // On windows, we will be doing case insensitive search as well, so lower it now
- if (isWindows)
- cachedBundlesSet.add(bundleLocation.toLowerCase());
- }
-
- ArrayList bundlesToInstall = new ArrayList(newPlugins.length);
- for (int i = 0; i < newPlugins.length; i++) {
- String location = newPlugins[i].getFile();
- // check if already installed
- if (cachedBundlesSet.contains(location))
- continue;
- if (isWindows && cachedBundlesSet.contains(location.toLowerCase()))
- continue;
-
- bundlesToInstall.add(location);
- }
- return (String[])bundlesToInstall.toArray(new String[bundlesToInstall.size()]);
- }
-
-
- private Bundle[] getBundlesToUninstall(Bundle[] cachedBundles, URL[] newPlugins) {
- // First, create a map for faster lookups
- HashSet newPluginsSet = new HashSet(newPlugins.length);
- for (int i=0; i<newPlugins.length; i++) {
-
- String pluginLocation = newPlugins[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());
- }
-
- ArrayList bundlesToUninstall = new ArrayList();
- int offset = UPDATE_PREFIX.length();
- for (int i=0; i<cachedBundles.length; i++) {
- if (cachedBundles[i].getBundleId() == 0)
- continue; // skip the system bundle
- String cachedBundleLocation = cachedBundles[i].getLocation();
- // Only worry about bundles we installed
- if (!cachedBundleLocation.startsWith(UPDATE_PREFIX))
- continue;
- cachedBundleLocation = cachedBundleLocation.substring(offset);
-
- if (newPluginsSet.contains(cachedBundleLocation))
- continue;
- if (isWindows && newPluginsSet.contains(cachedBundleLocation.toLowerCase()))
- continue;
-
- bundlesToUninstall.add(cachedBundles[i]);
- }
- return (Bundle[])bundlesToUninstall.toArray(new Bundle[bundlesToUninstall.size()]);
- }
-
-
- /**
- * Creates and starts the platform configuration.
- * @return the just started platform configuration
- */
- private PlatformConfiguration getPlatformConfiguration(URL installURL, Location configLocation) {
- try {
- PlatformConfiguration.startup(installURL, configLocation);
- } catch (Exception e) {
- if (platformTracker != null) {
- String message = e.getMessage();
- if (message == null)
- message = ""; //$NON-NLS-1$
- Utils.log(Utils.newStatus(message, e));
- }
- }
- return PlatformConfiguration.getCurrent();
-
- }
-
- /**
- * Do PackageAdmin.refreshPackages() in a synchronous way. After installing
- * all the requested bundles we need to do a refresh and want to ensure that
- * everything is done before returning.
- * @param bundles
- */
- private void refreshPackages(Bundle[] bundles) {
- if (bundles.length == 0)
- return;
- ServiceReference packageAdminRef = context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin packageAdmin = null;
- if (packageAdminRef != null) {
- packageAdmin = (PackageAdmin) context.getService(packageAdminRef);
- if (packageAdmin == null)
- return;
- }
- // TODO this is such a hack it is silly. There are still cases for race conditions etc
- // but this should allow for some progress...
- // (patch from John A.)
- final boolean[] flag = new boolean[] {false};
- FrameworkListener listener = new FrameworkListener() {
- public void frameworkEvent(FrameworkEvent event) {
- if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED)
- synchronized (flag) {
- flag[0] = true;
- flag.notifyAll();
- }
- }
- };
- context.addFrameworkListener(listener);
- packageAdmin.refreshPackages(bundles);
- synchronized (flag) {
- while (!flag[0]) {
- try {
- flag.wait();
- } catch (InterruptedException e) {
- }
- }
- }
- context.removeFrameworkListener(listener);
- context.ungetService(packageAdminRef);
- }
-
- private void writePlatformConfigurationTimeStamp() {
- DataOutputStream stream = null;
- try {
- if (configLocation.isReadOnly())
- return;
-
- String configArea = configLocation.getURL().getFile();
- lastTimeStamp = configuration.getChangeStamp();
- lastStateTimeStamp = Platform.getPlatformAdmin().getState(false).getTimeStamp();
- stream = new DataOutputStream(new FileOutputStream(configArea +File.separator+ NAME_SPACE+ File.separator+ LAST_CONFIG_STAMP));
- stream.writeLong(lastTimeStamp);
- stream.writeLong(lastStateTimeStamp);
- } catch (Exception e) {
- Utils.log(e.getLocalizedMessage());
- } finally {
- if (stream != null)
- try {
- stream.close();
- } catch (IOException e1) {
- Utils.log(e1.getLocalizedMessage());
- }
- }
- }
-
- private void loadOptions() {
- // all this is only to get the application args
- DebugOptions service = null;
- ServiceReference reference = context.getServiceReference(DebugOptions.class.getName());
- if (reference != null)
- service = (DebugOptions) context.getService(reference);
- if (service == null)
- return;
- try {
- DEBUG = service.getBooleanOption(OPTION_DEBUG, false);
- } finally {
- // we have what we want - release the service
- context.ungetService(reference);
- }
- }
-
- private boolean canRunWithCachedData() {
- return !"true".equals(System.getProperty("osgi.checkConfiguration")) && //$NON-NLS-1$ //$NON-NLS-2$
- System.getProperties().get("osgi.dev") == null && //$NON-NLS-1$
- lastTimeStamp==configuration.getChangeStamp() &&
- lastStateTimeStamp==Platform.getPlatformAdmin().getState(false).getTimeStamp();
- }
-
- public static BundleContext getBundleContext() {
- return context;
- }
-
- public static URL getInstallURL() {
- if (installURL == null)
- installURL = Platform.getInstallLocation().getURL();
- return installURL;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroupProvider#getName()
- */
- public String getName() {
- return Messages.getString("BundleGroupProvider"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroupProvider#getBundleGroups()
- */
- public IBundleGroup[] getBundleGroups() {
- if (configuration == null)
- return new IBundleGroup[0];
- else {
- return (IBundleGroup[])configuration.getConfiguredFeatureEntries();
- }
- }
-
- public static void setConfigurator(ConfigurationActivator configurator) {
- ConfigurationActivator.configurator = configurator;
- }
-
- public static ConfigurationActivator getConfigurator() {
- return configurator;
- }
-
- private void acquireFrameworkLogService() throws Exception{
- ServiceReference logServiceReference = context.getServiceReference(FrameworkLog.class.getName());
- if (logServiceReference == null)
- return;
- Utils.log = (FrameworkLog) context.getService(logServiceReference);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationParser.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationParser.java
deleted file mode 100644
index 6ff4e66..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationParser.java
+++ /dev/null
@@ -1,362 +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.configurator;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-import javax.xml.parsers.*;
-
-import org.eclipse.core.runtime.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-/**
- * parse the default site.xml
- */
-
-public class ConfigurationParser extends DefaultHandler implements IConfigurationConstants {
-
- private final static SAXParserFactory parserFactory =
- SAXParserFactory.newInstance();
- private SAXParser parser;
-
- private URL currentSiteURL;
- private Configuration config;
- private URL configURL;
- private InputStream input;
-
- /**
- * Constructor for ConfigurationParser
- */
- public ConfigurationParser() throws InvocationTargetException {
-
- try {
- parserFactory.setNamespaceAware(true);
- this.parser = parserFactory.newSAXParser();
- } catch (ParserConfigurationException e) {
- Utils.log(Utils.newStatus("ConfigurationParser", e)); //$NON-NLS-1$
- throw new InvocationTargetException(e);
- } catch (SAXException e) {
- Utils.log(Utils.newStatus("ConfigurationParser", e)); //$NON-NLS-1$
- throw new InvocationTargetException(e);
- }
- }
-
- public Configuration parse(URL url) throws Exception {
-
- // DEBUG:
- Utils.debug("Start parsing Configuration:" + url); //$NON-NLS-1$
- long lastModified = 0;
- try {
- configURL = url;
- if ("file".equals(url.getProtocol())) { //$NON-NLS-1$
- File inputFile = new File(url.getFile());
- if (!inputFile.exists() || !inputFile.canRead())
- return null;
- lastModified = inputFile.lastModified();
- input = new FileInputStream(inputFile);
- } else
- input = url.openStream();
- parser.parse(new InputSource(input), this);
- return config;
- } catch (Exception e) {
- Utils.log(Utils.newStatus("ConfigurationParser.parse() error:", e)); //$NON-NLS-1$
- throw e;
- } finally {
- if (config != null)
- config.setLastModified(lastModified);
- try {
- if (input != null) {
- input.close();
- input = null;
- }
- } catch (IOException e1) {
- Utils.log(e1.getLocalizedMessage());
- }
- }
- }
-
- /**
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- */
- public void startElement(
- String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException {
-
- // DEBUG:
- Utils.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- try {
-
- String tag = localName.trim();
-
- if (tag.equalsIgnoreCase(CFG)) {
- processConfig(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(CFG_SITE)) {
- processSite(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(CFG_FEATURE_ENTRY)) {
- processFeature(attributes);
- return;
- }
-
- } catch (MalformedURLException e) {
- throw new SAXException(Messages.getString("InstalledSiteParser.UnableToCreateURL", e.getMessage()), e); //$NON-NLS-1$
- } catch (CoreException e) {
- throw new SAXException(Messages.getString("InstalledSiteParser.InternalError", e.toString()), e); //$NON-NLS-1$
- }
- }
-
- /**
- * process the Site info
- */
- private void processSite(Attributes attributes)
- throws MalformedURLException, CoreException {
-
- if (config == null)
- return;
-
- // reset current site
- currentSiteURL = null;
-
- String urlString = attributes.getValue(CFG_URL); //$NON-NLS-1$
- if (urlString == null)
- return;
-
- URL url = null;
- try {
- url = new URL(urlString);
- } catch (MalformedURLException e) {
- // try relative to install url
- url = new URL(PlatformConfiguration.getInstallURL(), urlString);
- return;
- }
-
- if (!isValidSite(url))
- return;
-
- // use this new site
- currentSiteURL = url;
-
- int policyType;
- String[] policyList = null;
- String typeString = attributes.getValue(CFG_POLICY); //$NON-NLS-1$
- if (typeString == null) {
- policyType = DEFAULT_POLICY_TYPE;
- policyList = DEFAULT_POLICY_LIST;
- } else {
- int i;
- for (i = 0; i < CFG_POLICY_TYPE.length; i++) {
- if (typeString.equals(CFG_POLICY_TYPE[i])) {
- break;
- }
- }
- if (i >= CFG_POLICY_TYPE.length) {
- policyType = DEFAULT_POLICY_TYPE;
- policyList = DEFAULT_POLICY_LIST;
- } else {
- policyType = i;
- String pluginList = attributes.getValue(CFG_LIST);
- if (pluginList != null) {
- StringTokenizer st = new StringTokenizer(pluginList,","); //$NON-NLS-1$
- policyList = new String[st.countTokens()];
- for (i=0; i<policyList.length; i++)
- policyList[i] = st.nextToken();
- }
- }
- }
-
- SitePolicy sp = new SitePolicy(policyType, policyList);
- SiteEntry site = (SiteEntry) new SiteEntry(url, sp);
-
- String flag = attributes.getValue(CFG_UPDATEABLE); //$NON-NLS-1$
- if (flag != null) {
- if (flag.equals("true")) //$NON-NLS-1$
- site.setUpdateable(true);
- else
- site.setUpdateable(false);
- }
-
- flag = attributes.getValue(CFG_ENABLED); //$NON-NLS-1$
- if (flag != null && flag.equals("false")) //$NON-NLS-1$
- site.setEnabled(false);
- else
- site.setEnabled(true);
-
- String linkname = attributes.getValue(CFG_LINK_FILE); //$NON-NLS-1$
- if (linkname != null && !linkname.equals("")) { //$NON-NLS-1$
- site.setLinkFileName(linkname.replace('/', File.separatorChar));
- }
-
- // DEBUG:
- Utils.debug("End process config site url:" + urlString + " policy:" + typeString + " updatable:"+flag ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- config.addSiteEntry(url.toExternalForm(), site);
- }
-
- /**
- * process the DefaultFeature info
- */
- private void processFeature(Attributes attributes)
- throws MalformedURLException, CoreException {
-
- if (currentSiteURL == null)
- return; // the site was not correct
-
- String id = attributes.getValue(CFG_FEATURE_ENTRY_ID); //$NON-NLS-1$
- if (id == null)
- return;
- String version = attributes.getValue(CFG_FEATURE_ENTRY_VERSION); //$NON-NLS-1$
- String pluginVersion = attributes.getValue(CFG_FEATURE_ENTRY_PLUGIN_VERSION); //$NON-NLS-1$
- if (pluginVersion == null || pluginVersion.trim().length() == 0)
- pluginVersion = version;
- String pluginIdentifier = attributes.getValue(CFG_FEATURE_ENTRY_PLUGIN_IDENTIFIER); //$NON-NLS-1$
- if (pluginIdentifier == null || pluginIdentifier.trim().length() == 0)
- pluginIdentifier = id;
- String application = attributes.getValue(CFG_FEATURE_ENTRY_APPLICATION); //$NON-NLS-1$
-
- // get install locations
- String locations = attributes.getValue(CFG_FEATURE_ENTRY_ROOT);
- StringTokenizer st = locations != null ? new StringTokenizer(locations,",") : new StringTokenizer(""); //$NON-NLS-1$ //$NON-NLS-2$
- ArrayList rootList = new ArrayList(st.countTokens());
- while (st.hasMoreTokens()){
- try{
- URL rootEntry = new URL(st.nextToken());
- rootList.add(rootEntry);
- } catch (MalformedURLException e) {
- // skip bad entries ...
- }
- }
- URL[] roots = (URL[]) rootList.toArray(new URL[rootList.size()]);
-
- // get primary flag
- boolean primary = false;
- String flag = attributes.getValue(CFG_FEATURE_ENTRY_PRIMARY); //$NON-NLS-1$
- if (flag != null) {
- if (flag.equals("true")) //$NON-NLS-1$
- primary = true;
- }
-
- FeatureEntry featureEntry = new FeatureEntry(id, version, pluginIdentifier, pluginVersion, primary, application, roots);
-
- // set the url
- String url = attributes.getValue(CFG_URL); //$NON-NLS-1$
- if (url != null && url.trim().length() > 0)
- featureEntry.setURL(url);
-
- SiteEntry site = config.getSiteEntry(currentSiteURL.toExternalForm());
- site.addFeatureEntry(featureEntry);
-
- // configured ?
-// String configuredString = attributes.getValue("configured"); //$NON-NLS-1$
-// boolean configured = configuredString.trim().equalsIgnoreCase("true") ? true : false; //$NON-NLS-1$
- }
-
-
- /**
- * process the Config info
- */
- private void processConfig(Attributes attributes) {
- String date = attributes.getValue(CFG_DATE);
- if (date == null || date.trim().length() == 0)
- config = new Configuration(); // constructed with current date
- else {
- long time = 0;
- try {
- time = Long.parseLong(date);
- config = new Configuration(new Date(time));
- } catch (NumberFormatException e1) {
- time = new Date().getTime();
- Utils.log(Messages.getString("InstalledSiteParser.date", date)); //$NON-NLS-1$
- config = new Configuration(); // constructed with current date
- }
- }
-
- config.setURL(configURL);
-
- try {
- String sharedURL = attributes.getValue(CFG_SHARED_URL);
- if (sharedURL != null) {
- ConfigurationParser parser = new ConfigurationParser();
- Configuration sharedConfig = parser.parse(new URL(sharedURL));
- if (sharedConfig == null)
- throw new Exception();
- config.setLinkedConfig(sharedConfig);
- }
- } catch (Exception e) {
- // could not load from shared install
- Utils.log(Utils.newStatus(Messages.getString("ConfigurationParser.cannotLoadSharedInstall"), e)); //$NON-NLS-1$
- }
-
- String flag = attributes.getValue(CFG_TRANSIENT);
- if (flag != null) {
- config.setTransient(flag.equals("true")); //$NON-NLS-1$
- }
-
- // DEBUG:
- Utils.debug("End Processing Config Tag: date:" + attributes.getValue(CFG_DATE)); //$NON-NLS-1$
- }
-
- private boolean isValidSite(URL url) {
- URL resolvedURL= url;
- if (url.getProtocol().equals("platform")) { // $NON-NLS-1$
- try {
- resolvedURL = PlatformConfiguration.resolvePlatformURL(url); // 19536
- } catch (IOException e) {
- // will use the baseline URL ...
- }
- }
-
- if (!PlatformConfiguration.supportsDetection(resolvedURL))
- return false;
-
- File siteRoot = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- if (!siteRoot.exists()) {
- Utils.debug("Site " + resolvedURL + " does not exist "); //$NON-NLS-1$ //$NON-NLS-2$
- return false;
- } else
- return true;
- }
- /* (non-Javadoc)
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
- */
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
- super.endElement(uri, localName, qName);
-
- // DEBUG:
- Utils.debug("End Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- try {
-
- String tag = localName.trim();
-
- if (tag.equalsIgnoreCase(CFG)) {
- // This is a bit of a hack.
- // When no features were added to the site, but the site is initialized from platform.xml
- // we need to set the feature set to empty, so we don't try to detect them.
- SiteEntry[] sites = config.getSites();
- for (int i=0; i<sites.length; i++)
- sites[i].initialized();
- return;
- }
- } catch (Exception e) {
- // silent ignore
- }
- }
-}
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
deleted file mode 100644
index a5b387a..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureEntry.java
+++ /dev/null
@@ -1,350 +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.configurator;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.internal.configurator.branding.*;
-import org.osgi.framework.*;
-import org.w3c.dom.*;
-
-
-/**
- *
- * Feature information
- */
-public class FeatureEntry
- implements
- IPlatformConfiguration.IFeatureEntry,
- IConfigurationConstants,
- IBundleGroup,
- IBundleGroupConstants,
- IProduct,
- IProductConstants {
- private String id;
- private String version;
- private String pluginVersion;
- private String application;
- private URL[] root;
- private boolean primary;
- private String pluginIdentifier;
- private String url;
- private String description;
- private String licenseURL;
- private ArrayList plugins;
- private AboutInfo branding;
- private SiteEntry site;
- private ResourceBundle resourceBundle;
- private boolean fullyParsed;
-
- public FeatureEntry(String id, String version, String pluginIdentifier, String pluginVersion, boolean primary, String application, URL[] root) {
- if (id == null)
- throw new IllegalArgumentException();
- this.id = id;
- this.version = version;
- this.pluginVersion = pluginVersion;
- this.pluginIdentifier = pluginIdentifier;
- this.primary = primary;
- this.application = application;
- this.root = (root == null ? new URL[0] : root);
- }
-
- public FeatureEntry( String id, String version, String pluginVersion, boolean primary, String application, URL[] root) {
- this(id, version, id, pluginVersion, primary, application, root);
- }
-
- public void setSite(SiteEntry site) {
- this.site = site;
- }
-
- public SiteEntry getSite() {
- return this.site;
- }
-
- public void addPlugin(PluginEntry plugin) {
- if (plugins == null)
- plugins = new ArrayList();
- plugins.add(plugin);
- }
-
- /**
- * Sets the url string (relative to the site url)
- * @param url
- */
- public void setURL(String url) {
- this.url = url;
- }
-
- /**
- * @return the feature url (relative to the site): features/org.eclipse.platform/
- */
- public String getURL() {
-// if (url == null)
-// url = FEATURES + "/" + id + "_" + version + "/";
- return url;
- }
-
- /*
- * @see IFeatureEntry#getFeatureIdentifier()
- */
- public String getFeatureIdentifier() {
- return id;
- }
-
- /*
- * @see IFeatureEntry#getFeatureVersion()
- */
- public String getFeatureVersion() {
- return version;
- }
-
- /*
- * @see IFeatureEntry#getFeaturePluginVersion()
- */
- public String getFeaturePluginVersion() {
- return pluginVersion != null && pluginVersion.length() > 0 ? pluginVersion : null;
- }
-
- /*
- * @see IFeatureEntry#getFeaturePluginIdentifier()
- */
- public String getFeaturePluginIdentifier() {
- // if no plugin is specified, use the feature id
- return pluginIdentifier != null && pluginIdentifier.length() > 0 ? pluginIdentifier : id;
- }
-
- /*
- * @see IFeatureEntry#getFeatureApplication()
- */
- public String getFeatureApplication() {
- return application;
- }
-
- /*
- * @see IFeatureEntry#getFeatureRootURLs()
- */
- public URL[] getFeatureRootURLs() {
- return root;
- }
-
- /*
- * @see IFeatureEntry#canBePrimary()
- */
- public boolean canBePrimary() {
- return primary;
- }
-
- public Element toXML(Document doc) {
-
- Element featureElement = doc.createElement(CFG_FEATURE_ENTRY);
- // write out feature entry settings
- if (id != null)
- featureElement.setAttribute(CFG_FEATURE_ENTRY_ID, id);
- if (primary)
- featureElement.setAttribute(CFG_FEATURE_ENTRY_PRIMARY, "true"); //$NON-NLS-1$
- if (version != null)
- 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)
- featureElement.setAttribute(CFG_FEATURE_ENTRY_PLUGIN_IDENTIFIER, pluginIdentifier);
- if (application != null)
- featureElement.setAttribute(CFG_FEATURE_ENTRY_APPLICATION, application);
- if (url != null)
- featureElement.setAttribute(CFG_URL, url);
-
- URL[] roots = getFeatureRootURLs();
- for (int i=0; i<roots.length; i++) {
- String root = roots[i].toExternalForm();
- if (root != null && root.trim().length() > 0){
- Element rootElement = doc.createElement(CFG_FEATURE_ENTRY_ROOT);
- rootElement.appendChild(doc.createTextNode(root));
- featureElement.appendChild(rootElement);
- }
- }
-
- return featureElement;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getBundles()
- */
- public Bundle[] getBundles() {
- if (plugins == null)
- fullParse();
-
- ArrayList bundles = new ArrayList(plugins.size());
- for (int i=0; i<plugins.size(); i++) {
- PluginEntry plugin = (PluginEntry)plugins.get(i);
- // get the highest version for the plugin
- Bundle bundle = Platform.getBundle(plugin.getPluginIdentifier());
- if (bundle != null)
- bundles.add(bundle);
- }
- return (Bundle[])bundles.toArray(new Bundle[bundles.size()]);
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getDescription()
- */
- public String getDescription() {
- if (description == null)
- fullParse();
- return description;
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getIdentifier()
- */
- public String getIdentifier() {
- return id;
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getName()
- */
- public String getName() {
- if (branding == null)
- branding = AboutInfo.readFeatureInfo(id, version, getFeaturePluginIdentifier());
- return branding.getProductName();
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getProperty(java.lang.String)
- */
- public String getProperty(String key) {
- if (key == null)
- return null;
-
- if (branding == null)
- branding = AboutInfo.readFeatureInfo(id, version, getFeaturePluginIdentifier());
-
- // IBundleGroupConstants
- if (key.equals(FEATURE_IMAGE))
- return branding.getFeatureImageURL() == null ? null : branding.getFeatureImageURL().toExternalForm();
- else if (key.equals(TIPS_AND_TRICKS_HREF))
- return branding.getTipsAndTricksHref();
- else if (key.equals(WELCOME_PAGE))
- return branding.getWelcomePageURL() == null ? null : branding.getWelcomePageURL().toExternalForm();
- else if (key.equals(WELCOME_PERSPECTIVE))
- return branding.getWelcomePerspectiveId();
- // IProductConstants
- else if (key.equals(APP_NAME))
- return branding.getAppName();
- else if (key.equals(ABOUT_TEXT))
- return branding.getAboutText();
- else if (key.equals(ABOUT_IMAGE))
- return branding.getAboutImageURL() == null ? null : branding.getAboutImageURL().toExternalForm();
- else if (key.equals(WINDOW_IMAGE))
- return branding.getWindowImageURL()== null ? null : branding.getWindowImageURL().toExternalForm();
- else if (key.equals(WINDOW_IMAGES)) {
- URL[] urls = branding.getWindowImagesURLs();
- if (urls == null)
- return null;
- StringBuffer windowImagesURLs = new StringBuffer();
- for (int i=0; i<urls.length; i++){
- windowImagesURLs.append(urls[i].toExternalForm());
- if (i != urls.length-1)
- windowImagesURLs.append(',');
- }
- return windowImagesURLs.toString();
- } else if (key.equals(LICENSE_HREF))
- return getLicenseURL();
-
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getProviderName()
- */
- public String getProviderName() {
- if (branding == null)
- branding = AboutInfo.readFeatureInfo(id, version, getFeaturePluginIdentifier());
- return branding.getProviderName();
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IBundleGroup#getVersion()
- */
- public String getVersion() {
- return version;
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IProduct#getApplication()
- */
- public String getApplication() {
- return application;
- }
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IProduct#getId()
- */
- public String getId() {
- return id;
- }
-
- public ResourceBundle getResourceBundle(){
- if (resourceBundle != null)
- return resourceBundle;
-
- // Determine the properties file location
- if (site == null)
- return null;
-
- ResourceBundle bundle = null;
- try {
- URL propertiesURL = new URL(site.getResolvedURL(), getURL());
- ClassLoader l = new URLClassLoader(new URL[] { propertiesURL }, null);
- bundle = ResourceBundle.getBundle(IConfigurationConstants.CFG_FEATURE_ENTRY, Utils.getDefaultLocale(), l);
- } catch (MissingResourceException e) {
- Utils.log(e.getLocalizedMessage());
- } catch (MalformedURLException e) {
- Utils.log(e.getLocalizedMessage());
- }
- return bundle;
- }
-
- public void setLicenseURL(String licenseURL) {
- this.licenseURL = licenseURL;
- }
-
- public String getLicenseURL() {
- if (licenseURL == null)
- fullParse();
- if (licenseURL == null)
- return null;
-
- String resolvedURL = Utils.getResourceString(getResourceBundle(), licenseURL);
- if (resolvedURL.startsWith("http://")) //$NON-NLS-1$
- return resolvedURL;
- else {
- try {
- return new URL(getSite().getResolvedURL(), getURL() + resolvedURL).toExternalForm();
- } catch (MalformedURLException e) {
- return resolvedURL;
- }
- }
- }
-
- private void fullParse() {
- if (fullyParsed)
- return;
- fullyParsed = true;
- if (plugins == null)
- plugins = new ArrayList();
- FullFeatureParser parser = new FullFeatureParser(this);
- parser.parse();
- }
-
- public Bundle getDefiningBundle() {
- return Platform.getBundle(getFeaturePluginIdentifier());
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureParser.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureParser.java
deleted file mode 100644
index 86429de..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FeatureParser.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.update.internal.configurator;
-
-
-import java.io.*;
-import java.net.*;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-/**
- * Default feature parser.
- * Parses the feature manifest file as defined by the platform.
- *
- * @since 3.0
- */
-public class FeatureParser extends DefaultHandler {
-
- private SAXParser parser;
- private FeatureEntry feature;
- private URL url;
-
- private final static SAXParserFactory parserFactory =
- SAXParserFactory.newInstance();
-
- /**
- * Constructs a feature parser.
- */
- public FeatureParser() {
- super();
- try {
- parserFactory.setNamespaceAware(true);
- this.parser = parserFactory.newSAXParser();
- } catch (ParserConfigurationException e) {
- System.out.println(e);
- } catch (SAXException e) {
- System.out.println(e);
- }
- }
- /**
- * Parses the specified url and constructs a feature
- */
- public FeatureEntry parse(URL featureURL){
- feature=null;
- InputStream in = null;
- try {
- this.url = featureURL;
- in = featureURL.openStream();
- parser.parse(new InputSource(in), this);
- } catch (SAXException e) {;
- } catch (IOException e) {
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (IOException e1) {
- Utils.log(e1.getLocalizedMessage());
- }
- }
- return feature;
- }
-
- /**
- * 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 {
-
- Utils.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- if ("feature".equals(localName)) { //$NON-NLS-1$
- processFeature(attributes);
- // stop parsing now
- throw new SAXException(""); //$NON-NLS-1$
- } else {
- }
-
- }
-
- /*
- * 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$
- System.out.println(Messages.getString("FeatureParser.IdOrVersionInvalid", new String[] { id, ver})); //$NON-NLS-1$
- } else {
-// String label = attributes.getValue("label"); //$NON-NLS-1$
-// String provider = attributes.getValue("provider-name"); //$NON-NLS-1$
-// String imageURL = attributes.getValue("image"); //$NON-NLS-1$
- String os = attributes.getValue("os"); //$NON-NLS-1$
- String ws = attributes.getValue("ws"); //$NON-NLS-1$
- String nl = attributes.getValue("nl"); //$NON-NLS-1$
- String arch = attributes.getValue("arch"); //$NON-NLS-1$
- if (!Utils.isValidEnvironment(os, ws, arch, nl))
- return;
-// String exclusive = attributes.getValue("exclusive"); //$NON-NLS-1$
-// String affinity = attributes.getValue("colocation-affinity"); //$NON-NLS-1$
-
- String primary = attributes.getValue("primary"); //$NON-NLS-1$
- boolean isPrimary = "true".equals(primary); //$NON-NLS-1$
- String application = attributes.getValue("application"); //$NON-NLS-1$
- String plugin = attributes.getValue("plugin"); //$NON-NLS-1$
-
- //TODO rootURLs
- feature = new FeatureEntry(id, ver, plugin, "", isPrimary, application, null ); //$NON-NLS-1$
- if ("file".equals(url.getProtocol())) { //$NON-NLS-1$
- File f = new File(url.getFile().replace('/', File.separatorChar));
- feature.setURL("features" + "/" + f.getParentFile().getName() + "/");// + f.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- } else {
- feature.setURL(url.toExternalForm());
- }
-
- Utils.
- debug("End process DefaultFeature tag: id:" +id + " ver:" +ver + " url:" + feature.getURL()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FullFeatureParser.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FullFeatureParser.java
deleted file mode 100644
index 69e14e1..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/FullFeatureParser.java
+++ /dev/null
@@ -1,149 +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.configurator;
-
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-/**
- * A more complete feature parser. It adds the plugins listed to the feature.
- */
-public class FullFeatureParser extends DefaultHandler implements IConfigurationConstants{
-
- private SAXParser parser;
- private FeatureEntry feature;
- private URL url;
- private boolean isDescription;
- private StringBuffer description = new StringBuffer();
-
- private final static SAXParserFactory parserFactory =
- SAXParserFactory.newInstance();
-
- /**
- * Constructs a feature parser.
- */
- public FullFeatureParser(FeatureEntry feature) {
- super();
- this.feature = feature;
- try {
- parserFactory.setNamespaceAware(true);
- this.parser = parserFactory.newSAXParser();
- } catch (ParserConfigurationException e) {
- System.out.println(e);
- } catch (SAXException e) {
- System.out.println(e);
- }
- }
- /**
- */
- public void parse(){
- InputStream in = null;
- try {
- if (feature.getSite() == null)
- return;
- this.url = new URL(feature.getSite().getResolvedURL(), feature.getURL() + FEATURE_XML);
- in = url.openStream();
- parser.parse(new InputSource(in), this);
- } catch (SAXException e) {;
- } catch (IOException e) {
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (IOException e1) {
- Utils.log(e1.getLocalizedMessage());
- }
- }
- }
-
- /**
- * 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 {
-
- Utils.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- if ("plugin".equals(localName)) { //$NON-NLS-1$
- processPlugin(attributes);
- } else if ("description".equals(localName)){ //$NON-NLS-1$
- isDescription = true;
- } else if ("license".equals(localName)) { //$NON-NLS-1$
- processLicense(attributes);
- }
- }
-
- /*
- * Process feature information
- */
- private void processPlugin(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$
- System.out.println(Messages.getString("FeatureParser.IdOrVersionInvalid", new String[] { id, ver})); //$NON-NLS-1$
- } else {
-// String label = attributes.getValue("label"); //$NON-NLS-1$
-// String provider = attributes.getValue("provider-name"); //$NON-NLS-1$
- String nl = attributes.getValue("nl"); //$NON-NLS-1$
- String os = attributes.getValue("os"); //$NON-NLS-1$
- String ws = attributes.getValue("ws"); //$NON-NLS-1$
- String arch = attributes.getValue("arch"); //$NON-NLS-1$
- if (!Utils.isValidEnvironment(os, ws, arch,nl))
- return;
-
- PluginEntry plugin = new PluginEntry();
- plugin.setPluginIdentifier(id);
- plugin.setPluginVersion(ver);
- feature.addPlugin(plugin);
-
- Utils.
- debug("End process DefaultFeature tag: id:" +id + " ver:" +ver + " url:" + feature.getURL()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
-
- private void processLicense(Attributes attributes ){
- feature.setLicenseURL(attributes.getValue("url")); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.xml.sax.ContentHandler#characters(char[], int, int)
- */
- public void characters(char[] ch, int start, int length)
- throws SAXException {
- if (!isDescription)
- return;
- description.append(ch, start, length);
- }
- /* (non-Javadoc)
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
- */
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
- if ("description".equals(localName)) { //$NON-NLS-1$
- isDescription = false;
- String d = description.toString().trim();
- ResourceBundle bundle = feature.getResourceBundle();
- feature.setDescription(Utils.getResourceString(bundle, d));
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/IConfigurationConstants.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/IConfigurationConstants.java
deleted file mode 100644
index bc90bbc..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/IConfigurationConstants.java
+++ /dev/null
@@ -1,64 +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.configurator;
-
-import org.eclipse.update.configurator.IPlatformConfiguration.*;
-
-/**
- * Constants
- */
-public interface IConfigurationConstants {
- public static final String ECLIPSE_PRODUCT = "eclipse.product"; //$NON-NLS-1$
- public static final String ECLIPSE_APPLICATION = "eclipse.application"; //$NON-NLS-1$
- public static final String CFG = "config"; //$NON-NLS-1$
- public static final String CFG_BOOT_PLUGIN = "bootstrap"; //$NON-NLS-1$
- public static final String CFG_SITE = "site"; //$NON-NLS-1$
- public static final String CFG_URL = "url"; //$NON-NLS-1$
- public static final String CFG_POLICY = "policy"; //$NON-NLS-1$
- public static final String[] CFG_POLICY_TYPE = { "USER-INCLUDE", "USER-EXCLUDE" }; //$NON-NLS-1$ //$NON-NLS-2$
- public static final String CFG_POLICY_TYPE_UNKNOWN = "UNKNOWN"; //$NON-NLS-1$
- public static final String CFG_LIST = "list"; //$NON-NLS-1$
- public static final String CFG_STAMP = "stamp"; //$NON-NLS-1$
- public static final String CFG_FEATURE_STAMP = "stamp.features"; //$NON-NLS-1$
- public static final String CFG_PLUGIN_STAMP = "stamp.plugins"; //$NON-NLS-1$
- public static final String CFG_UPDATEABLE = "updateable"; //$NON-NLS-1$
- public static final String CFG_LINK_FILE = "linkfile"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY = "feature"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_ID = "id"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_PRIMARY = "primary"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_VERSION = "version"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_PLUGIN_VERSION = "plugin-version"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_PLUGIN_IDENTIFIER = "plugin-identifier"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_APPLICATION = "application"; //$NON-NLS-1$
- public static final String CFG_FEATURE_ENTRY_ROOT = "root"; //$NON-NLS-1$
- public static final String CFG_DATE = "date"; //$NON-NLS-1$
- public static final String CFG_PLUGIN = "plugin"; //$NON-NLS-1$
- public static final String CFG_FRAGMENT = "fragment"; //$NON-NLS-1$
- public static final String CFG_ENABLED = "enabled"; //$NON-NLS-1$
- public static final String CFG_SHARED_URL = "shared_ur"; //$NON-NLS-1$
-
-
- public static final String CFG_VERSION = "version"; //$NON-NLS-1$
- public static final String CFG_TRANSIENT = "transient"; //$NON-NLS-1$
- public static final String VERSION = "3.0"; //$NON-NLS-1$
-// public static final String EOF = "eof"; //$NON-NLS-1$
- public static final int CFG_LIST_LENGTH = 10;
-
- public static final int DEFAULT_POLICY_TYPE = ISitePolicy.USER_EXCLUDE;
- public static final String[] DEFAULT_POLICY_LIST = new String[0];
-
- public static final String PLUGINS = "plugins"; //$NON-NLS-1$
- public static final String FEATURES = "features"; //$NON-NLS-1$
- public static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
- public static final String FRAGMENT_XML = "fragment.xml"; //$NON-NLS-1$
- public static final String META_MANIFEST_MF = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
- public static final String FEATURE_XML = "feature.xml"; //$NON-NLS-1$
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java
deleted file mode 100644
index 211c181..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java
+++ /dev/null
@@ -1,69 +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.configurator;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-public class Messages {
- private static String bundleName = "org.eclipse.update.internal.configurator.messages"; //$NON-NLS-1$
- private static ResourceBundle bundle = ResourceBundle.getBundle(bundleName, Locale.getDefault());
-
- /**
- * Lookup the message with the given ID in this catalog
- */
- public static String getString(String id) {
- return getString(id, (String[]) null);
- }
- /**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string.
- */
- public static String getString(String id, String binding) {
- return getString(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 getString(String id, String binding1, String binding2) {
- return getString(id, new String[] { binding1, binding2 });
- }
-
- /**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string values.
- */
- public static String getString(String id, String[] bindings) {
- if (id == null)
- return "No message available"; //$NON-NLS-1$
- String message = null;
- try {
- message = bundle.getString(id);
- } catch (MissingResourceException e) {
- // If we got an exception looking for the message, fail gracefully by just returning
- // the id we were looking for. In most cases this is semi-informative so is not too bad.
- return "Missing message: " + id + " in: " + bundleName; //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (bindings == null)
- return message;
- return MessageFormat.format(message, bindings);
- }
- /**
- * Print a debug message to the console. If the given boolean is <code>true</code> then
- * pre-pend the message with the current date.
- */
- public static void debug(boolean includeDate, String message) {
- if (includeDate)
- message = new Date(System.currentTimeMillis()).toString() + " - " + message; //$NON-NLS-1$
- System.out.println(message);
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
deleted file mode 100644
index 695bec8..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
+++ /dev/null
@@ -1,1169 +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.configurator;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.nio.channels.*;
-import java.util.*;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.service.datalocation.*;
-import org.eclipse.update.configurator.*;
-import org.w3c.dom.*;
-
-/**
- * This class is responsible for providing the features and plugins (bundles) to
- * the runtime. Configuration data is stored in the configuration/org.eclipse.update/platform.xml file.
- * When eclipse starts, it tries to load the config info from platform.xml.
- * If the file does not exist, then it also tries to read it from a temp or backup file.
- * If this does not succeed, a platform.xml is created by inspecting the eclipse
- * installation directory (its features and plugin folders).
- * If platform.xml already exists, a check is made to see when it was last modified
- * and whether there are any file system changes that are newer (users may manually unzip
- * features and plugins). In this case, the newly added features and plugins are picked up.
- * A check for existence of features and plugins is also performed, to detect deletions.
- */
-public class PlatformConfiguration implements IPlatformConfiguration, IConfigurationConstants {
-
- private static PlatformConfiguration currentPlatformConfiguration = null;
- private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- private static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
-
- private Configuration config;
- private URL configLocation;
- private HashMap externalLinkSites; // used to restore prior link site state
- private long changeStamp;
- private long featuresChangeStamp;
- private boolean featuresChangeStampIsValid;
- private long pluginsChangeStamp;
- private boolean pluginsChangeStampIsValid;
- private FileLock lock;
-
- private static final String ECLIPSE = "eclipse"; //$NON-NLS-1$
- private static final String CONFIG_HISTORY = "history"; //$NON-NLS-1$
- private static final String PLATFORM_XML = "platform.xml"; //$NON-NLS-1$
- private static final String CONFIG_NAME = ConfigurationActivator.NAME_SPACE + "/" + PLATFORM_XML; //$NON-NLS-1$
- private static final String CONFIG_INI = "config.ini"; //NON-NLS-1$ //$NON-NLS-1$
- private static final String CONFIG_FILE_LOCK_SUFFIX = ".lock"; //$NON-NLS-1$
- private static final String CONFIG_FILE_TEMP_SUFFIX = ".tmp"; //$NON-NLS-1$
- private static final String LINKS = "links"; //$NON-NLS-1$
- private static final String[] BOOTSTRAP_PLUGINS = {}; //$NON-NLS-1$
-
- private static final String DEFAULT_FEATURE_ID = "org.eclipse.platform"; //$NON-NLS-1$
- private static final String DEFAULT_FEATURE_APPLICATION = "org.eclipse.ui.ide.workbench"; //$NON-NLS-1$
-
- private static final String LINK_PATH = "path"; //$NON-NLS-1$
- private static final String LINK_READ = "r"; //$NON-NLS-1$
- private static final String LINK_READ_WRITE = "rw"; //$NON-NLS-1$
- private static URL installURL;
-
- private PlatformConfiguration(Location platformConfigLocation) throws CoreException, IOException {
-
- this.externalLinkSites = new HashMap();
- this.config = null;
-
- // initialize configuration
- initializeCurrent(platformConfigLocation);
-
- // Detect external links. These are "soft link" to additional sites. The link
- // files are usually provided by external installation programs. They are located
- // relative to this configuration URL.
- // Note: don't do it for self hosting
- if (!isTransient())
- configureExternalLinks();
-
- // Validate sites in the configuration. Causes any sites that do not exist to
- // be removed from the configuration
- validateSites();
-
- // compute differences between configuration and actual content of the sites
- // (base sites and link sites)
- // Note: when the config is transient (generated by PDE, etc.) we don't reconcile
- if (isTransient())
- return;
-
- changeStamp = computeChangeStamp();
- if (changeStamp > config.getDate().getTime())
- reconcile();
- }
-
- PlatformConfiguration(URL url) throws Exception {
- this.externalLinkSites = new HashMap();
- initialize(url);
- }
-
- /*
- * @see IPlatformConfiguration#createSiteEntry(URL, ISitePolicy)
- */
- public ISiteEntry createSiteEntry(URL url, ISitePolicy policy) {
- return new SiteEntry(url, policy);
- }
-
- /*
- * @see IPlatformConfiguration#createSitePolicy(int, String[])
- */
- public ISitePolicy createSitePolicy(int type, String[] list) {
- return new SitePolicy(type, list);
- }
-
- /*
- * @see IPlatformConfiguration#createFeatureEntry(String, String, String, boolean, String, URL)
- */
- public IFeatureEntry createFeatureEntry(String id, String version, String pluginVersion, boolean primary, String application, URL[] root) {
- return new FeatureEntry(id, version, pluginVersion, primary, application, root);
- }
-
- /*
- * @see IPlatformConfiguration#createFeatureEntry(String, String, String,
- * String, boolean, String, URL)
- */
- public IFeatureEntry createFeatureEntry(String id, String version, String pluginIdentifier, String pluginVersion, boolean primary, String application, URL[] root) {
- return new FeatureEntry(id, version, pluginIdentifier, pluginVersion, primary, application, root);
- }
-
- /*
- * @see IPlatformConfiguration#configureSite(ISiteEntry)
- */
- public void configureSite(ISiteEntry entry) {
- configureSite(entry, false);
- }
-
- /*
- * @see IPlatformConfiguration#configureSite(ISiteEntry, boolean)
- */
- public synchronized void configureSite(ISiteEntry entry, boolean replace) {
-
- if (entry == null)
- return;
-
- URL url = entry.getURL();
- if (url == null)
- return;
-
- String key = url.toExternalForm();
- if (config.getSiteEntry(key) != null && !replace)
- return;
-
- if (entry instanceof SiteEntry)
- config.addSiteEntry(key, (SiteEntry)entry);
- }
-
- /*
- * @see IPlatformConfiguration#unconfigureSite(ISiteEntry)
- */
- public synchronized void unconfigureSite(ISiteEntry entry) {
- if (entry == null)
- return;
-
- URL url = entry.getURL();
- if (url == null)
- return;
-
- String key = url.toExternalForm();
- if (entry instanceof SiteEntry)
- config.removeSiteEntry(key);
- }
-
- /*
- * @see IPlatformConfiguration#getConfiguredSites()
- */
- public ISiteEntry[] getConfiguredSites() {
- if (config == null)
- return new ISiteEntry[0];
-
- SiteEntry[] sites = config.getSites();
- ArrayList enabledSites = new ArrayList(sites.length);
- for (int i=0; i<sites.length; i++) {
- if (sites[i].isEnabled())
- enabledSites.add(sites[i]);
- }
- return (ISiteEntry[])enabledSites.toArray(new ISiteEntry[enabledSites.size()]);
- }
-
- /*
- * @see IPlatformConfiguration#findConfiguredSite(URL)
- */
- public ISiteEntry findConfiguredSite(URL url) {
- return findConfiguredSite(url, true);
- }
-
- /**
- *
- * @param url site url
- * @param checkPlatformURL if true, check for url format that is platform:/...
- * @return
- */
- public SiteEntry findConfiguredSite(URL url, boolean checkPlatformURL) {
- if (url == null)
- return null;
- String key = url.toExternalForm();
-
- SiteEntry result = config.getSiteEntry(key);
- if (result == null) { // retry with decoded URL string
- try {
- key = URLDecoder.decode(key, "UTF-8"); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- // ignore
- }
- result = config.getSiteEntry(key);
- }
-
- if (result == null && checkPlatformURL) {
- try {
- result = findConfiguredSite(Utils.asPlatformURL(url), false);
- } catch (Exception e) {
- //ignore
- }
- }
- return result;
- }
-
- /*
- * @see IPlatformConfiguration#configureFeatureEntry(IFeatureEntry)
- */
- public synchronized void configureFeatureEntry(IFeatureEntry entry) {
- if (entry == null)
- return;
-
- String key = entry.getFeatureIdentifier();
- if (key == null)
- return;
-
- // we should check each site and find where the feature is
- // located and then configure it
- if (config == null)
- config = new Configuration();
-
- SiteEntry[] sites = config.getSites();
- for (int i=0; i<sites.length; i++) {
- // find out what site contains the feature and configure it
- try {
- URL url = new URL(sites[i].getURL(), FEATURES + "/" + entry.getFeatureIdentifier()+ "_" + entry.getFeatureVersion() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if (new File(url.getFile()).exists())
- sites[i].addFeatureEntry(entry);
- else {
- url = new URL(sites[i].getURL(), FEATURES + "/" + entry.getFeatureIdentifier() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
- if (new File(url.getFile()).exists())
- sites[i].addFeatureEntry(entry);
- }
- } catch (MalformedURLException e) {
- }
- }
- }
-
- /*
- * @see IPlatformConfiguration#unconfigureFeatureEntry(IFeatureEntry)
- */
- public synchronized void unconfigureFeatureEntry(IFeatureEntry entry) {
- if (entry == null)
- return;
-
- String key = entry.getFeatureIdentifier();
- if (key == null)
- return;
-
- config.unconfigureFeatureEntry(entry);
- }
-
- /*
- * @see IPlatformConfiguration#getConfiguredFeatureEntries()
- */
- public IFeatureEntry[] getConfiguredFeatureEntries() {
- ArrayList configFeatures = new ArrayList();
- SiteEntry[] sites = config.getSites();
- for (int i=0; i<sites.length; i++) {
- FeatureEntry[] features = sites[i].getFeatureEntries();
- for (int j=0; j<features.length; j++)
- configFeatures.add(features[j]);
- }
- return (IFeatureEntry[])configFeatures.toArray(new FeatureEntry[configFeatures.size()]);
- }
-
- /*
- * @see IPlatformConfiguration#findConfiguredFeatureEntry(String)
- */
- public IFeatureEntry findConfiguredFeatureEntry(String id) {
- if (id == null)
- return null;
-
- SiteEntry[] sites = config.getSites();
- for (int i=0; i<sites.length; i++) {
- FeatureEntry f = sites[i].getFeatureEntry(id);
- if (f != null)
- return f;
- }
- return null;
- }
-
- /*
- * @see IPlatformConfiguration#getConfigurationLocation()
- */
- public URL getConfigurationLocation() {
- return configLocation;
- }
-
- /*
- * @see IPlatformConfiguration#getChangeStamp()
- */
- public long getChangeStamp() {
- if (config.getLinkedConfig() == null)
- return config.getDate().getTime();
- else
- return Math.max(config.getDate().getTime(), config.getLinkedConfig().getDate().getTime());
- }
-
- /*
- * @see IPlatformConfiguration#getFeaturesChangeStamp()
- * @deprecated Don't use this method
- */
- public long getFeaturesChangeStamp() {
- return 0;
- }
-
- /*
- * @see IPlatformConfiguration#getPluginsChangeStamp()
- * @deprecated Don't use this method
- */
- public long getPluginsChangeStamp() {
- return 0;
- }
-
-
- public String getApplicationIdentifier() {
- // Return the app if defined in system properties
- String application = System.getProperty(ECLIPSE_APPLICATION);
- if (application != null)
- return application;
-
- // Otherwise, try to get it from the primary feature (aka product)
- String feature = getPrimaryFeatureIdentifier();
-
- // lookup application for feature (specified or defaulted)
- if (feature != null) {
- IFeatureEntry fe = findConfiguredFeatureEntry(feature);
- if (fe != null) {
- if (fe.getFeatureApplication() != null)
- return fe.getFeatureApplication();
- }
- }
-
- // return hardcoded default if we failed
- return DEFAULT_FEATURE_APPLICATION;
- }
-
- /*
- * @see IPlatformConfiguration#getPrimaryFeatureIdentifier()
- */
- public String getPrimaryFeatureIdentifier() {
- // Return the product if defined in system properties
- String primaryFeatureId = System.getProperty(ECLIPSE_PRODUCT);
- if (primaryFeatureId == null)
- primaryFeatureId = DEFAULT_FEATURE_ID; // return hardcoded default
-
- // check if feature exists
- if (findConfiguredFeatureEntry(primaryFeatureId) == null)
- return null;
- else
- return primaryFeatureId;
- }
-
- /*
- * @see IPlatformConfiguration#getPluginPath()
- */
- public URL[] getPluginPath() {
- ArrayList path = new ArrayList();
- Utils.debug("computed plug-in path:"); //$NON-NLS-1$
-
- ISiteEntry[] sites = getConfiguredSites();
- URL pathURL;
- for (int i = 0; i < sites.length; i++) {
- String[] plugins = sites[i].getPlugins();
- for (int j = 0; j < plugins.length; j++) {
- try {
- pathURL = new URL(((SiteEntry) sites[i]).getResolvedURL(), plugins[j]);
- path.add(pathURL);
- Utils.debug(" " + pathURL.toString()); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- // skip entry ...
- Utils.debug(" bad URL: " + e); //$NON-NLS-1$
- }
- }
- }
- return (URL[]) path.toArray(new URL[0]);
- }
-
-
- /*
- * A variation of the getPluginPath, but it returns the actual plugin entries
- */
- public PluginEntry[] getPlugins() {
- ArrayList allPlugins = new ArrayList();
- Utils.debug("computed plug-ins:"); //$NON-NLS-1$
-
- ISiteEntry[] sites = getConfiguredSites();
- for (int i = 0; i < sites.length; i++) {
- if (!(sites[i] instanceof SiteEntry)) {
- Utils.debug("Site " + sites[i].getURL() + " is not a SiteEntry"); //$NON-NLS-1$ //$NON-NLS-2$
- continue;
- }
- PluginEntry[] plugins = ((SiteEntry)sites[i]).getPluginEntries();
- for (int j = 0; j < plugins.length; j++) {
- allPlugins.add(plugins[j]);
- Utils.debug(" " + plugins[j].getURL()); //$NON-NLS-1$
- }
- }
- return (PluginEntry[]) allPlugins.toArray(new PluginEntry[0]);
- }
-
-
- /*
- * @see IPlatformConfiguration#getBootstrapPluginIdentifiers()
- */
- public String[] getBootstrapPluginIdentifiers() {
- return BOOTSTRAP_PLUGINS;
- }
-
- /*
- * @see IPlatformConfiguration#setBootstrapPluginLocation(String, URL)
- */
- public void setBootstrapPluginLocation(String id, URL location) {
- }
-
- /*
- * @see IPlatformConfiguration#isUpdateable()
- */
- public boolean isUpdateable() {
- return true;
- }
-
- /*
- * @see IPlatformConfiguration#isTransient()
- */
- public boolean isTransient() {
- if (config != null)
- return config.isTransient();
- else
- return false;
- }
-
- /*
- * @see IPlatformConfiguration#isTransient(boolean)
- */
- public void isTransient(boolean value) {
- if (this != getCurrent() && config != null)
- config.setTransient(value);
- }
-
- /*
- * @see IPlatformConfiguration#refresh()
- */
- public synchronized void refresh() {
- // Reset computed values. Will be lazily refreshed
- // on next access
- ISiteEntry[] sites = getConfiguredSites();
- for (int i = 0; i < sites.length; i++) {
- // reset site entry
- ((SiteEntry) sites[i]).refresh();
- }
- }
-
- /*
- * @see IPlatformConfiguration#save()
- */
- public void save() throws IOException {
- if (isUpdateable())
- save(configLocation);
- }
-
- /*
- * @see IPlatformConfiguration#save(URL)
- */
- public synchronized void save(URL url) throws IOException {
- if (url == null)
- throw new IOException(Messages.getString("cfig.unableToSave.noURL")); //$NON-NLS-1$
-
- OutputStream os = null;
- if (!url.getProtocol().equals("file")) { //$NON-NLS-1$
- // not a file protocol - attempt to save to the URL
- URLConnection uc = url.openConnection();
- uc.setDoOutput(true);
- os = uc.getOutputStream();
- try {
- saveAsXML(os);
- config.setDirty(false);
- } catch (CoreException e) {
- Utils.log(e.getMessage());
- Utils.log(e.getStatus());
- throw new IOException(Messages.getString("cfig.unableToSave", url.toExternalForm())); //$NON-NLS-1$
- } finally {
- os.close();
- }
- } else {
- // file protocol - do safe i/o
- File cfigFile = new File(url.getFile().replace('/', File.separatorChar));
- if (!cfigFile.getName().equals(PLATFORM_XML)) {
- if (cfigFile.exists() && cfigFile.isFile()) {
- Utils.log(Messages.getString("PlatformConfiguration.expectingPlatformXMLorDirectory") + cfigFile.getName()); //$NON-NLS-1$
- cfigFile = cfigFile.getParentFile();
- }
- cfigFile = new File(cfigFile, CONFIG_NAME);
- }
- File workingDir = cfigFile.getParentFile();
- if (workingDir != null && !workingDir.exists())
- workingDir.mkdirs();
-
- // Do safe i/o:
- // - backup current config, by moving it to the history folder
- // - write new config to platform.xml.tmp file
- // - rename the temp file to platform.xml
- File cfigFileOriginal = new File(cfigFile.getAbsolutePath());
- File cfigTmp = new File(cfigFile.getAbsolutePath() + CONFIG_FILE_TEMP_SUFFIX);
-
- // Backup old file
- if (cfigFile.exists()){
- File backupDir = new File(workingDir, CONFIG_HISTORY);
- if (!backupDir.exists())
- backupDir.mkdir();
- long timestamp = cfigFile.lastModified();
- File preservedFile = new File(backupDir, String.valueOf(timestamp)+".xml"); //$NON-NLS-1$
- // If the target file exists, increment the timestamp. Try at most 100 times.
- long increment = 1;
- while (preservedFile.exists() && increment < 100){
- preservedFile = new File(backupDir, String.valueOf(timestamp+increment++)+".xml"); //$NON-NLS-1$
- }
- if (!preservedFile.exists()) {
- // try renaming current config to backup copy
- if (!cfigFile.renameTo(preservedFile))
- Utils.log(Messages.getString("PlatformConfiguration.cannotBackupConfig")); //$NON-NLS-1$
- }
- }
-
- // If config.ini does not exist, generate it in the configuration area
- writeConfigIni(workingDir.getParentFile());
-
- // first save the file as temp
- os = new FileOutputStream(cfigTmp);
- try {
- saveAsXML(os);
- // Try flushing any internal buffers, and synchronize with the disk
- try {
- os.flush();
- ((FileOutputStream)os).getFD().sync();
- } catch (SyncFailedException e2) {
- Utils.log(e2.getMessage());
- } catch (IOException e2) {
- Utils.log(e2.getMessage());
- }
- try {
- os.close();
- os = null;
- } catch (IOException e1) {
- Utils.log(Messages.getString("PlatformConfiguration.cannotCloseStream") + cfigTmp); //$NON-NLS-1$
- Utils.log(e1.getMessage());
- }
- // set file time stamp to match that of the config element
- cfigTmp.setLastModified(config.getDate().getTime());
- // set this on config, in case the value was rounded off
- config.setLastModified(cfigTmp.lastModified());
- // make the change stamp to be the same as the config file
- changeStamp = config.getDate().getTime();
- config.setDirty(false);
- } catch (CoreException e) {
- throw new IOException(Messages.getString("cfig.unableToSave", cfigTmp.getAbsolutePath())); //$NON-NLS-1$
- } finally {
- if (os != null)
- try {
- os.close();
- } catch (IOException e1) {
- Utils.log(Messages.getString("PlatformConfiguration.cannotCloseTempFile") + cfigTmp); //$NON-NLS-1$
- }
- }
-
- // at this point we have old config (if existed) as "bak" and the
- // new config as "tmp".
- boolean ok = cfigTmp.renameTo(cfigFileOriginal);
- if (!ok) {
- // this codepath represents a tiny failure window. The load processing
- // on startup will detect missing config and will attempt to start
- // with "tmp" (latest), then "bak" (the previous). We can also end up
- // here if we failed to rename the current config to "bak". In that
- // case we will restart with the previous state.
- Utils.log(Messages.getString("PlatformConfiguration.cannotRenameTempFile")); //$NON-NLS-1$
-
- throw new IOException(Messages.getString("cfig.unableToSave", cfigTmp.getAbsolutePath())); //$NON-NLS-1$
- }
- }
- }
-
- private void writeConfigIni(File configDir) {
- try {
- File configIni = new File(configDir, CONFIG_INI);
- if (!configIni.exists()) {
- URL configIniURL = ConfigurationActivator.getBundleContext().getBundle().getEntry(CONFIG_INI);
- copy(configIniURL, configIni);
- }
- } catch (Exception e) {
- System.out.println(Messages.getString("cfg.unableToCreateConfig.ini")); //$NON-NLS-1$
- }
- }
-
- public static PlatformConfiguration getCurrent() {
- return currentPlatformConfiguration;
- }
-
- /**
- * Starts a platform installed at specified installURL using configuration located at platformConfigLocation.
- */
- public static synchronized void startup(URL installURL, Location platformConfigLocation) throws Exception {
- PlatformConfiguration.installURL = installURL;
-
- // create current configuration
- if (currentPlatformConfiguration == null) {
- currentPlatformConfiguration = new PlatformConfiguration(platformConfigLocation);
- if (currentPlatformConfiguration.config == null)
- throw new Exception(Messages.getString("PlatformConfiguration.cannotLoadConfig") + platformConfigLocation.getURL()); //$NON-NLS-1$
- if (currentPlatformConfiguration.config.isDirty())
- // If this is a transient config (generated by PDE),do nothing
- // otherwise, save the configuration with proper date
- if (!currentPlatformConfiguration.isTransient())
- currentPlatformConfiguration.save();
- }
- }
-
- public static synchronized void shutdown() throws IOException {
-
- // save platform configuration
- PlatformConfiguration config = getCurrent();
- if (config != null) {
- // only save if there are changes in the config
- if (config.config.isDirty() && !config.isTransient()) {
- try {
- config.save();
- } catch (IOException e) {
- Utils.debug("Unable to save configuration " + e.toString()); //$NON-NLS-1$
- // will recover on next startup
- }
- }
- }
- }
-
-
- private synchronized void initializeCurrent(Location platformConfigLocation) throws IOException {
-
- // Configuration URL was is specified by the OSGi layer.
- // Default behavior is to look
- // for configuration in the specified meta area. If not found, look
- // for pre-initialized configuration in the installation location.
- // If it is found it is used as the initial configuration. Otherwise
- // a new configuration is created. In either case the resulting
- // configuration is written into the specified configuration area.
-
- URL configFileURL = new URL(platformConfigLocation.getURL(), CONFIG_NAME);
- try {
- // check concurrent use lock
- getConfigurationLock(platformConfigLocation.getURL());
-
- // try loading the configuration
- try {
- config = loadConfig(configFileURL);
- Utils.debug("Using configuration " + configFileURL.toString()); //$NON-NLS-1$
- } catch (Exception e) {
- // failed to load, see if we can find pre-initialized configuration.
- try {
- Location parentLocation = platformConfigLocation.getParentLocation();
- if (parentLocation == null)
- throw new IOException(); // no platform.xml found, need to create default site
-
- URL sharedConfigFileURL = new URL(parentLocation.getURL(), CONFIG_NAME);
- config = loadConfig(sharedConfigFileURL);
-
- // pre-initialized config loaded OK ... copy any remaining update metadata
- // Only copy if the default config location is not the install location
- if (!sharedConfigFileURL.equals(configFileURL)) {
- // need to link config info instead of using a copy
- linkInitializedState(config, parentLocation, platformConfigLocation);
- Utils.debug("Configuration initialized from " + sharedConfigFileURL.toString()); //$NON-NLS-1$
- }
- return;
- } catch (Exception ioe) {
- Utils.debug("Creating default configuration from " + configFileURL.toExternalForm()); //$NON-NLS-1$
- createDefaultConfiguration(configFileURL);
- }
- }
- } finally {
- configLocation = configFileURL;
- if (config.getURL() == null)
- config.setURL(configFileURL);
- verifyPath(configLocation);
- Utils.debug("Creating configuration " + configFileURL.toString()); //$NON-NLS-1$
- // releaes concurrent use lock
- clearConfigurationLock();
- }
- }
-
-
- private synchronized void initialize(URL url) throws Exception {
- if (url != null) {
- config = loadConfig(url);
- Utils.debug("Using configuration " + url.toString()); //$NON-NLS-1$
- }
- if (config == null) {
- config = new Configuration();
- Utils.debug("Creating empty configuration object"); //$NON-NLS-1$
- }
- config.setURL(url);
- configLocation = url;
- }
-
- private void createDefaultConfiguration(URL url)throws IOException{
- // we are creating new configuration
- config = new Configuration();
- config.setURL(url);
- SiteEntry defaultSite = (SiteEntry)getRootSite();
- configureSite(defaultSite);
- try {
- // parse the site directory to discover features
- defaultSite.loadFromDisk(0);
- } catch (CoreException e1) {
- Utils.log(Messages.getString("PlatformConfiguration.cannotLoadDefaultSite") + defaultSite.getResolvedURL()); //$NON-NLS-1$
- return;
- }
- }
- private ISiteEntry getRootSite() {
- // create default site entry for the root
- ISitePolicy defaultPolicy = createSitePolicy(DEFAULT_POLICY_TYPE, DEFAULT_POLICY_LIST);
- URL siteURL = null;
- try {
- siteURL = new URL("platform:/base/"); //$NON-NLS-1$ // try using platform-relative URL
- } catch (MalformedURLException e) {
- siteURL = getInstallURL(); // ensure we come up ... use absolute file URL
- }
- ISiteEntry defaultSite = createSiteEntry(siteURL, defaultPolicy);
- return defaultSite;
- }
-
- /**
- * Gets the configuration lock
- * @param url configuration directory
- */
- private void getConfigurationLock(URL url) {
- if (!url.getProtocol().equals("file")) //$NON-NLS-1$
- return;
-
- File lockFile = new File(url.getFile(), ConfigurationActivator.NAME_SPACE+ File.separator+CONFIG_FILE_LOCK_SUFFIX);
- verifyPath(url);
- try {
- RandomAccessFile raf = new RandomAccessFile(lockFile, "rw"); //$NON-NLS-1$
- lock = raf.getChannel().lock();
- } catch (IOException ioe) {
- lock = null;
- }
- }
-
- private void clearConfigurationLock() {
- if (lock != null) {
- try {
- lock.channel().close();
- } catch (IOException ioe) {
- }
- }
- }
-
-
- private long computeChangeStamp() {
- featuresChangeStamp = computeFeaturesChangeStamp();
- pluginsChangeStamp = computePluginsChangeStamp();
- changeStamp = Math.max(featuresChangeStamp, pluginsChangeStamp);
- // round off to seconds
- changeStamp = (changeStamp/1000)*1000;
- return changeStamp;
- }
-
- private long computeFeaturesChangeStamp() {
- if (featuresChangeStampIsValid)
- return featuresChangeStamp;
-
- long result = 0;
- ISiteEntry[] sites = config.getSites();
- for (int i = 0; i < sites.length; i++) {
- result = Math.max(result, sites[i].getFeaturesChangeStamp());
- }
- featuresChangeStamp = result;
- featuresChangeStampIsValid = true;
- return featuresChangeStamp;
- }
-
- private long computePluginsChangeStamp() {
- if (pluginsChangeStampIsValid)
- return pluginsChangeStamp;
-
- long result = 0;
- ISiteEntry[] sites = config.getSites();
- for (int i = 0; i < sites.length; i++) {
- result = Math.max(result, sites[i].getPluginsChangeStamp());
- }
- pluginsChangeStamp = result;
- pluginsChangeStampIsValid = true;
- return pluginsChangeStamp;
- }
-
- private void configureExternalLinks() {
- URL linkURL = getInstallURL();
- if (!supportsDetection(linkURL))
- return;
-
- try {
- linkURL = new URL(linkURL, LINKS + "/"); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- // skip bad links ...
- Utils.debug("Unable to obtain link URL"); //$NON-NLS-1$
- return;
- }
-
- File linkDir = new File(linkURL.getFile());
- File[] links = linkDir.listFiles();
- if (links == null || links.length == 0) {
- Utils.debug("No links detected in " + linkURL.toExternalForm()); //$NON-NLS-1$
- return;
- }
-
- for (int i = 0; i < links.length; i++) {
- if (links[i].isDirectory())
- continue;
- Utils.debug("Link file " + links[i].getAbsolutePath()); //$NON-NLS-1$
- Properties props = new Properties();
- FileInputStream is = null;
- try {
- is = new FileInputStream(links[i]);
- props.load(is);
- configureExternalLinkSite(links[i], props);
- } catch (IOException e) {
- // skip bad links ...
- Utils.debug(" unable to load link file " + e); //$NON-NLS-1$
- continue;
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- // ignore ...
- }
- }
- }
- }
- }
-
- private void configureExternalLinkSite(File linkFile, Properties props) {
- String path = props.getProperty(LINK_PATH);
- if (path == null) {
- Utils.debug(" no path definition"); //$NON-NLS-1$
- return;
- }
-
- String link;
- boolean updateable = true;
- URL siteURL;
-
- // parse out link information
- if (path.startsWith(LINK_READ + " ")) { //$NON-NLS-1$
- updateable = false;
- link = path.substring(2).trim();
- } else if (path.startsWith(LINK_READ_WRITE + " ")) { //$NON-NLS-1$
- link = path.substring(3).trim();
- } else {
- link = path.trim();
- }
-
- // make sure we have a valid link specification
- try {
- File siteFile = new File(link);
- siteFile = new File(siteFile, ECLIPSE);
- siteURL = siteFile.toURL();
- if (findConfiguredSite(siteURL, true) != null)
- // linked site is already known
- return;
- } catch (MalformedURLException e) {
- // ignore bad links ...
- Utils.debug(" bad URL " + e); //$NON-NLS-1$
- return;
- }
-
- // process the link
- SiteEntry linkSite = (SiteEntry) externalLinkSites.get(siteURL);
- if (linkSite == null) {
- // this is a link to a new target so create site for it
- ISitePolicy linkSitePolicy = createSitePolicy(DEFAULT_POLICY_TYPE, DEFAULT_POLICY_LIST);
- linkSite = (SiteEntry) createSiteEntry(siteURL, linkSitePolicy);
- }
- // update site entry if needed
- linkSite.setUpdateable(updateable);
- linkSite.setLinkFileName(linkFile.getAbsolutePath());
-
- // configure the new site
- // NOTE: duplicates are not replaced (first one in wins)
- configureSite(linkSite);
- // there are changes in the config
- config.setDirty(true);
- Utils.debug(" " + (updateable ? "R/W -> " : "R/O -> ") + siteURL.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- private void validateSites() {
-
- // check to see if all sites are valid. Remove any sites that do not exist.
- SiteEntry[] list = config.getSites();
- for (int i = 0; i < list.length; i++) {
- URL siteURL = list[i].getResolvedURL();
- if (!supportsDetection(siteURL))
- continue;
-
- File siteRoot = new File(siteURL.getFile().replace('/', File.separatorChar));
- if (!siteRoot.exists()) {
- unconfigureSite(list[i]);
- Utils.debug("Site " + siteURL + " does not exist ... removing from configuration"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- // If multiple paths are defined in the same link file
- // or if the path changes, the old site will still be kept.
- // A better algorithm could be implemented by keeping track
- // of the previous content of the link file.
- // TODO do the above
- String linkName = list[i].getLinkFileName();
- if (linkName != null) {
- File linkFile = new File(linkName);
- if (!linkFile.exists()) {
- unconfigureSite(list[i]);
- config.setDirty(true);
- Utils.debug("Site " + siteURL + " is no longer linked ... removing from configuration"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
- }
-
- private void linkInitializedState(Configuration sharedConfig, Location sharedConfigLocation, Location newConfigLocation) {
- try {
- URL newConfigIniURL = new URL(newConfigLocation.getURL(), CONFIG_INI);
- if (!newConfigIniURL.getProtocol().equals("file")) //$NON-NLS-1$
- return; // need to be able to do write
-
- // modify config.ini and platform.xml to only link original files
- File configIni = new File(newConfigIniURL.getFile());
- Properties props = new Properties();
- props.put("osgi.sharedConfiguration.area", sharedConfigLocation.getURL().toExternalForm()); //$NON-NLS-1$
- props.store(new FileOutputStream(configIni), "Linked configuration"); //$NON-NLS-1$
-
- config = new Configuration(new Date());
- config.setURL(new URL(newConfigLocation.getURL(), CONFIG_NAME));
- config.setLinkedConfig(sharedConfig);
- config.setDirty(true);
- } catch (IOException e) {
- // this is an optimistic copy. If we fail, the state will be reconciled
- // when the update manager is triggered.
- System.out.println(e);
- }
- }
-
-
- private void copy(URL src, File tgt) throws IOException {
- InputStream is = null;
- OutputStream os = null;
- try {
- is = src.openStream();
- os = new FileOutputStream(tgt);
- byte[] buff = new byte[1024];
- int count = is.read(buff);
- while (count != -1) {
- os.write(buff, 0, count);
- count = is.read(buff);
- }
- } finally {
- if (is != null)
- try {
- is.close();
- } catch (IOException e) {
- // ignore ...
- }
- if (os != null)
- try {
- os.close();
- } catch (IOException e) {
- // ignore ...
- }
- }
- }
-
- private Configuration loadConfig(URL url) throws Exception {
- if (url == null)
- throw new IOException(Messages.getString("cfig.unableToLoad.noURL")); //$NON-NLS-1$
-
- // try to load saved configuration file (watch for failed prior save())
- ConfigurationParser parser = null;
- try {
- parser = new ConfigurationParser();
- } catch (InvocationTargetException e) {
- throw (Exception)e.getTargetException();
- }
-
- config = null;
- Exception originalException = null;
- try {
- config = parser.parse(url);
- if (config == null)
- throw new Exception(Messages.getString("PlatformConfiguration.cannotFindConfigFile")); //$NON-NLS-1$
- } catch (Exception e1) {
- // check for save failures, so open temp and backup configurations
- originalException = e1;
- try {
- URL tempURL = new URL(url.toExternalForm()+CONFIG_FILE_TEMP_SUFFIX);
- config = parser.parse(tempURL);
- if (config == null)
- throw new Exception();
- else
- config.setDirty(true); // force saving to platform.xml
- } catch (Exception e2) {
- try {
- // check the backup
- if ("file".equals(url.getProtocol())) { //$NON-NLS-1$
- File cfigFile = new File(url.getFile().replace('/', File.separatorChar));
- File workingDir = cfigFile.getParentFile();
- if (workingDir != null && workingDir.exists()) {
- File[] backups = workingDir.listFiles(new FileFilter(){
- public boolean accept(File pathname) {
- return pathname.isFile() && pathname.getName().endsWith(".xml"); //$NON-NLS-1$
- }});
- if (backups != null && backups.length > 0) {
- URL backupUrl = backups[backups.length-1].toURL();
- config = parser.parse(backupUrl);
- }
- }
- }
- if (config == null)
- throw originalException; // we tried, but no config here ...
- else
- config.setDirty(true); // force saving to platform.xml
- } catch (IOException e3) {
- throw originalException; // we tried, but no config here ...
- }
- }
- }
-
- return config;
- }
-
- public static boolean supportsDetection(URL url) {
- String protocol = url.getProtocol();
- if (protocol.equals("file")) //$NON-NLS-1$
- return true;
- else if (protocol.equals("platform")) {
- URL resolved = null;
- try {
- resolved = resolvePlatformURL(url); // 19536
- } catch (IOException e) {
- return false; // we tried but failed to resolve the platform URL
- }
- return resolved.getProtocol().equals("file"); //$NON-NLS-1$
- } else
- return false;
- }
-
- private static void verifyPath(URL url) {
- String protocol = url.getProtocol();
- String path = null;
- if (protocol.equals("file")) //$NON-NLS-1$
- path = url.getFile();
- else if (protocol.equals("platform")) { // $NON-NLS-1$
- URL resolved = null;
- try {
- resolved = resolvePlatformURL(url); // 19536
- if (resolved.getProtocol().equals("file")) //$NON-NLS-1$
- path = resolved.getFile();
- } catch (IOException e) {
- // continue ...
- }
- }
-
- if (path != null) {
- File dir = new File(path).getParentFile();
- if (dir != null)
- dir.mkdirs();
- }
- }
-
- public static URL resolvePlatformURL(URL url) throws IOException {
- // 19536
- if (url.getProtocol().equals("platform")) { // $NON-NLS-1$;
- url = Platform.asLocalURL(url);
- // TODO URL resolution by platform returns url file:d:/path as opposed to file:/d:/path
- File f = new File(url.getFile());
- url = f.toURL();
- }
- return url;
- }
-
- public static URL getInstallURL() {
- return installURL;
- }
-
- private void saveAsXML(OutputStream stream) throws CoreException {
- StreamResult result = null;
- try {
- DocumentBuilder docBuilder = documentBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.newDocument();
-
- if (config == null)
- throw Utils.newCoreException(Messages.getString("PlatformConfiguration.cannotSaveNonExistingConfig"),null); //$NON-NLS-1$
-
- config.setDate(new Date());
- doc.appendChild(doc.createComment("Created on " + config.getDate().toString())); //$NON-NLS-1$
- Element configElement = config.toXML(doc);
- doc.appendChild(configElement);
-
- // Write out to a file
-
- Transformer transformer=transformerFactory.newTransformer();
- transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
- DOMSource source = new DOMSource(doc);
- result = new StreamResult(stream);
-
- transformer.transform(source,result);
- //will close the stream in the caller
- //stream.close();
- } catch (Exception e) {
- throw Utils.newCoreException("", e); //$NON-NLS-1$
- } finally {
- result.setOutputStream(null);
- result = null;
- }
- }
-
- private void reconcile() throws CoreException {
- long lastChange = config.getDate().getTime();
- SiteEntry[] sites = config.getSites();
- for (int s=0; s<sites.length; s++) {
- long siteTimestamp = sites[s].getChangeStamp();
- if (siteTimestamp > lastChange)
- sites[s].loadFromDisk(lastChange);
- }
- config.setDirty(true);
- }
-
- public Configuration getConfiguration() {
- return config;
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfigurationFactory.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfigurationFactory.java
deleted file mode 100644
index 80c4457..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfigurationFactory.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.configurator;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.update.configurator.*;
-
-
-
-public class PlatformConfigurationFactory implements IPlatformConfigurationFactory {
- public IPlatformConfiguration getCurrentPlatformConfiguration() {
- return PlatformConfiguration.getCurrent();
- }
- public IPlatformConfiguration getPlatformConfiguration(URL url) throws IOException {
- try {
- return new PlatformConfiguration(url);
- } catch (Exception e) {
- if(e instanceof IOException)
- throw (IOException)e;
- else
- throw new IOException(e.getMessage());
- }
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginEntry.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginEntry.java
deleted file mode 100644
index 736a6d3..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginEntry.java
+++ /dev/null
@@ -1,157 +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.configurator;
-
-
-/**
- */
-public class PluginEntry {
-
- private String pluginId;
- private String pluginVersion;
- private boolean isFragment = false;
- private VersionedIdentifier versionId;
- private String url;
-
- public PluginEntry() {
- super();
- }
-
- /**
- * @return url relative to the site location: plugins/org.eclipse.foo/plugin.xml
- * Note: to do: we should probably only use plugins/org.eclipse.foo/ in the future
- */
- public String getURL() {
- return url;
- }
-
- /**
- * url is relative to the site
- */
- public void setURL(String url) {
- this.url = url;
- }
-
- /**
- * 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;
- }
-
- /**
- * 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
- */
- 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.
- */
- void setPluginIdentifier(String pluginId) {
- 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.
- */
- void setPluginVersion(String pluginVersion) {
- 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
- */
- public void isFragment(boolean isFragment) {
- this.isFragment = isFragment;
- }
-
- /**
- * @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;
- }
-
-
- /**
- * Returns the identifier of this plugin entry
- */
- 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) {
- Utils.log(Messages.getString("PluginEntry.versionError", id, ver)); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- versionId = new VersionedIdentifier("",null); //$NON-NLS-1$
- return versionId;
- }
-
- /**
- * Sets the identifier of this plugin entry.
- *
- */
- 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
- */
- public boolean equals(Object object) {
- if (!(object instanceof PluginEntry))
- return false;
- PluginEntry e = (PluginEntry) object;
- return getVersionedIdentifier().equals(e.getVersionedIdentifier());
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginParser.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginParser.java
deleted file mode 100644
index 7363aee..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PluginParser.java
+++ /dev/null
@@ -1,117 +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.configurator;
-
-
-import java.io.*;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-/**
- * Parse default feature.xml
- */
-
-public class PluginParser extends DefaultHandler implements IConfigurationConstants {
- private final static SAXParserFactory parserFactory =
- SAXParserFactory.newInstance();
- private SAXParser parser;
- private PluginEntry pluginEntry;
-
- private class ParseCompleteException extends SAXException {
- public ParseCompleteException(String arg0) {
- super(arg0);
- }
- }
-
- /**
- * Constructor for DefaultFeatureParser
- */
- public PluginParser() {
- super();
- try {
- parserFactory.setNamespaceAware(true);
- this.parser = parserFactory.newSAXParser();
- } catch (ParserConfigurationException e) {
- System.out.println(e);
- } catch (SAXException e) {
- System.out.println(e);
- }
- }
-
- /**
- * @since 2.0
- */
- public synchronized PluginEntry parse(File pluginFile) throws SAXException, IOException {
- FileInputStream in = null;;
- try{
- in = new FileInputStream(pluginFile);
- return parse(in, PLUGINS + "/" + pluginFile.getParentFile().getName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
- }finally{
- if (in != null){
- try{
- in.close();
- }catch(IOException e){
- }
- }
- }
- }
- /**
- * @since 3.0
- */
- public synchronized PluginEntry parse(InputStream in, String bundleUrl) throws SAXException, IOException {
- try {
- pluginEntry = new PluginEntry();
- pluginEntry.setURL(bundleUrl);
- 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
- }
- 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(CFG_PLUGIN)) {
- pluginEntry.isFragment(false);
- processPlugin(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(CFG_FRAGMENT)) {
- pluginEntry.isFragment(true);
- processPlugin(attributes);
- return;
- }
- }
-
- /**
- * process plugin entry info
- */
- private void processPlugin(Attributes attributes) throws ParseCompleteException {
- String id = attributes.getValue("id"); //$NON-NLS-1$
- String version = attributes.getValue("version"); //$NON-NLS-1$
- if (id == null || id.trim().length() == 0)
- id = "_no_id_"; //$NON-NLS-1$
- pluginEntry.setVersionedIdentifier(new VersionedIdentifier(id, version));
-
- // stop parsing now
- throw new ParseCompleteException(""); //$NON-NLS-1$
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ProductProvider.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ProductProvider.java
deleted file mode 100644
index 6c7f199..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ProductProvider.java
+++ /dev/null
@@ -1,46 +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.update.internal.configurator;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-
-/**
- * Maps primary features to IProduct
- */
-public class ProductProvider implements IProductProvider{
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IProductProvider#getProducts()
- */
- public IProduct[] getProducts() {
- IPlatformConfiguration configuration = ConfiguratorUtils.getCurrentPlatformConfiguration();
- if (configuration == null)
- return new IProduct[0];
- else {
- IPlatformConfiguration.IFeatureEntry[] features = configuration.getConfiguredFeatureEntries();
- ArrayList primaryFeatures = new ArrayList();
- for (int i=0; i<features.length; i++)
- if (features[i].canBePrimary())
- primaryFeatures.add(features[i]);
- // TODO handle unmanaged plugins later
- return (IProduct[])primaryFeatures.toArray(new IProduct[primaryFeatures.size()]);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IProductProvider#getName()
- */
- public String getName() {
- return Messages.getString("ProductProvider"); //$NON-NLS-1$
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
deleted file mode 100644
index 7a08905..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
+++ /dev/null
@@ -1,744 +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.configurator;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.zip.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.configurator.IPlatformConfiguration.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-
-public class SiteEntry implements IPlatformConfiguration.ISiteEntry, IConfigurationConstants{
- private URL url; // this is the external URL for the site
- private URL resolvedURL; // this is the resolved URL used internally
- private ISitePolicy policy;
- private boolean updateable = true;
- private Map featureEntries;
- private ArrayList pluginEntries;
- private long changeStamp;
- private long featuresChangeStamp;
- private long pluginsChangeStamp;
- private String linkFileName;
- private boolean enabled = true;
- private Configuration config;
-
- private static FeatureParser featureParser = new FeatureParser();
- private static PluginParser pluginParser = new PluginParser();
-
- public SiteEntry(URL url) {
- this(url,null);
- }
-
- public SiteEntry(URL url, ISitePolicy policy) {
- if (url == null)
- try {
- url = new URL("platform:/base/"); //$NON-NLS-1$ try using platform-relative URL
- } catch (MalformedURLException e) {
- url = PlatformConfiguration.getInstallURL(); // ensure we come up ... use absolute file URL
- }
-
- if (policy == null)
- policy = new SitePolicy(DEFAULT_POLICY_TYPE, DEFAULT_POLICY_LIST);
-
- if (url.getProtocol().equals("file")) { //$NON-NLS-1$
- try {
- // TODO remove this when platform fixes local file url's
- this.url = new File(url.getFile()).toURL();
- } catch (MalformedURLException e1) {
- this.url = url;
- }
- } else
- this.url = url;
-
- this.policy = policy;
- this.resolvedURL = this.url;
- if (url.getProtocol().equals("platform")) { // $NON-NLS-1$
- try {
- resolvedURL = PlatformConfiguration.resolvePlatformURL(url); // 19536
- } catch (IOException e) {
- // will use the baseline URL ...
- }
- }
- }
-
- public void setConfig(Configuration config) {
- this.config = config;
- }
-
- public Configuration getConfig() {
- return config;
- }
-
- /*
- * @see ISiteEntry#getURL()
- */
- public URL getURL() {
- return url;
- }
-
- /*
- * @see ISiteEntry#getSitePolicy()
- */
- public ISitePolicy getSitePolicy() {
- return policy;
- }
-
- /*
- * @see ISiteEntry#setSitePolicy(ISitePolicy)
- */
- public synchronized void setSitePolicy(ISitePolicy policy) {
- if (policy == null)
- throw new IllegalArgumentException();
- this.policy = policy;
- }
-
- /*
- * @see ISiteEntry#getFeatures()
- */
- public String[] getFeatures() {
- return getDetectedFeatures();
- }
-
- /*
- * @see ISiteEntry#getPlugins()
- */
- public String[] getPlugins() {
-
- ISitePolicy policy = getSitePolicy();
-
- if (policy.getType() == ISitePolicy.USER_INCLUDE)
- return policy.getList();
-
- if (policy.getType() == ISitePolicy.USER_EXCLUDE) {
- ArrayList detectedPlugins = new ArrayList(Arrays.asList(getDetectedPlugins()));
- String[] excludedPlugins = policy.getList();
- for (int i = 0; i < excludedPlugins.length; i++) {
- if (detectedPlugins.contains(excludedPlugins[i]))
- detectedPlugins.remove(excludedPlugins[i]);
- }
- return (String[]) detectedPlugins.toArray(new String[0]);
- }
-
- // bad policy type
- return new String[0];
- }
-
- public PluginEntry[] getPluginEntries() {
- String[] pluginURLs = getPlugins();
- // hash the array, for faster lookups
- HashMap map = new HashMap(pluginURLs.length);
- for (int i=0; i<pluginURLs.length; i++)
- map.put(pluginURLs[i], pluginURLs[i]);
-
- if (pluginEntries == null)
- detectPlugins();
-
- ArrayList plugins = new ArrayList(pluginURLs.length);
- for (int i=0; i<pluginEntries.size(); i++) {
- PluginEntry p = (PluginEntry)pluginEntries.get(i);
- if (map.containsKey(p.getURL()))
- plugins.add(p);
- }
- return (PluginEntry[])plugins.toArray(new PluginEntry[plugins.size()]);
- }
-
- /*
- * @see ISiteEntry#getChangeStamp()
- */
- public long getChangeStamp() {
- if (changeStamp == 0)
- computeChangeStamp();
- return changeStamp;
- }
-
- /*
- * @see ISiteEntry#getFeaturesChangeStamp()
- */
- public long getFeaturesChangeStamp() {
- if (featuresChangeStamp == 0)
- computeFeaturesChangeStamp();
- return featuresChangeStamp;
- }
-
- /*
- * @see ISiteEntry#getPluginsChangeStamp()
- */
- public long getPluginsChangeStamp() {
- if (pluginsChangeStamp == 0)
- computePluginsChangeStamp();
- return pluginsChangeStamp;
- }
-
- /*
- * @see ISiteEntry#isUpdateable()
- */
- public boolean isUpdateable() {
- return updateable;
- }
-
- public void setUpdateable(boolean updateable) {
- this.updateable = updateable;
- }
-
- /*
- * @see ISiteEntry#isNativelyLinked()
- */
- public boolean isNativelyLinked() {
- return isExternallyLinkedSite();
- }
-
- public URL getResolvedURL() {
- return resolvedURL;
- }
-
- /**
- * Detect new features (timestamp > current site timestamp)
- * and validates existing features (they might have been removed)
- */
- private void detectFeatures() {
-
- if (featureEntries != null)
- validateFeatureEntries();
- else
- featureEntries = new HashMap();
-
- if (!PlatformConfiguration.supportsDetection(resolvedURL))
- return;
-
- // locate feature entries on site
- File siteRoot = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- File featuresDir = new File(siteRoot, FEATURES);
- if (featuresDir.exists()) {
- // handle the installed features under the features directory
- File[] dirs = featuresDir.listFiles(new FileFilter() {
- public boolean accept(File f) {
- boolean valid = f.isDirectory() && (new File(f,FEATURE_XML).exists());
- if (!valid)
- Utils.log(Messages.getString("SiteEntry.cannotFindFeatureInDir", f.getAbsolutePath())); //$NON-NLS-1$
- return valid;
- }
- });
-
- for (int index = 0; index < dirs.length; index++) {
- try {
- File featureXML = new File(dirs[index], FEATURE_XML);
- if (featureXML.lastModified() <= featuresChangeStamp &&
- dirs[index].lastModified() <= featuresChangeStamp)
- continue;
- URL featureURL = featureXML.toURL();
- FeatureEntry featureEntry = featureParser.parse(featureURL);
- if (featureEntry != null)
- addFeatureEntry(featureEntry);
- } catch (MalformedURLException e) {
- Utils.log(Messages.getString("InstalledSiteParser.UnableToCreateURLForFile", featuresDir.getAbsolutePath()));//$NON-NLS-1$
- }
- }
- }
-
- Utils.debug(resolvedURL.toString() + " located " + featureEntries.size() + " feature(s)"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Detect new plugins (timestamp > current site timestamp)
- * and validates existing plugins (they might have been removed)
- */
- private void detectPlugins() {
- boolean compareTimeStamps = false;
- if (pluginEntries != null) {
- validatePluginEntries();
- compareTimeStamps = true; // only pick up newer plugins
- } else
- pluginEntries = new ArrayList();
-
- if (!PlatformConfiguration.supportsDetection(resolvedURL))
- return;
-
- // locate plugin entries on site
- File pluginsDir = new File(resolvedURL.getFile(), PLUGINS);
-
- if (pluginsDir.exists() && pluginsDir.isDirectory()) {
- File[] files = pluginsDir.listFiles();
- for (int i = 0; i < files.length; i++) {
- if(files[i].isDirectory()){
- detectUnpackedPlugin(files[i], compareTimeStamps);
- }else if(files[i].getName().endsWith(".jar")){ //$NON-NLS-1$
- detectPackedPlugin(files[i], compareTimeStamps);
- }else{
- // not bundle file
- }
- }
- }
-
- Utils.debug(resolvedURL.toString() + " located " + pluginEntries.size() + " plugin(s)"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * @param file a plugin jar
- * @param compareTimeStamps set to true when looking for plugins changed since last time they were detected
- */
- private void detectPackedPlugin(File file, boolean compareTimeStamps) {
- // plugin to run directly from jar
- if (compareTimeStamps && file.lastModified() <= pluginsChangeStamp) {
- return;
- }
- String entryName = META_MANIFEST_MF;
- ZipFile z = null;
- InputStream bundleManifestIn = null;
- InputStream pluginManifestIn = null;
- String pluginURL = PLUGINS + "/" + file.getName(); //$NON-NLS-1$
- try {
- // First, check if has valid bundle manifest
- z = new ZipFile(file);
- if (z.getEntry(entryName) != null) {
- bundleManifestIn = z.getInputStream(new ZipEntry(entryName));
- BundleManifest manifest = new BundleManifest(bundleManifestIn,
- pluginURL);
- if (manifest.exists()) {
- addPluginEntry(manifest.getPluginEntry());
- return;
- }
- }
- // no bundle manifest, check for plugin.xml or fragment.xml
- entryName = PLUGIN_XML;
- if (z.getEntry(entryName) == null) {
- entryName = FRAGMENT_XML;
- }
- if (z.getEntry(entryName) != null) {
- pluginManifestIn = z.getInputStream(new ZipEntry(entryName));
- PluginEntry entry1 = pluginParser.parse(pluginManifestIn,
- pluginURL);
- addPluginEntry(entry1);
- }
- } catch (IOException e5) {
- String pluginFileString2 = pluginURL + "!" + entryName; //$NON-NLS-1$
- Utils.log(Messages.getString("InstalledSiteParser.ErrorAccessing", //$NON-NLS-1$
- pluginFileString2)); //$NON-NLS-1$
- } catch (SAXException e3) {
- String pluginFileString1 = pluginURL + "!" + entryName; //$NON-NLS-1$
- Utils.log(Messages.getString(
- "InstalledSiteParser.ErrorParsingFile", pluginFileString1)); //$NON-NLS-1$
- } finally {
- if (bundleManifestIn != null) {
- try {
- bundleManifestIn.close();
- } catch (IOException e4) {
- }
- }
- if (pluginManifestIn != null) {
- try {
- pluginManifestIn.close();
- } catch (IOException e2) {
- }
- }
- if (z != null) {
- try {
- z.close();
- } catch (IOException e1) {
- }
- }
- }
- }
- /**
- * @param file a plugin directory
- * @param compareTimeStamps set to true when looking for plugins changed since last time they were detected
- */
- private void detectUnpackedPlugin(File file, boolean compareTimeStamps) {
- // unpacked plugin
- long dirTimestamp = file.lastModified();
- File pluginFile = new File(file, META_MANIFEST_MF);
- try {
- // First, check if has valid bundle manifest
- BundleManifest bundleManifest = new BundleManifest(pluginFile);
- if (bundleManifest.exists()) {
- if (compareTimeStamps
- && dirTimestamp <= pluginsChangeStamp
- && pluginFile.lastModified() <= pluginsChangeStamp)
- return;
- PluginEntry entry = bundleManifest.getPluginEntry();
- addPluginEntry(entry);
- } else {
- // no bundle manifest, check for plugin.xml or fragment.xml
- pluginFile = new File(file, PLUGIN_XML);
- if (!pluginFile.exists()) { //$NON-NLS-1$
- pluginFile = new File(file, FRAGMENT_XML); //$NON-NLS-1$
- }
- if (pluginFile.exists() && !pluginFile.isDirectory()) {
- // TODO in the future, assume that the timestamps are not
- // reliable,
- // or that the user manually modified an existing plugin,
- // so
- // the apparently modifed plugin may actually be configured
- // already.
- // We will need to double check for this. END to do.
- if (compareTimeStamps
- && dirTimestamp <= pluginsChangeStamp
- && pluginFile.lastModified() <= pluginsChangeStamp)
- return;
- PluginEntry entry = pluginParser.parse(pluginFile);
- addPluginEntry(entry);
- }
- }
- } catch (IOException e) {
- String pluginFileString = pluginFile.getAbsolutePath();
- if (ConfigurationActivator.DEBUG)
- Utils.log(Utils.newStatus(Messages.getString(
- "InstalledSiteParser.ErrorParsingFile", pluginFileString), e));//$NON-NLS-1$
- else
- Utils.log(Messages.getString("InstalledSiteParser.ErrorAccessing", //$NON-NLS-1$
- pluginFileString)); //$NON-NLS-1$
- } catch (SAXException e) {
- String pluginFileString = pluginFile.getAbsolutePath();
- Utils.log(Messages.getString(
- "InstalledSiteParser.ErrorParsingFile", pluginFileString)); //$NON-NLS-1$
- }
- }
-
- /**
- * @return list of feature url's (relative to site)
- */
- private synchronized String[] getDetectedFeatures() {
- if (featureEntries == null)
- detectFeatures();
- String[] features = new String[featureEntries.size()];
- Iterator iterator = featureEntries.values().iterator();
- for (int i=0; i<features.length; i++)
- features[i] = ((FeatureEntry)iterator.next()).getURL();
- return features;
- }
-
- /**
- * @return list of plugin url's (relative to site)
- */
- private synchronized String[] getDetectedPlugins() {
- if (pluginEntries == null)
- detectPlugins();
-
- String[] plugins = new String[pluginEntries.size()];
- for (int i=0; i<plugins.length; i++)
- plugins[i] = ((PluginEntry)pluginEntries.get(i)).getURL();
- return plugins;
- }
-
- private void computeChangeStamp() {
- changeStamp = Math.max(computeFeaturesChangeStamp(), computePluginsChangeStamp());
-// changeStampIsValid = true;
- }
-
- private synchronized long computeFeaturesChangeStamp() {
- if (featuresChangeStamp > 0)
- return featuresChangeStamp;
-
- long start = 0;
- if (ConfigurationActivator.DEBUG)
- start = (new Date()).getTime();
- String[] features = getFeatures();
-
- // compute stamp for the features directory
- long dirStamp = 0;
- if (PlatformConfiguration.supportsDetection(resolvedURL)) {
- File root = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- File featuresDir = new File(root, FEATURES);
- dirStamp = featuresDir.lastModified();
- }
- featuresChangeStamp = Math.max(dirStamp, computeStamp(features));
- if (ConfigurationActivator.DEBUG) {
- long end = (new Date()).getTime();
- Utils.debug(resolvedURL.toString() + " feature stamp: " + featuresChangeStamp + " in " + (end - start) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- }
- return featuresChangeStamp;
- }
-
- private synchronized long computePluginsChangeStamp() {
- if (pluginsChangeStamp > 0)
- return pluginsChangeStamp;
-
- if (!PlatformConfiguration.supportsDetection(resolvedURL)) {
- Utils.log(Messages.getString("SiteEntry.computePluginStamp", resolvedURL.toExternalForm())); //$NON-NLS-1$
- return 0;
- }
- long start = 0;
- if (ConfigurationActivator.DEBUG)
- start = (new Date()).getTime();
- // compute stamp for the plugins directory
- File root = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- File pluginsDir = new File(root, PLUGINS);
- if (!pluginsDir.exists() || !pluginsDir.isDirectory()) {
- Utils.log(Messages.getString("SiteEntry.pluginsDir", pluginsDir.getAbsolutePath())); //$NON-NLS-1$
- return 0;
- }
-
- // Compute the plugins list
- String[] plugins = null;
- ISitePolicy policy = getSitePolicy();
- if (policy.getType() == ISitePolicy.USER_INCLUDE)
- plugins = policy.getList();
- else if (policy.getType() == ISitePolicy.USER_EXCLUDE) {
- File[] files = pluginsDir.listFiles();
- ArrayList detectedPlugins = new ArrayList(files.length);
- for (int i = 0; i < files.length; i++) {
- if(files[i].isDirectory())
- detectedPlugins.add(PLUGINS + "/" + files[i].getName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
- else if(files[i].getName().endsWith(".jar")) //$NON-NLS-1$
- detectedPlugins.add(PLUGINS + "/" + files[i].getName()); //$NON-NLS-1$
- }
-
- String[] excludedPlugins = policy.getList();
- for (int i = 0; i < excludedPlugins.length; i++) {
- if (detectedPlugins.contains(excludedPlugins[i]))
- detectedPlugins.remove(excludedPlugins[i]);
- }
- plugins = (String[])detectedPlugins.toArray(new String[0]);
- }
-
-
- long dirStamp = pluginsDir.lastModified();
- pluginsChangeStamp = Math.max(dirStamp, computeStamp(plugins));
- if (ConfigurationActivator.DEBUG) {
- long end = (new Date()).getTime();
- Utils.debug(resolvedURL.toString() + " plugin stamp: " + pluginsChangeStamp + " in " + (end - start) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- }
- return pluginsChangeStamp;
- }
-
- private long computeStamp(String[] targets) {
-
- long result = 0;
- if (!PlatformConfiguration.supportsDetection(resolvedURL)) {
- // NOTE: this path should not be executed until we support running
- // from an arbitrary URL (in particular from http server). For
- // now just compute stamp across the list of names. Eventually
- // when general URLs are supported we need to do better (factor
- // in at least the existence of the target). However, given this
- // code executes early on the startup sequence we need to be
- // extremely mindful of performance issues.
- // In fact, we should get the last modified from the connection
- for (int i = 0; i < targets.length; i++)
- result ^= targets[i].hashCode();
- Utils.debug("*WARNING* computing stamp using URL hashcodes only"); //$NON-NLS-1$
- } else {
- // compute stamp across local targets
- File rootFile = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- if (rootFile.exists()) {
- File f = null;
- for (int i = 0; i < targets.length; i++) {
- f = new File(rootFile, targets[i]);
- if (f.exists())
- result = Math.max(result, f.lastModified());
- }
- }
- }
-
- return result;
- }
-
- public void setLinkFileName(String linkFileName) {
- this.linkFileName = linkFileName;
- }
-
- public String getLinkFileName() {
- return linkFileName;
- }
-
- public boolean isExternallyLinkedSite() {
- return (linkFileName != null && !linkFileName.trim().equals("")); //$NON-NLS-1$
- }
-
- public synchronized void refresh() {
- // reset computed values. Will be updated on next access.
- featuresChangeStamp = 0;
- pluginsChangeStamp = 0;
- changeStamp = 0;
- featureEntries = null;
- pluginEntries = null;
- }
-
- public void refreshPlugins() {
- // reset computed values. Will be updated on next access.
- pluginsChangeStamp = 0;
- changeStamp = 0;
- pluginEntries = null;
- }
-
- public void addFeatureEntry(IFeatureEntry feature) {
- if (featureEntries == null)
- featureEntries = new HashMap();
- // Make sure we keep the larger version of same feature
- IFeatureEntry existing = (FeatureEntry)featureEntries.get(feature.getFeatureIdentifier());
- if (existing != null) {
- VersionedIdentifier existingVersion = new VersionedIdentifier(existing.getFeatureIdentifier(), existing.getFeatureVersion());
- VersionedIdentifier newVersion = new VersionedIdentifier(feature.getFeatureIdentifier(), feature.getFeatureVersion());
- if (existingVersion.compareVersion(newVersion) == VersionedIdentifier.LESS_THAN) {
- featureEntries.put(feature.getFeatureIdentifier(), feature);
- pluginsChangeStamp = 0;
- } else if (existingVersion.equals(newVersion)) {
- // log error if same feature version/id but a different url
- if (feature instanceof FeatureEntry && existing instanceof FeatureEntry &&
- !((FeatureEntry)feature).getURL().equals(((FeatureEntry)existing).getURL()))
- Utils.log(Messages.getString("SiteEntry.duplicateFeature",getURL().toExternalForm(), existing.getFeatureIdentifier())); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } else {
- featureEntries.put(feature.getFeatureIdentifier(), feature);
- pluginsChangeStamp = 0;
- }
- if (feature instanceof FeatureEntry)
- ((FeatureEntry)feature).setSite(this);
- }
-
- public FeatureEntry[] getFeatureEntries() {
- if (featureEntries == null)
- detectFeatures();
-
- if (featureEntries == null)
- return new FeatureEntry[0];
- else
- return (FeatureEntry[])featureEntries.values().toArray(new FeatureEntry[featureEntries.size()]);
- }
-
- public void addPluginEntry(PluginEntry plugin) {
- if (pluginEntries == null)
- pluginEntries = new ArrayList();
- // Note: we could use the latest version of the same plugin, like we do for features, but we let the runtime figure it out
- pluginEntries.add(plugin);
- }
-
- public PluginEntry[] getAllPluginEntries() {
- if (pluginEntries == null)
- detectPlugins();
- return (PluginEntry[])pluginEntries.toArray(new PluginEntry[pluginEntries.size()]);
- }
-
- public void loadFromDisk(long lastChange) throws CoreException{
- featuresChangeStamp = lastChange;
- pluginsChangeStamp = lastChange;
- detectFeatures();
- detectPlugins();
- }
-
- /**
- * Saves state as xml content in a given parent element
- * @param doc
- */
- public Element toXML(Document doc) {
-
- Element siteElement = doc.createElement(CFG_SITE);
-
- if (getURL().toString() != null)
- siteElement.setAttribute(CFG_URL, getURL().toString());
-
- siteElement.setAttribute(CFG_ENABLED, isEnabled() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
- siteElement.setAttribute(CFG_UPDATEABLE, isUpdateable() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
- if (isExternallyLinkedSite())
- siteElement.setAttribute(CFG_LINK_FILE, getLinkFileName().trim().replace(File.separatorChar, '/'));
-
- int type = getSitePolicy().getType();
- String typeString = CFG_POLICY_TYPE_UNKNOWN;
- try {
- typeString = CFG_POLICY_TYPE[type];
- } catch (IndexOutOfBoundsException e) {
- // ignore bad attribute ...
- }
- siteElement.setAttribute(CFG_POLICY, typeString);
- String[] list = getSitePolicy().getList();
- if (list.length > 0) {
- StringBuffer sb = new StringBuffer(256);
- for (int i=0; i<list.length-1; i++) {
- sb.append(list[i]);
- sb.append(',');
- }
- sb.append(list[list.length-1]);
- siteElement.setAttribute(CFG_LIST, sb.toString());
- }
-// // note: we don't save features inside the site element.
-
- // collect feature entries
-// configElement.setAttribute(CFG_FEATURE_ENTRY_DEFAULT, defaultFeature);
- FeatureEntry[] feats = getFeatureEntries();
- for (int i = 0; i < feats.length; i++) {
- Element featureElement = feats[i].toXML(doc);
- siteElement.appendChild(featureElement);
- }
-
- return siteElement;
- }
-
- private void validateFeatureEntries() {
- File root = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- Iterator iterator = featureEntries.values().iterator();
- Collection deletedFeatures = new ArrayList();
- while(iterator.hasNext()) {
- FeatureEntry feature = (FeatureEntry)iterator.next();
- // Note: in the future, we can check for absolute url as well.
- // For now, feature url is features/org.eclipse.foo/feature.xml
- File featureXML = new File(root, feature.getURL());
- if (!featureXML.exists())
- deletedFeatures.add(feature.getFeatureIdentifier());
- }
- for(Iterator it=deletedFeatures.iterator(); it.hasNext();){
- featureEntries.remove(it.next());
- }
- }
-
- private void validatePluginEntries() {
- File root = new File(resolvedURL.getFile().replace('/', File.separatorChar));
- Collection deletedPlugins = new ArrayList();
- for (int i=0; i<pluginEntries.size(); i++) {
- PluginEntry plugin = (PluginEntry)pluginEntries.get(i);
- // Note: in the future, we can check for absolute url as well.
- // For now, feature url is plugins/org.eclipse.foo/plugin.xml
- File pluginLocation = new File(root, plugin.getURL());
- if (!pluginLocation.exists())
- deletedPlugins.add(plugin);
- }
- for(Iterator it=deletedPlugins.iterator(); it.hasNext();){
- pluginEntries.remove(it.next());
- }
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enable) {
- this.enabled = enable;
- }
-
- public FeatureEntry getFeatureEntry(String id) {
- FeatureEntry[] features = getFeatureEntries();
- for (int i=0; i<features.length; i++)
- if (features[i].getFeatureIdentifier().equals(id))
- return features[i];
- return null;
- }
-
-
- public boolean unconfigureFeatureEntry(IFeatureEntry feature) {
- FeatureEntry existingFeature = getFeatureEntry(feature.getFeatureIdentifier());
- if (existingFeature != null)
- featureEntries.remove(existingFeature.getFeatureIdentifier());
- return existingFeature != null;
- }
-
- /*
- * This is a bit of a hack.
- * When no features were added to the site, but the site is initialized from platform.xml
- * we need to set the feature set to empty, so we don't try to detect them.
- */
- void initialized() {
- if (featureEntries == null)
- featureEntries = new HashMap();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SitePolicy.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SitePolicy.java
deleted file mode 100644
index b192fc4..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SitePolicy.java
+++ /dev/null
@@ -1,59 +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.configurator;
-
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.configurator.IPlatformConfiguration.*;
-
-
-public class SitePolicy implements IPlatformConfiguration.ISitePolicy {
-
- private int type;
- private String[] list;
-
- public SitePolicy() {
- }
- public SitePolicy(int type, String[] list) {
- if (type != ISitePolicy.USER_INCLUDE && type != ISitePolicy.USER_EXCLUDE)
- throw new IllegalArgumentException();
- this.type = type;
-
- if (list == null)
- this.list = new String[0];
- else
- this.list = list;
- }
-
- /*
- * @see ISitePolicy#getType()
- */
- public int getType() {
- return type;
- }
-
- /*
- * @see ISitePolicy#getList()
- */
- public String[] getList() {
- return list;
- }
-
- /*
- * @see ISitePolicy#setList(String[])
- */
- public synchronized void setList(String[] list) {
- if (list == null)
- this.list = new String[0];
- else
- this.list = list;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java
deleted file mode 100644
index abe5142..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java
+++ /dev/null
@@ -1,259 +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.configurator;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.framework.log.*;
-
-public class Utils {
- private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
- private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$
- static FrameworkLog log;
-
- public static void debug(String s) {
- if (ConfigurationActivator.DEBUG)
- System.out.println("PlatformConfig: " + s); //$NON-NLS-1$
- }
-
- /**
- * 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 e actual exception being reported
- * @return a CoreException
- * @since 2.0
- */
- public static CoreException newCoreException(String s, Throwable e) {
-
- // check the case of a multistatus
- IStatus status;
- if (e instanceof CoreException) {
- if (s == null)
- s = ""; //$NON-NLS-1$
- status = new MultiStatus("org.eclipse.update.configurator", 0, s, e); //$NON-NLS-1$
- 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 = newStatus(completeString.toString(), e);
- }
- return new CoreException(status); //$NON-NLS-1$
- }
-
- public static IStatus newStatus(String message, Throwable e) {
- return new Status(IStatus.ERROR, "org.eclipse.update.configurator", IStatus.OK, message, e); //$NON-NLS-1$
- }
-
- public static void log(String message) {
- log(newStatus(message, null));
- }
-
- public static void log(IStatus status) {
- if (log != null) {
- log.log(new FrameworkLogEntry(ConfigurationActivator.PI_CONFIGURATOR, status.getMessage(), 0, status.getException(), null));
- } else {
- System.out.println(status.getMessage());
- if (status.getException() != null)
- status.getException().printStackTrace();
- }
- }
-
- /**
- * Returns the url as a platform:/ url, if possible, else leaves it unchanged
- * @param url
- * @return
- */
- public static URL asPlatformURL(URL url) {
- try {
- URL platformURL = new URL("platform:/base/"); //$NON-NLS-1$ // try using platform-relative URL
- URL resolvedPlatformURL = Platform.asLocalURL(platformURL);
- // TODO workaround bug in platform url resolution
- if (resolvedPlatformURL.getProtocol().equals("file")) //$NON-NLS-1$
- resolvedPlatformURL = new File(resolvedPlatformURL.getFile()).toURL();
- String platformURLAsString = resolvedPlatformURL.toExternalForm();
- String urlAsString = url.toExternalForm();
- if (urlAsString.startsWith(platformURLAsString))
- return new URL(platformURL.toExternalForm() + urlAsString.substring(platformURLAsString.length()) );
- else
- return url;
- } catch (Exception e) {
- return url;
- }
- }
-
-
- /**
- *
- */
- public static boolean isValidEnvironment(String os, String ws, String arch, String nl) {
- if (os!=null && !isMatching(os, Platform.getOS())) return false;
- if (ws!=null && !isMatching(ws, Platform.getWS())) return false;
- if (arch!=null && !isMatching(arch, Platform.getOSArch())) return false;
- if (nl!=null && !isMatchingLocale(nl, Platform.getNL())) return false;
- return true;
- }
-
- /**
- *
- */
- private static boolean isMatching(String candidateValues, String siteValues) {
- if (siteValues==null) return false;
- if ("*".equalsIgnoreCase(candidateValues)) return true; //$NON-NLS-1$
- siteValues = siteValues.toUpperCase();
- StringTokenizer stok = new StringTokenizer(candidateValues, ","); //$NON-NLS-1$
- 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; //$NON-NLS-1$
-
- locale = locale.toUpperCase();
- candidateValues = candidateValues.toUpperCase();
- StringTokenizer stok = new StringTokenizer(candidateValues, ","); //$NON-NLS-1$
- while (stok.hasMoreTokens()) {
- String candidate = stok.nextToken();
- if (locale.indexOf(candidate) == 0)
- return true;
- if (candidate.indexOf(locale) == 0)
- return true;
- }
- return false;
- }
-
- public static Locale getDefaultLocale() {
- String nl = Platform.getNL();
- // sanity test
- if (nl == null)
- return Locale.getDefault();
-
- // break the string into tokens to get the Locale object
- StringTokenizer locales = new StringTokenizer(nl,"_"); //$NON-NLS-1$
- if (locales.countTokens() == 1)
- return new Locale(locales.nextToken(), ""); //$NON-NLS-1$
- else if (locales.countTokens() == 2)
- return new Locale(locales.nextToken(), locales.nextToken());
- else if (locales.countTokens() == 3)
- return new Locale(locales.nextToken(), locales.nextToken(), locales.nextToken());
- else
- return Locale.getDefault();
- }
-
-
- /**
- * 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 resourceBundle resource bundle.
- * @param string translatable string from model
- * @return string, or <code>null</code>
- * @since 2.0
- */
- public static String getResourceString(ResourceBundle resourceBundle, 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);
-
- if (resourceBundle == null)
- return dflt;
-
- try {
- return resourceBundle.getString(key.substring(1));
- } catch (MissingResourceException e) {
- return dflt;
- }
- }
-
- public static boolean isAutomaticallyStartedBundle(String bundleURL) {
- if (bundleURL.indexOf("org.eclipse.osgi") != -1) //$NON-NLS-1$
- return true;
-
- String osgiBundles = System.getProperty("osgi.bundles"); //$NON-NLS-1$
- StringTokenizer st = new StringTokenizer(osgiBundles, ","); //$NON-NLS-1$
- while (st.hasMoreTokens()) {
- String token = st.nextToken().trim();
- int index = token.indexOf('@');
- if (index != -1)
- token = token.substring(0,index);
- if (token.startsWith("reference:file:")) { //$NON-NLS-1$
- File f = new File(token.substring(15));
- if (bundleURL.indexOf(f.getName()) != -1)
- return true;
- }
- if (bundleURL.indexOf(token) != -1)
- return true;
- }
- return false;
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
deleted file mode 100644
index 694ce26..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
+++ /dev/null
@@ -1,153 +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.configurator;
-
-import java.util.*;
-
-
-public class VersionedIdentifier {
- private String identifier = ""; //$NON-NLS-1$
- private int major = 0;
- private int minor = 0;
- private int service = 0;
- private String qualifier = ""; //$NON-NLS-1$
- private String version;
-
- private static final String VER_SEPARATOR = "."; //$NON-NLS-1$
- private static final String ID_SEPARATOR = "_"; //$NON-NLS-1$
-
- public static final int LESS_THAN = -1;
- public static final int EQUAL = 0;
- public static final int EQUIVALENT = 1;
- public static final int COMPATIBLE = 2;
- public static final int GREATER_THAN = 3;
-
- public VersionedIdentifier(String s) {
- if (s == null || (s = s.trim()).equals("")) //$NON-NLS-1$
- return;
-
- int loc = s.lastIndexOf(ID_SEPARATOR);
- if (loc != -1) {
- this.identifier = s.substring(0, loc);
- version = s.substring(loc + 1);
- parseVersion(version);
- } else
- this.identifier = s;
- }
-
- public VersionedIdentifier(String id, String version) {
- this(id+ID_SEPARATOR+version);
- this.version = version;
- }
-
- public String getVersion() {
- return version;
- }
-
- public String getIdentifier() {
- return identifier;
- }
-
- public boolean equalIdentifiers(VersionedIdentifier id) {
- if (id == null)
- return identifier == null;
- else
- return id.identifier.equals(identifier);
- }
-
- public int compareVersion(VersionedIdentifier id) {
-
- if (id == null) {
- if (major == 0 && minor == 0 && service == 0)
- return -1;
- else
- return 1;
- }
-
- if (major > id.major)
- return GREATER_THAN;
- if (major < id.major)
- return LESS_THAN;
- if (minor > id.minor)
- return COMPATIBLE;
- if (minor < id.minor)
- return LESS_THAN;
- if (service > id.service)
- return EQUIVALENT;
- if (service < id.service)
- return LESS_THAN;
- return compareQualifiers(qualifier, id.qualifier);
- }
-
- private int compareQualifiers(String q1, String q2) {
- int result = q1.compareTo(q2);
- if (result < 0)
- return LESS_THAN;
- else if (result > 0)
- return EQUIVALENT;
- else
- return EQUAL;
- }
-
- private void parseVersion(String v) {
- if (v == null || (v = v.trim()).equals("")) //$NON-NLS-1$
- return;
-
- try {
- StringTokenizer st = new StringTokenizer(v, VER_SEPARATOR);
- ArrayList elements = new ArrayList(4);
-
- while (st.hasMoreTokens()) {
- elements.add(st.nextToken());
- }
-
- if (elements.size() >= 1)
- this.major = (new Integer((String) elements.get(0))).intValue();
- if (elements.size() >= 2)
- this.minor = (new Integer((String) elements.get(1))).intValue();
- if (elements.size() >= 3)
- this.service = (new Integer((String) elements.get(2))).intValue();
- if (elements.size() >= 4)
- this.qualifier = removeWhiteSpace((String) elements.get(3));
-
- } catch (Exception e) {
- // use what we got so far ...
- }
- }
-
- private String removeWhiteSpace(String s) {
- char[] chars = s.trim().toCharArray();
- boolean whitespace = false;
- for (int i = 0; i < chars.length; i++) {
- if (Character.isWhitespace(chars[i])) {
- chars[i] = '_';
- whitespace = true;
- }
- }
- return whitespace ? new String(chars) : s;
- }
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!(obj instanceof VersionedIdentifier))
- return false;
-
- VersionedIdentifier other = (VersionedIdentifier)obj;
- return equalIdentifiers(other) &&
- this.major == other.major &&
- this.minor == other.minor &&
- this.service == other.service &&
- compareQualifiers(this.qualifier, other.qualifier) == EQUAL;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/AboutInfo.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/AboutInfo.java
deleted file mode 100644
index a3a7a31..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/AboutInfo.java
+++ /dev/null
@@ -1,253 +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.configurator.branding;
-
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-
-
-/**
- * The information within this object is obtained from the about INI file.
- * This file resides within an install configurations directory and must be a
- * standard java property file.
- * <p>
- * This class is not intended to be instantiated or subclassed by clients.
- * </p>
- */
-public final class AboutInfo {
- private final static String INI_FILENAME = "about.ini"; //$NON-NLS-1$
- private final static String PROPERTIES_FILENAME = "about.properties"; //$NON-NLS-1$
- private final static String MAPPINGS_FILENAME = "about.mappings"; //$NON-NLS-1$
-
- private String featureId;
- private String versionId = ""; //$NON-NLS-1$
- private String featurePluginLabel;
- private String providerName;
- private String appName;
- private URL windowImageURL;
- private URL[] windowImagesURLs;
- private URL aboutImageURL;
- private URL featureImageURL;
- private URL welcomePageURL;
- private String aboutText;
- private String welcomePerspective;
- private String tipsAndTricksHref;
-
-
- /*
- * Create a new about info for a feature with the given id.
- */
- /* package */ AboutInfo(String featureId) {
- super();
- this.featureId = featureId;
- }
-
- /**
- * Returns the configuration information for the feature with the
- * given id.
- *
- * @param featureId the feature id
- * @param versionId the version id (of the feature)
- * @param pluginId the plug-in id
- * @return the configuration information for the feature
- */
- public static AboutInfo readFeatureInfo(String featureId, String versionId, String pluginId) {
-// Assert.isNotNull(featureId);
-// Assert.isNotNull(versionId);
-// Assert.isNotNull(pluginId);
- IniFileReader reader = new IniFileReader(featureId, pluginId, INI_FILENAME, PROPERTIES_FILENAME, MAPPINGS_FILENAME);
- IStatus status = reader.load();
- if (!status.isOK()) {
- //return null;
- return new AboutInfo(featureId); // dummy about info
- }
-
- AboutInfo info = new AboutInfo(featureId);
- Hashtable runtimeMappings = new Hashtable();
- runtimeMappings.put("{featureVersion}", versionId); //$NON-NLS-1$
- info.versionId = versionId;
- info.featurePluginLabel = reader.getFeaturePluginLabel();
- info.providerName = reader.getProviderName();
- info.appName = reader.getString("appName", true, runtimeMappings); //$NON-NLS-1$
- info.aboutText = reader.getString("aboutText", true, runtimeMappings); //$NON-NLS-1$
- info.windowImageURL = reader.getURL("windowImage"); //$NON-NLS-1$
- // look for the newer array, but if its not there then use the older,
- // single image definition
- info.windowImagesURLs = reader.getURLs("windowImages"); //$NON-NLS-1$
- info.aboutImageURL = reader.getURL("aboutImage"); //$NON-NLS-1$
- info.featureImageURL = reader.getURL("featureImage"); //$NON-NLS-1$
- info.welcomePageURL = reader.getURL("welcomePage"); //$NON-NLS-1$
- info.welcomePerspective = reader.getString("welcomePerspective", false, runtimeMappings); //$NON-NLS-1$
- info.tipsAndTricksHref = reader.getString("tipsAndTricksHref", false, runtimeMappings); //$NON-NLS-1$
- return info;
- }
-
- /**
- * Returns the URL for an image which can be shown in an "about" dialog
- * for this product. Products designed to run "headless" typically would not
- * have such an image.
- *
- * @return the URL for an about image, or <code>null</code> if none
- */
- public URL getAboutImageURL() {
- return aboutImageURL;
- }
-
- /**
- * Returns the URL for an image which can be shown in an "about features"
- * dialog. Products designed to run "headless" typically would not have such an image.
- *
- * @return the URL for a feature image, or <code>null</code> if none
- */
- public URL getFeatureImageURL() {
- return featureImageURL;
- }
-
- /**
- * Returns the simple name of the feature image file.
- *
- * @return the simple name of the feature image file,
- * or <code>null</code> if none
- */
- public String getFeatureImageName() {
- if (featureImageURL != null) {
- IPath path = new Path(featureImageURL.getPath());
- return path.lastSegment();
- } else {
- return null;
- }
- }
-
-
- /**
- * Returns a label for the feature plugn, or <code>null</code>.
- */
- public String getFeatureLabel() {
- return featurePluginLabel;
- }
-
- /**
- * Returns the id for this feature.
- *
- * @return the feature id
- */
- public String getFeatureId() {
- return featureId;
- }
-
- /**
- * Returns the text to show in an "about" dialog for this product.
- * Products designed to run "headless" typically would not have such text.
- *
- * @return the about text, or <code>null</code> if none
- */
- public String getAboutText() {
- return aboutText;
- }
-
- /**
- * Returns the application name or <code>null</code>.
- * Note this is never shown to the user.
- * It is used to initialize the SWT Display.
- * <p>
- * On Motif, for example, this can be used
- * to set the name used for resource lookup.
- * </p>
- *
- * @return the application name, or <code>null</code>
- */
- public String getAppName() {
- return appName;
- }
-
- /**
- * Returns the product name or <code>null</code>.
- * This is shown in the window title and the About action.
- *
- * @return the product name, or <code>null</code>
- */
- public String getProductName() {
- return featurePluginLabel;
- }
-
- /**
- * Returns the provider name or <code>null</code>.
- *
- * @return the provider name, or <code>null</code>
- */
- public String getProviderName() {
- return providerName;
- }
-
- /**
- * Returns the feature version id.
- *
- * @return the version id of the feature
- */
- public String getVersionId() {
- return versionId;
- }
-
- /**
- * Returns a <code>URL</code> for the welcome page.
- * Products designed to run "headless" typically would not have such an page.
- *
- * @return the welcome page, or <code>null</code> if none
- */
- public URL getWelcomePageURL() {
- return welcomePageURL;
- }
-
- /**
- * Returns the ID of a perspective in which to show the welcome page.
- * May be <code>null</code>.
- *
- * @return the welcome page perspective id, or <code>null</code> if none
- */
- public String getWelcomePerspectiveId() {
- return welcomePerspective;
- }
-
- /**
- * Returns a <code>String</code> for the tips and trick href.
- *
- * @return the tips and tricks href, or <code>null</code> if none
- */
- public String getTipsAndTricksHref() {
- return tipsAndTricksHref;
- }
-
- /**
- * Returns the image url for the window image to use for this product.
- * Products designed to run "headless" typically would not have such an image.
- *
- * @return the image url for the window image, or <code>null</code> if none
- */
- public URL getWindowImageURL() {
- return windowImageURL;
- }
-
- /**
- * Return an array of image URLs for the window images to use for
- * this product. The expectations is that the elements will be the same
- * image rendered at different sizes. Products designed to run "headless"
- * typically would not have such images.
- *
- * @return an array of the image descriptors for the window images, or
- * <code>null</code> if none
- * @since 3.0
- */
- public URL[] getWindowImagesURLs() {
- return windowImagesURLs;
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IBundleGroupConstants.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IBundleGroupConstants.java
deleted file mode 100644
index 45179c0..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IBundleGroupConstants.java
+++ /dev/null
@@ -1,49 +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.configurator.branding;
-
-/**
- * These constants define the set of properties that the UI expects to
- * be available via <code>IBundleGroup.getProperty(String)</code>.
- *
- * @since 3.0
- * @see org.eclipse.core.runtime.IBundleGroup#getProperty(String)
- */
-public interface IBundleGroupConstants {
- /**
- * An image which can be shown in an "about features" dialog (32x32).
- */
- public static final String FEATURE_IMAGE = "featureImage"; //$NON-NLS-1$
-
- /**
- * A help reference for the feature's tips and tricks page (optional).
- */
- public static final String TIPS_AND_TRICKS_HREF = "tipsAndTricksHref"; //$NON-NLS-1$
-
- /**
- * A URL for the feature's welcome page (special XML-based format)
- * ($nl$/ prefix to permit locale-specific translations of entire file).
- * Products designed to run "headless" typically would not have such a page.
- */
- public static final String WELCOME_PAGE = "welcomePage"; //$NON-NLS-1$
-
- /**
- * The id of a perspective in which to show the welcome page
- * (optional).
- */
- public static final String WELCOME_PERSPECTIVE = "welcomePerspective"; //$NON-NLS-1$
-
- /**
- * The URL of the license page for the feature
- * (optional).
- */
- public static final String LICENSE_HREF = "licenseHref"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IProductConstants.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IProductConstants.java
deleted file mode 100644
index 740609a..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IProductConstants.java
+++ /dev/null
@@ -1,71 +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.configurator.branding;
-
-/**
- * These constants define the set of properties that the UI expects to
- * be available via <code>IProduct.getProperty(String)</code>.
- *
- * @since 3.0
- * @see org.eclipse.core.runtime.IProduct#getProperty(String)
- */
-public interface IProductConstants {
- /**
- * The application name, used to initialize the SWT Display. This
- * value is distinct from the string displayed in the application
- * title bar.
- * <p>
- * E.g., On motif, this can be used to set the name used for
- * resource lookup.
- * </p>
- */
- public static final String APP_NAME = "appName"; //$NON-NLS-1$
-
- /**
- * The text to show in an "about" dialog for this product.
- * Products designed to run "headless" typically would not
- * have such text.
- */
- public static final String ABOUT_TEXT = "aboutText"; //$NON-NLS-1$
-
- /**
- * An image which can be shown in an "about" dialog for this
- * product. Products designed to run "headless" typically would not
- * have such an image.
- * <p>
- * A full-sized product image (no larger than 500x330 pixels) is
- * shown without the "aboutText" blurb. A half-sized product image
- * (no larger than 250x330 pixels) is shown with the "aboutText"
- * blurb beside it.
- */
- public static final String ABOUT_IMAGE = "aboutImage"; //$NON-NLS-1$
-
- /**
- * An image to be used as the window icon for this product (16x16).
- * Products designed to run "headless" typically would not have such an image.
- * <p>
- * If the <code>WINDOW_IMAGES</code> property is given, then it supercedes
- * this one.
- * </p>
- */
- public static final String WINDOW_IMAGE = "windowImage"; //$NON-NLS-1$
-
- /**
- * An array of one or more images to be used for this product. The
- * expectation is that the array will contain the same image rendered
- * at different sizes (16x16 and 32x32).
- * Products designed to run "headless" typically would not have such images.
- * <p>
- * If this property is given, then it supercedes <code>WINDOW_IMAGE</code>.
- * </p>
- */
- public static final String WINDOW_IMAGES = "windowImages"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IniFileReader.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IniFileReader.java
deleted file mode 100644
index 7f2f1e0..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/branding/IniFileReader.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this 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.configurator.branding;
-
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.internal.configurator.*;
-import org.osgi.framework.*;
-
-/**
- * Reads the information found in an "INI" file. This file must be in a
- * standard Java properties format. A properties file may also be provided
- * to NL values in the INI file - values must start with the % prefix. A
- * mapping file may also be provided that contains "fill-ins" for the
- * properties file - format being "n = some text", where n is a number.
- */
-public class IniFileReader {
- private static final String PID = "org.eclipse.update.configurator"; //$NON-NLS-1$
- private static final Status OK_STATUS = new Status(IStatus.OK, PID, 0, "", null); //$NON-NLS-1$
- private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
- private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$
- private static final String NLS_TAG = "$nl$"; //$NON-NLS-1$
-
- private String featureId;
- private String pluginId;
- private String iniFilename;
- private String propertiesFilename;
- private String mappingsFilename;
- private Properties ini = null;
- private PropertyResourceBundle properties = null;
- private String[] mappings = null;
- private Bundle bundle;
-
- /**
- * Creates an INI file reader that can parse the contents into key,value pairs.
- *
- * @param featureId the unique identifier of the feature, must not be <code>null</code>
- * @param pluginId the unique identifier of the feature plug-in, must not be <code>null</code>
- * @param iniFilename the INI file name, must not be <code>null</code>
- * @param propertiesFilename the properties filename, can be <code>null</code> if not required
- * @param mappingsFilename the mappings filename, can be <code>null</code> if not required
- */
- public IniFileReader(String featureId, String pluginId, String iniFilename, String propertiesFilename, String mappingsFilename) {
- super();
-
- if (featureId == null || pluginId == null || iniFilename == null) {
- throw new IllegalArgumentException();
- }
-
- this.featureId = featureId;
- this.pluginId = pluginId;
- this.iniFilename = iniFilename;
- this.propertiesFilename = propertiesFilename;
- this.mappingsFilename = mappingsFilename;
- }
-
- /**
- * Read the contents of the INI, properties, and mappings files.
- * Does nothing if the content has already been read and parsed.
- *
- * @return an <code>IStatus</code> indicating the success or failure
- * of reading and parsing the INI file content
- */
- public IStatus load() {
- if (ini != null)
- return OK_STATUS;
-
- // attempt to locate the corresponding plugin
- bundle = Platform.getBundle(pluginId);
- if (bundle == null || bundle.getState() == Bundle.UNINSTALLED || bundle.getState() == Bundle.INSTALLED) {
- bundle = null; // make it null for other test down the road
- String message = Messages.getString("IniFileReader.MissingDesc", featureId); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, null);
- }
-
- // Determine the ini file location
- URL iniURL = null;
- IOException ioe = null;
- try {
- iniURL = Platform.find(bundle, new Path(NLS_TAG).append(iniFilename));
- if (iniURL != null)
- iniURL = Platform.resolve(iniURL);
- } catch (IOException e) {
- ioe = e;
- }
- if (iniURL == null) {
- String message = Messages.getString("IniFileReader.OpenINIError", iniFilename); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, ioe);
- }
-
- // Determine the properties file location
- URL propertiesURL = null;
- if (propertiesFilename != null & propertiesFilename.length() > 0) {
- try {
- propertiesURL = Platform.find(bundle, new Path(NLS_TAG).append(propertiesFilename));
- if (propertiesURL != null)
- propertiesURL = Platform.resolve(propertiesURL);
- } catch (IOException e) {
- String message = Messages.getString("IniFileReader.OpenPropError", propertiesFilename); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, e);
- }
- }
-
- // Determine the mappings file location
- URL mappingsURL = null;
- if (mappingsFilename != null && mappingsFilename.length() > 0) {
- try {
- mappingsURL = Platform.find(bundle, new Path(NLS_TAG).append(mappingsFilename));
- if (mappingsURL != null)
- mappingsURL = Platform.resolve(mappingsURL);
- } catch (IOException e) {
- String message = Messages.getString("IniFileReader.OpenMapError", mappingsFilename); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, e);
- }
- }
-
- // OK to pass null properties and/or mapping file
- return load(iniURL, propertiesURL, mappingsURL);
- }
-
- /**
- * Returns the string value for the given key, or <code>null</code>.
- * The string value is NLS if requested.
- *
- * @return the string value for the given key, or <code>null</code>
- */
- public String getString(String key, boolean doNls, Hashtable runtimeMappings) {
- if (ini == null)
- return null;
- String value = ini.getProperty(key);
- if (value != null && doNls)
- return getResourceString(value, runtimeMappings);
- return value;
- }
-
-
- /**
- * Returns a URL for the given key, or <code>null</code>.
- *
- * @return a URL for the given key, or <code>null</code>
- */
- public URL getURL(String key) {
- if (ini == null)
- return null;
-
- URL url = null;
- String fileName = ini.getProperty(key);
- if (fileName != null) {
- if (bundle == null)
- return null;
- url = Platform.find(bundle, new Path(fileName));
- }
- return url;
- }
-
- /**
- * Returns a array of URL for the given key, or <code>null</code>. The
- * property value should be a comma separated list of urls, tokens for
- * which bundle cannot build an url will have a null entry.
- *
- * @param key name of the property containing the requested urls
- * @return a URL for the given key, or <code>null</code>
- * @since 3.0
- */
- public URL[] getURLs(String key) {
- if (ini == null || bundle == null)
- return null;
-
- String value = ini.getProperty(key);
- if (value == null)
- return null;
-
- StringTokenizer tokens = new StringTokenizer(value, ","); //$NON-NLS-1$
- ArrayList array = new ArrayList(10);
- while (tokens.hasMoreTokens()) {
- String str = tokens.nextToken().trim();
- array.add(Platform.find(bundle, new Path(str)));
- }
-
- URL[] urls = new URL[array.size()];
- array.toArray(urls);
- return urls;
- }
-
- /**
- * Returns the feature plugin label, or <code>null</code>.
- *
- * @return the feature plugin lable, or <code>null</code> if none.
- */
- public String getFeaturePluginLabel() {
- if (bundle == null)
- return null;
- else {
- return (String)bundle.getHeaders().get(Constants.BUNDLE_NAME);
- }
- }
-
- /**
- * Returns the provider name for this feature, or <code>null</code>.
- *
- * @return the provider name for this feature, or <code>null</code>
- */
- public String getProviderName() {
- if (bundle == null)
- return null;
- else {
- return (String)bundle.getHeaders().get(Constants.BUNDLE_VENDOR);
- }
- }
-
- /*
- * 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>
- * <li>getResourceString("Hello World") returns "Hello World"</li>
- * <li>getResourceString("%name") returns "Project Name"</li>
- * <li>getResourceString("%name Hello World") returns "Project Name"</li>
- * <li>getResourceString("%abcd Hello World") returns "Hello World"</li>
- * <li>getResourceString("%abcd") returns "%abcd"</li>
- * <li>getResourceString("%%name") returns "%name"</li>
- * <li>getResourceString(<code>null</code>) returns <code>null</code></li>
- * </pre>
- * </p>
- *
- * @param value the value or <code>null</code>
- * @param runtimeMappings runtime mappings or <code>null</code>
- * @return the resource string
- */
- public String getResourceString(String value, Hashtable runtimeMappings) {
-
- if (value == null)
- return null;
- String s = value.trim();
-
- if (!s.startsWith(KEY_PREFIX))
- return s;
-
- 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);
-
- if (properties == null)
- return dflt;
-
- String result = null;
- try {
- result = properties.getString(key.substring(1));
- } catch (MissingResourceException e) {
- return dflt;
- }
- if (runtimeMappings != null) {
- for (Enumeration e = runtimeMappings.keys(); e.hasMoreElements();) {
- String keyValue = (String) e.nextElement();
- int i = result.indexOf(keyValue);
- if (i != -1) {
- String s1 = result.substring(0,i);
- String s2 = (String) runtimeMappings.get(keyValue);
- String s3 = result.substring(i+keyValue.length());
- result = s1 + s2 + s3;
- }
- }
- }
-
- if (result.indexOf('{') != -1) {
- // We test for the curly braces since due to NL issues we do not
- // want to use MessageFormat unless we have to.
- result = MessageFormat.format(result, mappings);
- }
-
- return result;
- }
-
- /*
- * Read the contents of the ini, properties, and mappings files.
- */
- private IStatus load(URL iniURL, URL propertiesURL, URL mappingsURL) {
-
- InputStream is = null;
- try {
- is = iniURL.openStream();
- ini = new Properties();
- ini.load(is);
- } catch (IOException e) {
- ini = null;
- String message = Messages.getString("IniFileReader.ReadIniError", iniURL.toExternalForm()); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, e);
- } finally {
- try {
- if (is != null)
- is.close();
- } catch (IOException e) {
- }
- }
-
- if (propertiesURL != null) {
- is = null;
- try {
- is = propertiesURL.openStream();
- properties = new PropertyResourceBundle(is);
- } catch (IOException e) {
- properties = null;
- String message = Messages.getString("IniFileReader.ReadPropError", propertiesURL.toExternalForm()); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, e);
- } finally {
- try {
- if (is != null)
- is.close();
- } catch (IOException e) {
- }
- }
- }
-
- PropertyResourceBundle bundle = null;
- if (mappingsURL != null) {
- is = null;
- try {
- is = mappingsURL.openStream();
- bundle = new PropertyResourceBundle(is);
- } catch (IOException e) {
- bundle = null;
- String message = Messages.getString("IniFileReader.ReadMapError", mappingsURL.toExternalForm()); //$NON-NLS-1$
- return new Status(IStatus.ERROR, PID, 0, message, e);
- } finally {
- try {
- if (is != null)
- is.close();
- } catch (IOException e) {
- }
- }
- }
-
- ArrayList mappingsList = new ArrayList();
- if (bundle != null) {
- boolean found = true;
- int i = 0;
- while (found) {
- try {
- mappingsList.add(bundle.getString(Integer.toString(i)));
- } catch (MissingResourceException e) {
- found = false;
- }
- i++;
- }
- }
- mappings = (String[])mappingsList.toArray(new String[mappingsList.size()]);
-
- return OK_STATUS;
- }
-}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties
deleted file mode 100644
index d4e5cff..0000000
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties
+++ /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
-###############################################################################
-### Boot plugin message catalog
-
-ok = OK
-
-### URL
-url.badVariant=Unsupported \"platform:\" protocol variation {0}
-url.invalidURL=Invalid "platform:" URL {0}
-url.createConnection=Unable to create connection {0}
-url.noaccess=Unable to access URL as local {0}.
-
-### Platform Configuration
-cfig.inUse=\nConfiguration file \"{0}\" is in use by another instance of the platform, \n\
- or there was a failure in deleting the old lock file. If no other platform instances are running, \n\
- delete file \"{1}\" and try starting the platform again.
-cfig.failCreateLock=Failed to create lock for configuration file \"{0}\"
-cfig.badUrlArg=Bad -configuration argument \"{0}\"
-cfig.unableToLoad.incomplete=Unable to load {0}
-cfig.unableToLoad.noURL=Configuration file location not specified
-cfig.unableToSave.noURL=Configuration file save location not specified
-cfig.unableToSave=Unable to save configuration file \"{0}\"
-cfig.badVersion=Unsupported configuration version \"{0}\"
-cfg.unableToCreateConfig.ini = Unable to create config.ini
-
-platform.running=The Platform is already running.
-platform.mustNotBeRunning=The Platform must not be running.
-platform.notRunning=The Platform is not running.
-
-ignore.plugin=Ignoring invalid plug-in location: {0}.
-application.notFound=Application not found: {0}.
-error.fatal=Fatal Error: Unable to determine platform installation URL {0}.
-error.boot=Fatal Error: Unable to locate boot.xml file for executing org.eclipse.core.boot.
-error.runtime=Fatal Error: Unable to locate matching org.eclipse.core.runtime plug-in.
-error.xerces=Fatal Error: Unable to locate matching org.apache.xerces plug-in.
-error.badNL=Bad value: \"{0}\" for NL. Using system default.
-
-InstalledSiteParser.DirectoryDoesNotExist=The directory \"{0}\" does not exist on the file system.
-InstalledSiteParser.UnableToCreateURL= Internal Error. Unable to create URL from \"{0}\".
-InstalledSiteParser.FileDoesNotExist= The file \"{0}\" does not exist.
-InstalledSiteParser.UnableToCreateURLForFile= Unable to create URL from \"{0}\".
-InstalledSiteParser.ErrorParsingFile= Unable to parse file \"{0}\".
-InstalledSiteParser.ErrorAccessing= Unable to access file \"{0}\".
-InstalledSiteParser.date = Invalid date attribute {0}
-BundleManifest.noVersion = {0} attribute not found in manifest for bundle \"{1}\". Bundle will be ignored.
-
-FeatureParser.IdOrVersionInvalid= Error parsing feature stream. The unique identifier or the version is null or empty: unique identifier=\"{0}\" version=\"{1}\".
-
-BundleGroupProvider=Update Manager Configurator
-ProductProvider=Update Manager Configurator
-
-AboutInfo.notSpecified=Unspecified
-ConfigurationActivator.initialize=Cannot initialize the Update Configurator
-ConfigurationActivator.createConfig=Cannot create configuration in {0}
-ConfigurationActivator.uninstallBundle=Could not uninstall unused bundle {0}
-ConfigurationParser.cannotLoadSharedInstall=Could not load from shared install
-ConfigurationActivator.installBundle=Could not install bundle {0}
-PluginEntry.versionError=Unable to create versioned identifier: {0} {1}
-
-IniFileReader.MissingDesc = Cannot find plugin for feature {0}
-IniFileReader.OpenINIError = Cannot open branding file {0}
-IniFileReader.OpenPropError = Cannot open branding properties file {0}
-IniFileReader.OpenMapError = Cannot open mapping file {0}
-IniFileReader.ReadIniError = Error reading branding file {0}
-IniFileReader.ReadPropError = Error reading branding properties file {0}
-IniFileReader.ReadMapError = Error reading mapping files {0}
-
-SiteEntry.computePluginStamp = Cannot compute plugins change stamp for site {0} because it does not support plugin detection.
-SiteEntry.cannotFindFeatureInDir=Unable to find feature.xml in directory: {0}
-SiteEntry.duplicateFeature=Duplicate feature found on site {0} : {1}
-SiteEntry.pluginsDir = {0} is not a valid plugins directory.
-PlatformConfiguration.expectingPlatformXMLorDirectory=Either specify the configuration directory or a file named platform.xml, not
-PlatformConfiguration.cannotBackupConfig=Cannot backup current configuration
-PlatformConfiguration.cannotCloseStream=Could not close output stream for
-PlatformConfiguration.cannotCloseTempFile=Could not close output stream for temp file
-PlatformConfiguration.cannotRenameTempFile=Could not rename configuration temp file
-PlatformConfiguration.cannotLoadConfig=Cannot load configuration from
-PlatformConfiguration.cannotLoadDefaultSite=Cannot load default site
-PlatformConfiguration.cannotFindConfigFile=Platform configuration file cannot be found
-PlatformConfiguration.cannotSaveNonExistingConfig=Configuration cannot be saved because it does not exist
-HttpResponse.rangeExpected=Server returned full content instead of a range.
-HttpResponse.wrongRange=Server returned wrong range
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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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/src/org/eclipse/update/internal/core/messages.properties b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
index 435e241..9fef4e4 100644
--- 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
@@ -52,7 +52,7 @@
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
+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}\"
@@ -194,7 +194,7 @@
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: \"{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}\".
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 "Content". 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> "CPL". For purposes of the CPL, "Program" 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 "Other License", any modifications, enhancements and/or
-other code and/or documentation "Modifications" 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 </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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 c6c19d1..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/AutomaticUpdatesJob.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this 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.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.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 ResizableInstallWizardDialog(
- UpdateScheduler.getActiveWorkbenchShell(),
- wizard,
- UpdateScheduler.getString("AutomaticUpdatesJob.Updates")); //$NON-NLS-1$
- dialog.create();
- dialog.open();
- }
-}
\ 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 5f8f96f..0000000
--- a/update/org.eclipse.update.scheduler/src/org/eclipse/update/internal/scheduler/UpdateSchedulerResources.properties
+++ /dev/null
@@ -1,48 +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
-AutomaticUpdatesPreferencePage.findUpdates=Automatically &find new updates and notify me
-AutomaticUpdatesPreferencePage.UpdateSchedule=Update &Schedule
-AutomaticUpdatesPreferencePage.findOnStart=Look for updates each time platform is started
-AutomaticUpdatesPreferencePage.findOnSchedule=Look for updates on the following schedule:
-AutomaticUpdatesPreferencePage.downloadOptions=&Download Options
-AutomaticUpdatesPreferencePage.searchAndNotify=Search for updates and notify me when they are available
-AutomaticUpdatesPreferencePage.downloadAndNotify=Download new updates automatically and notify me when ready to install them
-AutomaticUpdatesJob.EclipseUpdates1=Eclipse Updates
-AutomaticUpdatesJob.UpdatesAvailable=New updates are available. Do you want to review and install them now?
-AutomaticUpdatesJob.EclipseUpdates2=Eclipse Updates
-AutomaticUpdatesPreferencePage.at=at
-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 0167e9e..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(UpdateScheduler.getString("AutomaticUpdatesPreferencePage.findUpdates")); //$NON-NLS-1$
-
- createSpacer(container, 1);
-
- Group group = new Group(container, SWT.NONE);
- group.setText(UpdateScheduler.getString("AutomaticUpdatesPreferencePage.UpdateSchedule")); //$NON-NLS-1$
- 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(
- UpdateScheduler.getString("AutomaticUpdatesPreferencePage.findOnStart")); //$NON-NLS-1$
- 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(UpdateScheduler.getString("AutomaticUpdatesPreferencePage.findOnSchedule")); //$NON-NLS-1$
- 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(UpdateScheduler.getString("AutomaticUpdatesPreferencePage.at")); //$NON-NLS-1$
-
- 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(UpdateScheduler.getString("AutomaticUpdatesPreferencePage.downloadOptions")); //$NON-NLS-1$
- 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(
- UpdateScheduler.getString("AutomaticUpdatesPreferencePage.searchAndNotify")); //$NON-NLS-1$
- 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(UpdateScheduler.getString("AutomaticUpdatesPreferencePage.downloadAndNotify")); //$NON-NLS-1$
- 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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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® 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® Smalltalk.<br>
-<br>
-<br>
-<br>
- Next came Java™<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® 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® Smalltalk.<br>
-<br>
-<br>
-<br>
- Next came Java™<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® 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® Smalltalk.<br>
-<br>
-<br>
-<br>
- Next came Java™<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 <currently> 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 <currently> 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 be72dbe..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this 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.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® 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® Smalltalk.<br>
-<br>
-<br>
-<br>
- Next came Java™<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® 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® Smalltalk.<br>
-<br>
-<br>
-<br>
- Next came Java™<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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). 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, "Program" 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 ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") 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>
- <p>
-<a href="action" arg="org.eclipse.update.ui:org.eclipse.update.internal.ui.InstallWizardAction">
-Find updates for the currently installed features
-</a></p>
-<p>
-<a href="action" arg="org.eclipse.update.ui:org.eclipse.update.internal.ui.ConfigurationManagerAction">
-Manage my workbench configuration</a></p>
- </form>
- </section>
- <section
- name="Eclipse Community Sites"
- id="community.links">
- <form>
- <li><a href="url" arg="http://www.eclipse.org">Eclipse.org</a></li>
- </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 <samp>type</samp> attribute:
-<ul>
-<li><b>local</b> - the content of the form will be loaded from the body text of the element.</li>
-<li><b>remote</b> - the content of the form will be downloaded using the specified URL.</li>
-<li><b>custom</b> - the form will be created by loading the class specified by the <samp>class</samp> attribute that implements IPortalSection interface.</li>
-<li><b>dynamic</b> - the form will be created by loading the class specified by the <samp>class</samp> attribute that implements IFormContentProvider interface.</li>
-</ul>
- </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 <samp>type</samp> is <samp>remote</samp>, 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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.welcome.internal.portal;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.welcome.internal.webbrowser;
-
-/**
- * @author dejan
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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>Preferences>Java>Code Generation>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/.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, "Program" 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)>0) && (compare(y, z)>0))</tt> implies
- * <tt>compare(x, z)>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
